Skip to content
Commits on Source (128)
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ eda3e1e0
......@@ -21,8 +21,12 @@ missing
*.lo
*.la
.buildconfig
data/org.gnome.Maps.appdata.xml
data/org.gnome.Maps.desktop
data/org.gnome.Maps.desktop.in
data/org.gnome.Maps.gschema.xml.in
data/org.gnome.Maps.gschema.valid
m4/*.m4
......@@ -40,6 +44,7 @@ po/*.header
src/gnome-maps
src/*.gresource
src/*.gresource.xml
src/org.gnome.Maps.service
/lib/GnomeMaps-1.0.gir
......
.gitlab-ci.yml
View file @ eda3e1e0
......@@ -10,7 +10,7 @@ flatpak:
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
# Replace with your application name, as written in the manifest
FLATPAK_MODULE: "gnome-maps"
APP_ID: "org.gnome.Maps"
APP_ID: "org.gnome.Maps.Devel"
BUNDLE: "gnome-maps-git.flatpak"
nightly:
......
NEWS
View file @ eda3e1e0
41.4 - Feb 12, 2022
42.0 - Mar 19, 2022
=========================
Changes since 41.2
- Translation updates
Added/updated/fixed translations
- Slovenian
- Norwegian Bokmål
- Russian
- Serbian
- French
- Spanish
- Kazakh
- German
- Italian
- Occitan
- Bulgarian
- Korean
- Hungarian
- Danish
- Hebrew
- Galician
- Lithuanian
- Persian
- Polish
- Chinese (China)
All contributors to this release
Gianvito Cavasoli <gianvito@gmx.it>
Marcus Lundblad <ml@update.uu.se>
Aleksandr Melman <Alexmelman88@gmail.com>
Alexander Shopov <ash@kambanaria.org>
Ask Hjorth Larsen <asklarsen@gmail.com>
Aurimas Černius <aurisc4@gmail.com>
Balázs Úr <balazs@urbalazs.hu>
Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Charles Monzat <charles.monzat@free.fr>
Danial Behzadi <dani.behzi@ubuntu.com>
Daniel Mustieles <daniel.mustieles@gmail.com>
Fran Dieguez <frandieguez@gnome.org>
Jeeyong Um <conr2d@gmail.com>
Kjartan Maraas <kmaraas@gnome.org>
Luming Zh <lumingzh@qq.com>
Marcus Lundblad <ml@dfupdate.se>
Matej Urbančič <mateju@src.gnome.org>
Philipp Kiemle <philipp.kiemle@gmail.com>
Quentin PAGÈS <pages_quentin@hotmail.com>
Piotr Drąg <piotrdrag@gmail.com>
Yosef Or Boczko <yoseforb@gnome.org>
Марко Костић <marko.m.kostic@gmail.com>
41.2 - Dec 4, 2021
42.rc - Mar 5, 2022
=========================
Changes since 41.1
- Translation updates
Changes since 42.beta
- Save visibility of the scale in gsettings so it's remembered between runs
- Update OSM POI definitions for OSM editing
- Correctly set the initially selected date in the calendar widget for
public transit routing, so that the date is always set to today when
first selecting a date, even if Maps was started on an earlier day
- Fix some incositencies when showing times for public transit itineraries
- Update appdata screenshots
- Use tabular numbers for time labels in the public transit itinerary views
to keep things tidily lined up vertically
Added/updated/fixed translations
- Brazilian Portuguese
- Catalan
- Basque
- Turkish
- Finnish
- Czech
- Portuguese
- Croatian
- Ukrainian
- Indonesian
- Swedish
- German
- Polish
- Finnish
- Turkish
- French
- Lithuanian
All contributors to this release
Anders Jonsson <anders.jonsson@norsjovallen.se>
Asier Sarasua Garmendia <asiersarasua@ni.eus>
Aurimas Černius <aurisc4@gmail.com>
Claude Paroz <claude@2xlibre.net>
Emin Tufan Çetin <etcetin@gmail.com>
Enrico Nicoletto <hiko@duck.com>
Goran Vidović <trebelnik2@gmail.com>
Hugo Carvalho <hugokarvalho@hotmail.com>
Jiri Grönroos <jiri.gronroos@iki.fi>
Jordi Mas <jmas@softcatala.org>
Kukuh Syafaat <kukuhsyafaat@gnome.org>
Marcus Lundblad <ml@dfupdate.se>
Marek Černocký <marek@manet.cz>
Piotr Drąg <piotrdrag@gmail.com>
Sophie Herold <sophie@hemio.de>
Tim Sabsch <tim@sabsch.com>
Yuri Chornoivan <yurchor@ukr.net>
42.beta - Feb 12, 2022
=========================
Changes since 42.alpha
- Fix build with Meson 0.60+
- Update required libhandy version
- Use the location portal when sandboxed
- Only use location bias when searching on high zoom levels, to work around
problems with finding some locations (such as cities) with the Photon search
API
- Fix shortcuts overlay for development builds
- Support alternative OpenStreetMap location URLs format in the search bar
Added/updated/fixed translations
- German
- Brazilian Portuguese
- Slovenian
- Galician
- Italian
- Occitan
- Latvian
- Catalan
- Russian
- Czech
- Chinese (China)
All contributors to this release
Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>
Aleksandr Melman <Alexmelman88@gmail.com>
Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Boyuan Yang <073plan@gmail.com>
David King <amigadave@amigadave.com>
Fran Dieguez <frandieguez@gnome.org>
Gianvito Cavasoli <gianvito@gmx.it>
Jordi Mas i Hernandez <jmas@softcatala.org>
Leônidas Araújo <leorusvellt@hotmail.com>
Marcus Lundblad <ml@update.uu.se>
Marek Černocký <marek@manet.cz>
Matej Urbančič <mateju@src.gnome.org>
Philipp Kiemle <philipp.kiemle@gmail.com>
Quentin PAGÈS <pages_quentin@hotmail.com>
41.1 - Oct 30, 2021
42.alpha - Jan 8, 2022
=========================
Changes since 41.0
- Translation updates
- Add more fine-tuned initial zoom levels for more place types
- Add support for maps: URIs, DBus action, and command line option to
initiate a search
- Show icons for u-turns in turn-by-turn routing
- Add dual-installation support (with devel icon for nightly)
- Implement support for the new "prefer dark style" setting
- Improvements to appdata metadata
Added/updated/fixed translations
- Hebrew
- Basque
- Indonesian
- Icelandic
- Spanish
- Occitan
- Persian
- Portuguese
- Croatian
- Ukrainian
- Friulian
- Latvian
- Slovak
- Bulgarian
- Vietnamese
- Hebrew
- Serbian
- Turkish
All contributors to this release
Alexander Shopov <ash@kambanaria.org>
Asier Sarasua Garmendia <asiersarasua@ni.eus>
Danial Behzadi <dani.behzi@ubuntu.com>
Daniel Mustieles <daniel.mustieles@gmail.com>
Dušan Kazik <prescott66@gmail.com>
Emin Tufan Çetin <etcetin@gmail.com>
Fabio Tomat <f.t.public@gmail.com>
Goran Vidović <trebelnik2@gmail.com>
Hugo Carvalho <hugokarvalho@hotmail.com>
Kukuh Syafaat <kukuhsyafaat@gnome.org>
Marcus Lundblad <ml@update.uu.se>
Ngọc Quân Trần <vnwildman@gmail.com>
Piotr Drąg <piotrdrag@gmail.com>
Quentin PAGÈS <pages_quentin@hotmail.com>
Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>
Sveinn í Felli <sv1@fellsnet.is>
Yaron Shahrabani <sh.yaron@gmail.com>
Yosef Or Boczko <yoseforb@gnome.org>
Yuri Chornoivan <yurchor@ukr.net>
Мирослав Николић <miroslavnikolic@rocketmail.com>
41.0 - Sep 18, 2021
......
data/icons/meson.build
View file @ eda3e1e0
install_subdir(
join_paths('public', 'hicolor'),
install_dir: join_paths(datadir, 'icons')
# install the app icon (the regular or .Devel one)
install_data(
join_paths('public', 'hicolor', 'scalable', 'apps', app_id + '.svg'),
install_dir: join_paths(datadir, 'icons', 'hicolor', 'scalable', 'apps')
)
# install the symbolic app icon with the current name (optionally with .Devel suffix)
install_data(
join_paths('public', 'hicolor', 'symbolic', 'apps', 'org.gnome.Maps-symbolic.svg'),
install_dir: join_paths(datadir, 'icons', 'hicolor', 'symbolic', 'apps'),
rename: '@0@-symbolic.svg'.format(app_id)
)
install_subdir(
......
data/meson.build
View file @ eda3e1e0
data_conf = configuration_data()
if (get_option('profile') == 'development')
data_conf.set('suffix', '/Devel')
else
data_conf.set('suffix', '')
endif
gnome.compile_resources(
app_id + '.data',
app_id + '.data.gresource.xml',
configure_file(
input: 'org.gnome.Maps.data.gresource.xml.in',
output: 'org.gnome.Maps.data.gresource.xml',
configuration: data_conf
),
gresource_bundle: true,
install: true,
install_dir: pkgdatadir
......@@ -12,9 +22,14 @@ install_data(
)
desktop = app_id + '.desktop'
desktop_config = configuration_data()
desktop_config.set('app-id', app_id)
desktop_file = custom_target('desktop-file',
input: desktop + '.in',
input: configure_file(
input: 'org.gnome.Maps.desktop.in.in',
output: 'org.gnome.Maps.desktop.in',
configuration: desktop_config
),
output: desktop,
install: true,
install_dir: join_paths(datadir, 'applications'),
......@@ -26,14 +41,20 @@ desktop_file = custom_target('desktop-file',
)
install_data(
app_id + '.gschema.xml',
'org.gnome.Maps.gschema.xml',
install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
)
appdata = app_id + '.appdata.xml'
appdata_config = configuration_data()
appdata_config.set('app-id', app_id)
appdata_config.set('gettext-package', 'gnome-maps')
appdata_file = i18n.merge_file(
input: appdata + '.in',
input: configure_file(
input: 'org.gnome.Maps.appdata.xml.in.in',
output: 'org.gnome.Maps.appdata.xml.in',
configuration: appdata_config
),
output: appdata,
po_dir: po_dir,
install: true,
......@@ -43,9 +64,10 @@ appdata_file = i18n.merge_file(
service_conf = configuration_data()
service_conf.set('PACKAGE_NAME', meson.project_name())
service_conf.set('pkgdatadir', pkgdatadir)
service_conf.set('app-id', app_id)
configure_file(
input: app_id + '.service.in',
input: 'org.gnome.Maps.service.in',
output: app_id + '.service',
configuration: service_conf,
install: true,
......
data/org.gnome.Maps.appdata.xml.in → data/org.gnome.Maps.appdata.xml.in.in
View file @ eda3e1e0
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>org.gnome.Maps.desktop</id>
<id>@app-id@.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0-or-later</project_license>
<name>GNOME Maps</name>
<name>Maps</name>
<summary>Find places around the world</summary>
<description>
<p>
......@@ -17,23 +17,36 @@
</p>
</description>
<launchable type="desktop-id">org.gnome.Maps.desktop</launchable>
<launchable type="desktop-id">@app-id@.desktop</launchable>
<screenshots>
<screenshot type="default">
<image>https://gitlab.gnome.org/GNOME/gnome-maps/raw/master/data/screenshots/maps-main.png</image>
<caption><!-- Describe this screenshot in less than ~10 words --></caption>
<image>https://gitlab.gnome.org/GNOME/gnome-maps/raw/HEAD/data/screenshots/maps-main.png</image>
</screenshot>
<screenshot>
<image>https://gitlab.gnome.org/GNOME/gnome-maps/raw/master/data/screenshots/maps-route.png</image>
<caption><!-- Describe this screenshot in less than ~10 words --></caption>
<image>https://gitlab.gnome.org/GNOME/gnome-maps/raw/HEAD/data/screenshots/maps-route.png</image>
</screenshot>
<screenshot>
<image>https://gitlab.gnome.org/GNOME/gnome-maps/raw/master/data/screenshots/maps-pinpoint.png</image>
<caption><!-- Describe this screenshot in less than ~10 words --></caption>
<image>https://gitlab.gnome.org/GNOME/gnome-maps/raw/HEAD/data/screenshots/maps-pinpoint.png</image>
</screenshot>
</screenshots>
<releases>
<release date="2022-03-19" version="42.0">
<description>
<ul>
<li>Allow paralell installation of development versions and stable releases</li>
<li>Add support for the \"prefer dark style\" preference</li>
<li>Add support for maps: URIs with search queries</li>
<li>Use more fine-tuned initial zoom level for more place types</li>
<li>Show u-turn icons in turn-by-turn routes</li>
<li>Improve appdata metadata with updated screenshots</li>
<li>Use the location portal when sandboxed</li>
<li>Only use location bias when searching at high zoom to avoid problems in the Photon search engine</li>
<li>Remember the state of showing the scale between runs</li>
<li>Tidy up showing time labels in public transit itineraries by using tabular numbers</li>
</ul>
</description>
</release>
<release date="2022-02-12" version="41.4">
<description>
<ul>
......@@ -51,64 +64,85 @@
<li>Translation updates</li>
</ul>
</release>
<release date="2021-09-18" version="41.0">
<ul>
<li>Use new GNOME style icons for search results</li>
<li>Show e-mail addresse for places when available</li>
<li>Show take-away availability for restaurants and similar places</li>
<li>Remove Facebook check-in support, as it's not supported by libgfbgraph anymore</li>
</ul>
<description>
<ul>
<li>Use new GNOME style icons for search results</li>
<li>Show e-mail addresse for places when available</li>
<li>Show take-away availability for restaurants and similar places</li>
<li>Remove Facebook check-in support, as it's not supported by libgfbgraph anymore</li>
</ul>
</description>
</release>
<release date="2021-08-13" version="40.4">
<ul>
<li>Update donation and wiki web links in appdata</li>
</ul>
<description>
<ul>
<li>Update donation and wiki web links in appdata</li>
</ul>
</description>
</release>
<release date="2021-07-09" version="40.3">
<ul>
<li>Fix regression when signing in for OSM editing</li>
</ul>
<description>
<ul>
<li>Fix regression when signing in for OSM editing</li>
</ul>
</description>
</release>
<release date="2021-06-04" version="40.2">
<ul>
<li>Fix crashes when no aerial tile definition is available</li>
<li>Fix cut-off text in place bubble in some translations</li>
</ul>
<description>
<ul>
<li>Fix crashes when no aerial tile definition is available</li>
<li>Fix cut-off text in place bubble in some translations</li>
</ul>
</description>
</release>
<release date="2021-05-01" version="40.1">
<ul>
<li>Fix a bug where unfavoring a place made it unselectable until after a restart</li>
<li>Use country code attribute from GraphHopper/Photon geocode results to improve
<description>
<ul>
<li>Fix a bug where unfavoring a place made it unselectable until after a restart</li>
<li>Use country code attribute from GraphHopper/Photon geocode results to improve
accuracy of address formatting among others</li>
</ul>
</ul>
</description>
</release>
<release date="2021-03-20" version="40.0">
<ul>
<li>Redesigned place bubbles</li>
<li>Adaptive UI for the place bubbles on small screens</li>
<li>Show translated place names in user's language when available</li>
</ul>
<description>
<ul>
<li>Redesigned place bubbles</li>
<li>Adaptive UI for the place bubbles on small screens</li>
<li>Show translated place names in user's language when available</li>
</ul>
</description>
</release>
<release date="2021-02-12" version="3.38.4">
<ul>
<li>Fix a bug resulting in writing a broken last view position on exit in some circumstances</li>
<li>Fix a bug preventing wrapping around at the date line with dark tiles</li>
<li>Fix a bug causing hanging in cases when dragging around route markers</li>
</ul>
<description>
<ul>
<li>Fix a bug resulting in writing a broken last view position on exit in some circumstances</li>
<li>Fix a bug preventing wrapping around at the date line with dark tiles</li>
<li>Fix a bug causing hanging in cases when dragging around route markers</li>
</ul>
</description>
</release>
<release date="2021-01-09" version="3.38.3">
<ul>
<li>Fix a bug where place details gets lost after searching again for the same place</li>
</ul>
<description>
<ul>
<li>Fix a bug where place details gets lost after searching again for the same place</li>
</ul>
</description>
</release>
<release date="2020-11-21" version="3.38.2">
<ul>Translation updates</ul>
<description>
<ul>Translation updates</ul>
</description>
</release>
<release date="2020-10-07" version="3.38.1.1">
<ul>
<li>Fix a race-condition bug in search-as-you-type resulting in out-of-sync search results in some circumstances</li>
<li>Fix updating missing details after editing a POI in OpenStreetMap</li>
</ul>
<description>
<ul>
<li>Fix a race-condition bug in search-as-you-type resulting in out-of-sync search results in some circumstances</li>
<li>Fix updating missing details after editing a POI in OpenStreetMap</li>
</ul>
</description>
</release>
<release date="2020-10-03" version="3.38.1">
<description>
......@@ -244,7 +278,7 @@ accuracy of address formatting among others</li>
<project_group>GNOME</project_group>
<developer_name>The GNOME Project</developer_name>
<url type="homepage">https://wiki.gnome.org/Apps/Maps</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-maps/</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-maps/issues</url>
<url type="donation">https://www.gnome.org/donate/</url>
<update_contact>gnome-maps-list@gnome.org</update_contact>
<translation type="gettext">gnome-maps</translation>
......
data/org.gnome.Maps.data.gresource.xml → data/org.gnome.Maps.data.gresource.xml.in
View file @ eda3e1e0
......@@ -44,7 +44,7 @@
<file alias="application.css">gnome-maps.css</file>
<file alias="osm-types.json" compressed="true">osm-types.json</file>
</gresource>
<gresource prefix="/org/gnome/Maps/gtk">
<gresource prefix="/org/gnome/Maps@suffix@/gtk">
<file alias="help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
</gresource>
</gresources>
data/org.gnome.Maps.desktop.in → data/org.gnome.Maps.desktop.in.in
View file @ eda3e1e0
......@@ -2,9 +2,9 @@
Version=1.0
Name=Maps
Comment=A simple maps application
Exec=gapplication launch org.gnome.Maps %U
Exec=gapplication launch @app-id@ %U
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gnome.Maps
Icon=@app-id@
Terminal=false
Type=Application
StartupNotify=true
......@@ -12,7 +12,7 @@ Categories=GNOME;GTK;Utility;
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=Maps;
DBusActivatable=true
MimeType=application/vnd.geo+json;x-scheme-handler/geo;application/vnd.google-earth.kml+xml;application/gpx+xml;
MimeType=application/vnd.geo+json;x-scheme-handler/geo;x-scheme-handler/maps;application/vnd.google-earth.kml+xml;application/gpx+xml;
X-Geoclue-Reason=Allows your location to be shown on the map.
# Translators: Do NOT translate or transliterate this text (these are enum types)!
X-Purism-FormFactor=Workstation;Mobile;
data/org.gnome.Maps.gschema.xml
View file @ eda3e1e0
......@@ -75,15 +75,15 @@
<default>'pedestrian'</default>
<summary>Last used transportation type for routing</summary>
</key>
<key name="night-mode" type="b">
<default>false</default>
<summary>Night mode</summary>
<description>Whether the application is in night mode.</description>
</key>
<key name="hybrid-aerial" type="b">
<default>false</default>
<summary>Use hybrid aerial tiles</summary>
<description>Whether aerial tiles should use hybrid style (with labels).</description>
</key>
<key name="show-scale" type="b">
<default>true</default>
<summary>Show scale</summary>
<description>Whether to show the scale.</description>
</key>
</schema>
</schemalist>
data/org.gnome.Maps.service.in
View file @ eda3e1e0
[D-BUS Service]
Name=org.gnome.Maps
Exec=@pkgdatadir@/org.gnome.Maps --gapplication-service
Name=@app-id@
Exec=@pkgdatadir@/@app-id@ --gapplication-service
data/osm-types.json
View file @ eda3e1e0
This diff is collapsed.
data/ui/main-window.ui
View file @ eda3e1e0
......@@ -3,10 +3,6 @@
<!-- interface-requires gtk+ 3.0 -->
<menu id="hamburgerMenu">
<section>
<item>
<attribute name="action">app.night-mode</attribute>
<attribute name="label" translatable="yes">Night Mode</attribute>
</item>
<item>
<attribute name="action">app.osm-account-setup</attribute>
<attribute name="label" translatable="yes">Set up OpenStreetMap Account</attribute>
......
data/ui/transit-arrival-row.ui
View file @ eda3e1e0
......@@ -51,6 +51,9 @@
<property name="halign">GTK_ALIGN_END</property>
<property name="margin-start">6</property>
<property name="margin-end">18</property>
<attributes>
<attribute name="font-features" value="tnum"/>
</attributes>
</object>
<packing>
<property name="left-attach">2</property>
......
data/ui/transit-itinerary-row.ui
View file @ eda3e1e0
......@@ -14,6 +14,9 @@
<property name="visible">True</property>
<property name="expand">False</property>
<property name="halign">GTK_ALIGN_START</property>
<attributes>
<attribute name="font-features" value="tnum"/>
</attributes>
</object>
<packing>
<property name="top-attach">0</property>
......@@ -25,6 +28,9 @@
<property name="visible">True</property>
<property name="expand">True</property>
<property name="halign">GTK_ALIGN_START</property>
<attributes>
<attribute name="font-features" value="tnum"/>
</attributes>
<style>
<class name="dim-label"/>
</style>
......
data/ui/transit-leg-row.ui
View file @ eda3e1e0
......@@ -67,6 +67,9 @@
<property name="margin-end">18</property>
<property name="hexpand">False</property>
<property name="halign">GTK_ALIGN_END</property>
<attributes>
<attribute name="font-features" value="tnum"/>
</attributes>
</object>
<packing>
<property name="left-attach">2</property>
......
data/ui/transit-stop-row.ui
View file @ eda3e1e0
......@@ -43,6 +43,9 @@
<property name="halign">GTK_ALIGN_END</property>
<property name="margin-start">6</property>
<property name="margin-end">0</property>
<attributes>
<attribute name="font-features" value="tnum"/>
</attributes>
</object>
<packing>
<property name="left-attach">2</property>
......
lib/maps-osm-object.c
View file @ eda3e1e0
......@@ -329,3 +329,17 @@ maps_osm_object_serialize (const MapsOSMObject *object)
return (char *) result;
}
/**
* maps_osm_object_get_tags:
*
* Returns: (element-type utf8 utf8): a hash table with key/values
*/
const GHashTable *
maps_osm_object_get_tags (const MapsOSMObject *object)
{
const MapsOSMObjectPrivate *priv =
maps_osm_object_get_instance_private ((MapsOSMObject *) object);
return priv->tags;
}