Changeset 15353 in josm for trunk/src/org

Timestamp:

2019-09-16T01:50:12+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18118 - don't warn about potentially deleted objects when using download along several times

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadOsmTask.java (modified) (2 diffs)
• DownloadTaskList.java (modified) (2 diffs)

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

@@ -203 +203 @@
     }
 
+    protected Collection<OsmPrimitive> searchPotentiallyDeletedPrimitives(DataSet ds) {
+        return downloadTask.searchPrimitivesToUpdate(currentBounds, ds);
+    }
+
     /**
      * Superclass of internal download task.
@@ -376 +380 @@
          * @return the primitives to update
          */
-        private Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds bounds, DataSet ds) {
+        protected Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds bounds, DataSet ds) {
             if (bounds == null)
                 return Collections.emptySet();

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

@@ -252 +252 @@
                 }
             }
-            Set<Object> errors = new LinkedHashSet<>();
-            for (DownloadTask dt : tasks) {
-                errors.addAll(dt.getErrorObjects());
-            }
+            Set<Object> errors = tasks.stream().flatMap(t -> t.getErrorObjects().stream()).collect(Collectors.toSet());
             if (!errors.isEmpty()) {
                 final Collection<String> items = new ArrayList<>();
@@ -290 +287 @@
                 }
             }
-            final OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-            if (editLayer != null && osmData) {
-                final Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.getDataSet());
-                for (DownloadTask task : tasks) {
-                    if (task instanceof DownloadOsmTask) {
-                        DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
-                        if (ds != null) {
-                            // myPrimitives.removeAll(ds.allPrimitives()) will do the same job but much slower
-                            for (OsmPrimitive primitive: ds.allPrimitives()) {
-                                myPrimitives.remove(primitive);
-                            }
-                        }
+            final DataSet editDataSet = MainApplication.getLayerManager().getEditDataSet();
+            if (editDataSet != null && osmData) {
+                final List<DownloadOsmTask> osmTasks = tasks.stream()
+                        .filter(t -> t instanceof DownloadOsmTask).map(t -> (DownloadOsmTask) t)
+                        .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)) {
+                    // the full edit layer is updated (we have downloaded again all its current bounds)
+                    myPrimitives.addAll(getCompletePrimitives(editDataSet));
+                    for (DownloadOsmTask task : osmTasks) {
+                        // myPrimitives.removeAll(ds.allPrimitives()) will do the same job but much slower
+                        task.getDownloadedData().allPrimitives().forEach(myPrimitives::remove);
+                    }
+                } else {
+                    // partial update, only check what has been downloaded
+                    for (DownloadOsmTask task : osmTasks) {
+                        myPrimitives.addAll(task.searchPotentiallyDeletedPrimitives(editDataSet));
                     }
                 }