Changeset 14868 in josm for trunk/src/org

Timestamp:

2019-03-10T12:30:50+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17443: improve performance for GPX layer action "Download from OSM along this track"

• use Path2D.append() instead of Area.addToDownload() to calculate the area around the track
• use only the intersection of the original area in recursive calls of DownloadAlongAction.addToDownload()

Even complex tracks which cover huge areas are now handled within a few seconds insteads of several minutes
Possible improvement: remove progress monitor in DownloadAlongTrackAction and add progress monitor for recursion in addToDownload() in DownloadAlongAction

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAlongAction.java (modified) (1 diff)
• gui/layer/gpx/DownloadAlongTrackAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/DownloadAlongAction.java

@@ -69 +69 @@
                         bounds.getHeight() / 2);
             }
-            addToDownload(a, r1, results, maxArea);
-            addToDownload(a, r2, results, maxArea);
+            addToDownload(tmp, r1, results, maxArea);
+            addToDownload(tmp, r2, results, maxArea);
         } else {
             results.add(bounds);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
+import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 
@@ -104 +105 @@
         class CalculateDownloadArea extends PleaseWaitRunnable {
 
-            private final Area a = new Area();
+            private final Path2D path = new Path2D.Double();
             private boolean cancel;
             private int ticks;
@@ -128 +129 @@
                     return;
                 }
-                confirmAndDownloadAreas(a, maxArea, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
+                confirmAndDownloadAreas(new Area(path), maxArea, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
                         tr("Download from OSM along this track"), progressMonitor);
             }
@@ -152 +153 @@
                     // we add a buffer around the point.
                     r.setRect(c.lon() - bufferX, c.lat() - bufferY, 2 * bufferX, 2 * bufferY);
-                    a.add(new Area(r));
+                    path.append(r, false);
                     return c;
                 }