Changeset 18320 in josm for trunk/src/org

Timestamp:

2021-11-09T09:12:23+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #21538 - Fixed GPS traces no longer being browsable (patch by ygramul, modified)

File:

• trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -52 +55 @@
         GpxData result = null;
         final int pointsPerPage = 5000; // see https://wiki.openstreetmap.org/wiki/API_v0.6#GPS_traces
-        String url = "trackpoints?bbox="+b.getMinLon()+','+b.getMinLat()+','+b.getMaxLon()+','+b.getMaxLat()+"&page=";
+        final String url = getBaseUrl() + "trackpoints?bbox="+b.getMinLon()+','+b.getMinLat()+','+b.getMaxLon()+','+b.getMaxLat()+"&page=";
         for (int i = 0; !done && !isCanceled(); ++i) {
             progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * pointsPerPage, (i + 1) * pointsPerPage));
@@ -63 +66 @@
                 gpxParsedProperly = reader.parse(false);
                 GpxData currentGpx = reader.getGpxData();
+
+                // #21538 - Apparently track URLs are no longer complete URLs, but only paths
+                // We'll prefix the browse URL to get something to navigate to again.
+                final String browseUrl = Config.getUrls().getBaseBrowseUrl();
+                for (IGpxTrack track : currentGpx.tracks) {
+                    Object trackUrl = track.get("url");
+                    if (trackUrl instanceof String) {
+                        String sTrackUrl = (String) trackUrl;
+                        if (!Utils.isBlank(sTrackUrl) && !sTrackUrl.startsWith("http")) {
+                            track.put("url", browseUrl + sTrackUrl);
+                        }
+                    }
+                }
+
                 long count = 0;
                 if (currentGpx.hasTrackPoints()) {