Changeset 11735 in josm for trunk

Timestamp:

2017-03-16T22:31:32+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #5092 - Synchronization issue with nodes deleted on server

File:

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

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

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
@@ -19 +21 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.io.UpdatePrimitivesTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -272 +278 @@
             if (layer == null) {
                 layer = Optional.ofNullable(getEditLayer()).orElseGet(this::getFirstDataLayer);
+                Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.data);
                 layer.mergeFrom(dataSet);
                 if (zoomAfterDownload) {
                     computeBboxAndCenterScale(bounds);
                 }
+                if (!primitivesToUpdate.isEmpty()) {
+                    Main.worker.submit(new UpdatePrimitivesTask(layer, primitivesToUpdate));
+                }
                 layer.onPostDownloadFromServer();
             }
+        }
+
+        /**
+         * Look for primitives deleted on server (thus absent from downloaded data)
+         * but still present in existing data layer
+         * @param b download bounds
+         * @param ds existing data set
+         * @return the primitives to update
+         */
+        private Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds b, DataSet ds) {
+            Collection<OsmPrimitive> col = new ArrayList<>();
+            ds.searchNodes(b.toBBox()).stream().filter(n -> !n.isNew() && !dataSet.containsNode(n)).forEachOrdered(col::add);
+            if (!col.isEmpty()) {
+                Set<Way> ways = new HashSet<>();
+                Set<Relation> rels = new HashSet<>();
+                for (OsmPrimitive n : col) {
+                    for (OsmPrimitive ref : n.getReferrers()) {
+                        if (ref.isNew()) {
+                            continue;
+                        } else if (ref instanceof Way) {
+                            ways.add((Way) ref);
+                        } else if (ref instanceof Relation) {
+                            rels.add((Relation) ref);
+                        }
+                    }
+                }
+                ways.stream().filter(w -> !dataSet.containsWay(w)).forEachOrdered(col::add);
+                rels.stream().filter(r -> !dataSet.containsRelation(r)).forEachOrdered(col::add);
+            }
+            return col;
         }
     }