Package: release.debian.org
Severity: normal
X-Debbugs-Cc: gnome-m...@packages.debian.org
Control: affects -1 + src:gnome-maps
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock gnome-maps, GNOME's OpenStreetMap client.
As with other recent unblock requests I would like this to be considered
for Debian 13.0 if possible, but if we're too late for that, it can be
deferred to 13.1 by converting this request into a trixie-pu request.
[ Reason ]
New upstream bugfix release.
[ Impact ]
Several bug fixes; the most serious is that public transport routing has
regressed due to third-party server changes, except perhaps in regions
like Switzerland that have their own more specific transit routing
plugin and therefore don't need to fall back to the default
transitous.org.
[ Tests ]
Brief manual testing, everything seems to be as it should be. In
particular I successfully requested a public transport route from
Cambridge, UK to London, UK, and results provided by Transitous looked
reasonable.
An earlier version 48.4 (identical except for the transitous.org API URL
fix) was in experimental for several weeks and then in unstable for a
couple of days without incident.
[ Risks ]
Technically a key package in our default desktop environment, but it's
essentially a leaf package, which we're including as a nice-to-have
because upstream have it in their official module set. As an alternative
distribution channel, up-to-date versions are available in Flatpak
format from Flathub.
The changes are all targeted fixes.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
(filtered to exclude upstream translation updates)
unblock gnome-maps/48.5-1
debdiff *.dsc | filterdiff -p1 -x'po/*.po'
diff -Nru gnome-maps-48.2/data/org.gnome.Maps.appdata.xml.in.in gnome-maps-48.5/data/org.gnome.Maps.appdata.xml.in.in
--- gnome-maps-48.2/data/org.gnome.Maps.appdata.xml.in.in 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/data/org.gnome.Maps.appdata.xml.in.in 2025-07-15 22:26:25.000000000 +0100
@@ -46,6 +46,32 @@
</screenshot>
</screenshots>
<releases>
+ <release date="2025-07-15" version="48.5">
+ <description>
+ <ul>
+ <li>Remove extra slash in API URL for Transitous, unbreaks routing with latests MOTIS releases</li>
+ </ul>
+ </description>
+ </release>
+ <release date="2025-06-07" version="48.4">
+ <description>
+ <ul>
+ <li>Fix search result popover not fitting on small screen (phone) devices</li>
+ <li>Show correct place type description for places of type "office" that are tagged on an entire building in OpenStreetMap</li>
+ </ul>
+ </description>
+ </release>
+ <release date="2025-05-24" version="48.3">
+ <description>
+ <ul>
+ <li>Fix showing incorrect coordinates when printing routes</li>
+ <li>Clear route details when starting a new route search (avoids showing details about a previously selected transit itinerary when running a new search)</li>
+ <li>Use the Adwaita Sans font in the map style</li>
+ <li>Don't show place popover when starting a map drag gesture by clicking on a marker or label</li>
+ <li>Close OpenStreetMap POI edit dialog when failing to download data. Avoids having the dialog stuck with the loading spinner in such situations</li>
+ </ul>
+ </description>
+ </release>
<release date="2025-04-12" version="48.2">
<description>
<ul>
diff -Nru gnome-maps-48.2/data/ui/place-popover.ui gnome-maps-48.5/data/ui/place-popover.ui
--- gnome-maps-48.2/data/ui/place-popover.ui 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/data/ui/place-popover.ui 2025-07-15 22:26:25.000000000 +0100
@@ -13,6 +13,8 @@
<property name="child">
<object class="GtkStack" id="stack">
<property name="transition-type">crossfade</property>
+ <property name="vhomogeneous">False</property>
+ <property name="interpolate-size">True</property>
<style>
<class name="maps-stack"/>
</style>
@@ -39,7 +41,6 @@
<object class="GtkListBox" id="poiMainCategoriesListBox">
<property name="vexpand">True</property>
<property name="hexpand">True</property>
- <property name="height-request">400</property>
<layout>
<property name="row">1</property>
<property name="column">0</property>
@@ -58,12 +59,15 @@
<object class="AdwSpinner" id="spinner">
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="width-request">48</property>
+ <property name="height-request">48</property>
+ <property name="margin-top">18</property>
+ <property name="margin-bottom">18</property>
</object>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledWindow">
<property name="hscrollbar_policy">never</property>
- <property name="max-content-height">400</property>
<property name="propagate-natural-height">True</property>
<property name="child">
<object class="GtkListBox" id="list">
@@ -76,8 +80,8 @@
<child>
<object class="GtkLabel" id="noResultsLabel">
<property name="label" translatable="yes">No results found</property>
- <property name="width_request">16</property>
- <property name="height_request">16</property>
+ <property name="margin-top">18</property>
+ <property name="margin-bottom">18</property>
<style>
<class name="dim-label"/>
</style>
@@ -86,8 +90,8 @@
<child>
<object class="GtkLabel" id="errorLabel">
<property name="label" translatable="yes">An error has occurred</property>
- <property name="width_request">16</property>
- <property name="height_request">16</property>
+ <property name="margin-top">18</property>
+ <property name="margin-bottom">18</property>
<style>
<class name="dim-label"/>
</style>
diff -Nru gnome-maps-48.2/debian/changelog gnome-maps-48.5/debian/changelog
--- gnome-maps-48.2/debian/changelog 2025-04-17 17:03:52.000000000 +0100
+++ gnome-maps-48.5/debian/changelog 2025-07-17 11:19:25.000000000 +0100
@@ -1,3 +1,49 @@
+gnome-maps (48.5-1) unstable; urgency=medium
+
+ * Team upload
+ * New upstream bugfix release
+ - Fix a regression when requesting route planning from transitous.org
+ (gnome-maps#864 upstream)
+
+ -- Simon McVittie <s...@debian.org> Thu, 17 Jul 2025 11:19:25 +0100
+
+gnome-maps (48.4-2) unstable; urgency=medium
+
+ * Team upload
+ * List upstream changes in previous changelog entries
+ * d/p/debian/Revert-mapStyle-Use-the-Adwaita-Sans-font.patch:
+ Go back to using GNOME's older Cantarell font.
+ We do not have Adwaita Sans in Debian yet (see ITP #1099597).
+ * Upload to unstable
+
+ -- Simon McVittie <s...@debian.org> Mon, 14 Jul 2025 18:17:43 +0100
+
+gnome-maps (48.4-1) experimental; urgency=medium
+
+ * New upstream bugfix release
+ - If a point of interest is tagged as both "building" and "office",
+ prefer the more-specific office type label
+ - Improve sizing of the point-of-interest popup, especially for
+ small screens
+ - Translation updates
+
+ -- Jeremy Bícha <jbi...@ubuntu.com> Sat, 07 Jun 2025 10:52:03 -0400
+
+gnome-maps (48.3-1) experimental; urgency=medium
+
+ * New upstream bugfix release
+ - Correctly display (lat,long) pairs in print layout, instead
+ of showing the latitude twice
+ - When starting a new search query, avoid continuing to show details
+ of a previously-selected transit itinerary
+ - When dragging the map starting from a point of interest, don't
+ open a popover for the point of interest
+ - Close Open Street Map editing dialog if downloading data fails
+ - Use Adwaita Sans font in preference to Cantarell
+ - Translation updates
+
+ -- Jeremy Bícha <jbi...@ubuntu.com> Fri, 06 Jun 2025 13:44:26 -0400
+
gnome-maps (48.2-1) unstable; urgency=medium
* New upstream release
diff -Nru gnome-maps-48.2/debian/patches/debian/Revert-mapStyle-Use-the-Adwaita-Sans-font.patch gnome-maps-48.5/debian/patches/debian/Revert-mapStyle-Use-the-Adwaita-Sans-font.patch
--- gnome-maps-48.2/debian/patches/debian/Revert-mapStyle-Use-the-Adwaita-Sans-font.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-maps-48.5/debian/patches/debian/Revert-mapStyle-Use-the-Adwaita-Sans-font.patch 2025-07-17 11:19:25.000000000 +0100
@@ -0,0 +1,26 @@
+From: Simon McVittie <s...@debian.org>
+Date: Mon, 14 Jul 2025 18:14:06 +0100
+Subject: Revert "mapStyle: Use the Adwaita Sans font"
+
+We do not have Adwaita Sans in Debian yet (see #1099597).
+
+This reverts commit ad4b13a9ab93b64847a059eb9bff1e78fed634d4.
+
+Forwarded: not-needed
+---
+ src/mapStyle/utils.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mapStyle/utils.js b/src/mapStyle/utils.js
+index c346aa0..8002bc5 100644
+--- a/src/mapStyle/utils.js
++++ b/src/mapStyle/utils.js
+@@ -63,7 +63,7 @@ export class MapStyleConfig {
+
+ fonts(variant) {
+ if (this.renderer === "libshumate") {
+- return ["Adwaita Sans " + (variant ?? "Regular")];
++ return ["Cantarell " + (variant ?? "Regular")];
+ } else {
+ /* Use Noto Sans when targeting MapLibre GL JS because it's
+ more commonly available in SDF format. */
diff -Nru gnome-maps-48.2/debian/patches/series gnome-maps-48.5/debian/patches/series
--- gnome-maps-48.2/debian/patches/series 2025-04-17 17:03:52.000000000 +0100
+++ gnome-maps-48.5/debian/patches/series 2025-07-17 11:19:25.000000000 +0100
@@ -0,0 +1 @@
+debian/Revert-mapStyle-Use-the-Adwaita-Sans-font.patch
diff -Nru gnome-maps-48.2/meson.build gnome-maps-48.5/meson.build
--- gnome-maps-48.2/meson.build 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/meson.build 2025-07-15 22:26:25.000000000 +0100
@@ -1,5 +1,5 @@
project('gnome-maps', 'c',
- version: '48.2',
+ version: '48.5',
license: 'GPL-2.0-or-later',
meson_version: '>= 0.61.0',
)
diff -Nru gnome-maps-48.2/NEWS gnome-maps-48.5/NEWS
--- gnome-maps-48.2/NEWS 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/NEWS 2025-07-15 22:26:25.000000000 +0100
@@ -1,3 +1,53 @@
+48.5 - Jul 15, 2025
+=========================
+
+Changes since 48.4
+ - Remove extra slash in API URL for Transitous, unbreaks routing with latests
+ MOTIS releases
+
+All contributors to this release
+Marcus Lundblad <m...@dfupdate.se>
+
+48.4 - Jun 7, 2025
+=========================
+
+Changes since 48.3
+ - Fix search result popover not fitting on small screen (phone) devices
+ - Show correct place type description for places of type "office" that are
+ tagged on an entire building in OpenStreetMap
+
+Added/updated/fixed translations
+ - Japanese
+
+All contributors to this release
+James Westman <ja...@jwestman.net>
+Marcus Lundblad <m...@dfupdate.se>
+Takayuki Kusano <ae5t-...@asahi-net.or.jp>
+
+48.3 - May 24, 2025
+=========================
+
+Changes since 48.2
+ - Fix showing incorrect coordinates when printing routes
+ - Clear route details when starting a new route search (avoids showing details
+ about a previously selected transit itinerary when running a new search)
+ - Use the Adwaita Sans font in the map style
+ - Don't show place popover when starting a map drag gesture by clicking on
+ a marker or label
+ - Close OpenStreetMap POI edit dialog when failing to download data. Avoids
+ having the dialog stuck with the loading spinner in such situations
+
+Added/updated/fixed translations
+ - Thai
+ - Chinese (Taiwan)
+ - Romanian
+
+All contributors to this release
+Aefgh Threenine <aefgh39...@gmail.com>
+Antonio Marin <gnmer.6q...@slmail.me>
+Cheng-Chia Tseng <pswo10...@gmail.com>
+Marcus Lundblad <m...@dfupdate.se>
+
48.2 - Apr 12, 2025
=========================
diff -Nru gnome-maps-48.2/po/LINGUAS gnome-maps-48.5/po/LINGUAS
--- gnome-maps-48.2/po/LINGUAS 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/po/LINGUAS 2025-07-15 22:26:25.000000000 +0100
@@ -60,6 +60,7 @@
ta
te
tg
+th
tr
uk
uz
diff -Nru gnome-maps-48.2/src/mapView.js gnome-maps-48.5/src/mapView.js
--- gnome-maps-48.2/src/mapView.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/mapView.js 2025-07-15 22:26:25.000000000 +0100
@@ -75,6 +75,11 @@
// Maximum limit of file size (20 MB) that can be loaded without user confirmation
const FILE_SIZE_LIMIT_MB = 20;
+/* Maximum distance in pixels allowed between button pressed and released
+ * to consider release as a symbol click trigger.
+ */
+const SYMBOL_CLICK_MAX_DISTANCE = 10; // px
+
export class MapView extends Gtk.Overlay {
static MapType = {
@@ -488,6 +493,26 @@
}
_onSymbolClicked(_mapLayer, symbol) {
+ /* As a work-around for issue
+ * https://gitlab.gnome.org/GNOME/libshumate/-/issues/82
+ * compare absolute pixel distance relative to the preceeding click
+ * "pressed" event and disregard the event if it moved too far.
+ */
+ const [pressX, pressY] =
+ this.map.viewport.location_to_widget_coords(this,
+ this._pressLatitude,
+ this._pressLongitude);
+ const [releaseX, releaseY] =
+ this.map.viewport.location_to_widget_coords(this,
+ this.map.viewport.latitude,
+ this.map.viewport.longitude);
+
+ const distance = Math.sqrt((pressX - releaseX) ** 2 +
+ (pressY - releaseY) ** 2);
+
+ if (distance > SYMBOL_CLICK_MAX_DISTANCE)
+ return;
+
let placeType = GeocodeGlib.PlaceType.UNKNOWN;
const layerName = symbol.get_source_layer();
@@ -1128,6 +1153,9 @@
if (n_presses > 1)
return;
+ this._pressLatitude = this.map.viewport.latitude;
+ this._pressLongitude = this.map.viewport.longitude;
+
// remove any showing place markers when clicking outside
this._placeLayer.remove_all();
Application.application.selected_place = null;
diff -Nru gnome-maps-48.2/src/osmEditDialog.js gnome-maps-48.5/src/osmEditDialog.js
--- gnome-maps-48.2/src/osmEditDialog.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/osmEditDialog.js 2025-07-15 22:26:25.000000000 +0100
@@ -400,6 +400,7 @@
this._loadOSMData(osmObject);
} else {
this._showError(status, error);
+ this.close();
}
}
diff -Nru gnome-maps-48.2/src/placeEntry.js gnome-maps-48.5/src/placeEntry.js
--- gnome-maps-48.2/src/placeEntry.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/placeEntry.js 2025-07-15 22:26:25.000000000 +0100
@@ -435,6 +435,11 @@
this.text = '';
this.grab_focus();
}
+
+ vfunc_size_allocate(width, height, baseline) {
+ super.vfunc_size_allocate(width, height, baseline);
+ this._popover.present();
+ }
}
GObject.registerClass({
diff -Nru gnome-maps-48.2/src/place.js gnome-maps-48.5/src/place.js
--- gnome-maps-48.2/src/place.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/place.js 2025-07-15 22:26:25.000000000 +0100
@@ -361,7 +361,7 @@
if (osmTags) {
const tag = [
'place', 'amenity', 'leisure', 'shop', 'tourism', 'highway',
- 'railway', 'aeroway', 'building', 'office', 'historic', 'barrier'
+ 'railway', 'aeroway', 'office', 'building', 'historic', 'barrier'
].find(key => key in osmTags);
if (tag)
diff -Nru gnome-maps-48.2/src/printLayout.js gnome-maps-48.5/src/printLayout.js
--- gnome-maps-48.2/src/printLayout.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/printLayout.js 2025-07-15 22:26:25.000000000 +0100
@@ -265,7 +265,7 @@
name = name.substr(0, 22) + '\u2026';
} else {
let lat = place.location.latitude.toFixed(5);
- let lon = place.location.latitude.toFixed(5);
+ let lon = place.location.longitude.toFixed(5);
name = '%s, %s'.format(lat, lon);
}
diff -Nru gnome-maps-48.2/src/sidebar.js gnome-maps-48.5/src/sidebar.js
--- gnome-maps-48.2/src/sidebar.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/sidebar.js 2025-07-15 22:26:25.000000000 +0100
@@ -284,6 +284,7 @@
});
this._query.connect('run', () => {
+ this._transitHeader.visible_child_name = 'options';
this._instructionStack.visible_child = this._instructionSpinner;
});
diff -Nru gnome-maps-48.2/src/transitplugins/transitous.js gnome-maps-48.5/src/transitplugins/transitous.js
--- gnome-maps-48.2/src/transitplugins/transitous.js 2025-04-12 08:37:41.000000000 +0100
+++ gnome-maps-48.5/src/transitplugins/transitous.js 2025-07-15 22:26:25.000000000 +0100
@@ -21,7 +21,7 @@
import {Motis2} from './motis2.js';
-const BASE_URL = 'https://api.transitous.org/';
+const BASE_URL = 'https://api.transitous.org';
export class Transitous extends Motis2 {
constructor(params) {
