Changeset 14761 in josm for trunk

Timestamp:

2019-02-05T10:53:02+01:00 (6 years ago)

Author:

GerdP

Message:

fix #13195
1) BoundingBoxDownloader: Reduce number of gpx api calls: If a call returned less than 5000 points there is no need to request another page. This improves all routines which download raw GPX data from the server.
2) GpxImporter: Create a new GpxLayer even if the area contains no GPX data. This allows to keep track of the already downloaded boundaries. Without this change the continuosDownload will try agaian and again to download data from this area because the GpxLayer will not contain the information that the corresponding bbox was already downloaded.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (2 diffs)
• gui/io/importexport/GpxImporter.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.Bounds.ParseMethod;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
@@ -161 +159 @@
                 mergeLayer.mergeFrom(layer);
                 mergeLayer.invalidate();
-                MapFrame map = MainApplication.getMap();
-                if (map != null && zoomAfterDownload && layer instanceof GpxLayer) {
-                    map.mapView.scheduleZoomTo(new ViewportData(layer.getViewProjectionBounds()));
-                }
                 return mergeLayer;
             }

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -145 +145 @@
         GpxLayer gpxLayer = null;
         MarkerLayer markerLayer = null;
-        if (data.hasRoutePoints() || data.hasTrackPoints()) {
-            gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
-        }
+        gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
         if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
             markerLayer = new MarkerLayer(data, markerLayerName, data.storageFile, gpxLayer);

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

@@ -51 +51 @@
         boolean done = false;
         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=";
         for (int i = 0; !done && !isCanceled(); ++i) {
-            progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * 5000, (i + 1) * 5000));
+            progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * pointsPerPage, (i + 1) * pointsPerPage));
             try (InputStream in = getInputStream(url+i, progressMonitor.createSubTaskMonitor(1, true))) {
                 if (in == null) {
@@ -65 +66 @@
                     result = currentGpx;
                 } else if (currentGpx.hasTrackPoints()) {
+                    long count = currentGpx.getTrackPoints().count();
+                    Logging.debug("got {0} gpx points", count);
+                    if (count < pointsPerPage)
+                        done = true;
                     result.mergeFrom(currentGpx);
                 } else {