Changeset 17240 in josm for trunk/src/org

Timestamp:

2020-10-19T10:56:31+02:00 (4 years ago)

Author:

GerdP

Message:

fix #14620: DataIntegrityProblemException: Deleted node referenced while using conflation
The plugin shows an error in the core class AddPrimitivesCommand.

• AddPrimitivesCommand undo crashes with existing data with status "deleted" Patch by Tyndare, modified
• add stability for primitives with the same unique id but different types, like a way and a node with the same id.
• add unit tests for both

File:

• trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -100 +100 @@
             // a subsequent command (e.g. MoveCommand) cannot be redone.
             for (OsmPrimitive osm : createdPrimitives) {
-                if (preExistingData.stream().anyMatch(pd -> pd.getUniqueId() == osm.getUniqueId())) {
-                    Optional<PrimitiveData> o = data.stream().filter(pd -> pd.getUniqueId() == osm.getUniqueId()).findAny();
+                if (preExistingData.stream().anyMatch(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId()))) {
+                    Optional<PrimitiveData> o = data.stream()
+                            .filter(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId())).findAny();
                     if (o.isPresent()) {
                         osm.load(o.get());
@@ -126 +127 @@
             createdPrimitives = PurgeCommand.topoSort(createdPrimitives);
         }
-        for (OsmPrimitive osm : createdPrimitives) {
-            Optional<PrimitiveData> previous = preExistingData.stream().filter(pd -> pd.getUniqueId() == osm.getUniqueId()).findAny();
+        // reversed order, see #14620
+        for (int i = createdPrimitives.size() - 1; i >= 0; i--) {
+            OsmPrimitive osm = createdPrimitives.get(i);
+            Optional<PrimitiveData> previous = preExistingData.stream()
+                    .filter(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId())).findAny();
             if (previous.isPresent()) {
                 osm.load(previous.get());