Ticket #24717: 24717-v1.patch

src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -6 +6 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.geom.Area;
-import java.util.List;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
@@ -61 +59 @@
         if (!isEnabled() || editLayer == null || !editLayer.isDownloadable())
             return;
 
-        List<Area> areas = editLayer.data.getDataSources().stream()
-                .map(ds -> new Area(ds.bounds.asRect()))
-                .collect(Collectors.toList());
-
-        // The next two blocks removes every intersection from every DataSource Area
-        // This prevents downloading the same data numerous times at intersections
-        // and also skips smaller bounding boxes that are contained within larger ones entirely.
-        for (int i = 0; i < areas.size(); i++) {
-            for (int j = i+1; j < areas.size(); j++) {
-                areas.get(i).subtract(areas.get(j));
-            }
-        }
-
-        for (int i = areas.size()-1; i > 0; i--) {
-            for (int j = i-1; j > 0; j--) {
-                areas.get(i).subtract(areas.get(j));
-            }
-        }
-
-        List<Area> areasToDownload = areas.stream()
-                .filter(a -> !a.isEmpty())
-                .collect(Collectors.toList());
-
-        if (areasToDownload.isEmpty()) {
+        if (editLayer.data.getDataSources().isEmpty()) {
             // no bounds defined in the dataset? We update all but the incomplete primitives in the data set
             UpdateSelectionAction.updatePrimitives(editLayer.data.allPrimitives().stream()
                     .filter(p -> !p.isNew() && !p.isIncomplete()).collect(Collectors.toList()));
@@ -92 +67 @@
             // bounds defined? => use the bbox downloader
             final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
             final Future<?> future = new DownloadTaskList(Config.getPref().getBoolean("update.data.zoom-after-download"))
-                    .download(false /* no new layer */, areasToDownload, true, false, monitor);
+                    .fullUpdate(monitor);
             waitFuture(future, monitor);
         }
     }

src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

@@ -47 +47 @@
 public class DownloadTaskList {
     private final List<DownloadTask> tasks = new LinkedList<>();
     private final List<Future<?>> taskFutures = new LinkedList<>();
+    private boolean isFullUpdate;
     private final boolean zoomAfterDownload;
     private ProgressMonitor progressMonitor;
 
@@ -131 +132 @@
         }
     }
 
+    /**
+     * Fully updates the current edit layer by re-downloading all the layer's
+     * declared bounding boxes from the OSM server.
+     *
+     * For full updates, this method should be preferred to the {@code download}
+     * methods because it uses a more effective algorithm to detect primitives that
+     * may have been deleted from the server; see #24717.
+     *
+     * @param progressMonitor The progress monitor
+     * @return The Future representing the asynchronous download task
+     */
+    public Future<?> fullUpdate(ProgressMonitor progressMonitor) {
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        if (editLayer == null || !editLayer.isDownloadable())
+            throw new IllegalStateException("The current edit layer is not downloadable.");
+        if (editLayer.data.getDataSources().isEmpty())
+            throw new IllegalStateException("The current edit layer has no declared bounds.");
+
+        List<Area> areas = editLayer.data.getDataSources().stream()
+                .map(ds -> new Area(ds.bounds.asRect()))
+                .collect(Collectors.toList());
+
+        // The next two blocks removes every intersection from every DataSource Area
+        // This prevents downloading the same data numerous times at intersections
+        // and also skips smaller bounding boxes that are contained within larger ones entirely.
+        for (int i = 0; i < areas.size(); i++) {
+            for (int j = i+1; j < areas.size(); j++) {
+                areas.get(i).subtract(areas.get(j));
+            }
+        }
+
+        for (int i = areas.size()-1; i > 0; i--) {
+            for (int j = i-1; j > 0; j--) {
+                areas.get(i).subtract(areas.get(j));
+            }
+        }
+
+        List<Area> areasToDownload = areas.stream()
+                .filter(a -> !a.isEmpty())
+                .collect(Collectors.toList());
+
+        isFullUpdate = true;
+        return download(false /* no new layer */, areasToDownload, true, false, progressMonitor);
+    }
+
     /**
      * Replies the set of ids of all complete, non-new primitives (i.e. those with !primitive.incomplete)
      * @param ds data set
@@ -275 +321 @@
                         .filter(DownloadOsmTask.class::isInstance).map(DownloadOsmTask.class::cast)
                         .filter(t -> t.getDownloadedData() != null)
                         .collect(Collectors.toList());
-                final Set<Bounds> tasksBounds = osmTasks.stream()
-                        .flatMap(t -> t.getDownloadedData().getDataSourceBounds().stream())
-                        .collect(Collectors.toSet());
-                final Set<Bounds> layerBounds = new LinkedHashSet<>(editDataSet.getDataSourceBounds());
                 final Set<OsmPrimitive> myPrimitives = new LinkedHashSet<>();
-                if (layerBounds.equals(tasksBounds)) {
+                if (isFullUpdate) {
                     // the full edit layer is updated (we have downloaded again all its current bounds)
                     myPrimitives.addAll(getCompletePrimitives(editDataSet));
                     for (DownloadOsmTask task : osmTasks) {