Changeset 15340 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-09-09T19:54:43+02:00 (5 years ago)

Author:

stoecker

Message:

fix #18116 - don't 'download along' already downloaded areas

File:

• trunk/src/org/openstreetmap/josm/actions/DownloadAlongAction.java (modified) (3 diffs)

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -87 +89 @@
             addToDownload(tmp, r2, results, maxArea);
         } else {
+            DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+            if (ds != null) {
+                Collection<Bounds> existing = ds.getDataSourceBounds();
+                if (existing != null) {
+                    double p = LatLon.MAX_SERVER_PRECISION;
+                    LatLon min = new LatLon(bounds.getY()+p, bounds.getX()+p);
+                    LatLon max = new LatLon(bounds.getY()+bounds.getHeight()-p, bounds.getX()+bounds.getWidth()-p);
+                    if(existing.stream().anyMatch(current -> (current.contains(min) && current.contains(max)))) {
+                        return; /* skip this one, already downloaded */
+                    }
+                }
+            }
             results.add(bounds);
         }
@@ -102 +116 @@
      * that goes like this: +----+ | /| | / | | / | |/ | +----+ then we would first look at
      * downloading the whole rectangle (assume it's too big), after that we split it in half
-     * (upper and lower half), but we donot request the full upper and lower rectangle, only
+     * (upper and lower half), but we do not request the full upper and lower rectangle, only
      * the part of the upper/lower rectangle that actually has something in it.
      *