Changeset 35563 in osm for applications/editors/josm

Timestamp:

2020-09-29T16:37:29+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19864: DataIntegrityProblemException: Deleted member referenced

• create only one change command for each parent relation
• delete all merged nodes in a final command

File:

• applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java (modified) (5 diffs)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -15 +16 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 import java.util.Set;
 
@@ -34 +36 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -109 +112 @@
         int multi = 0;
         int conflicts = 0;
-
+        List<Pair<Node, Way>> replaced = new ArrayList<>();
+        Set<Relation> modifiedRelations = new HashSet<>();
         for (Way w : buildings) {
             Node mergeNode = null;
@@ -147 +151 @@
                     cmds.add(new ChangePropertyCommand(Collections.singleton(w), tags));
                 if (!hasConflicts) {
-                    for (OsmPrimitive p : mergeNode.getReferrers()) {
-                        Relation r = (Relation) p;
-                        Relation rnew = new Relation(r);
-                        for (int i = 0; i < r.getMembersCount(); i++) {
-                            RelationMember member = r.getMember(i);
-                            if (mergeNode.equals(member.getMember())) {
-                                rnew.removeMember(i);
-                                rnew.addMember(i, new RelationMember(member.getRole(), w));
-                            }
-                        }
-                        cmds.add(new ChangeCommand(r, rnew));
-                    }
-                    cmds.add(new DeleteCommand(mergeNode));
-                }
-            }
-        }
+                    replaced.add(Pair.create(mergeNode, w));
+                    modifiedRelations.addAll(mergeNode.referrers(Relation.class).collect(Collectors.toList()));
+                }
+            }
+        }
+
+        for (Relation r : modifiedRelations) {
+            Relation rnew = new Relation(r);
+            boolean modified = false;
+            for (Pair<Node, Way> repl : replaced) {
+                for (int i = 0; i < rnew.getMembersCount(); i++) {
+                    RelationMember member = rnew.getMember(i);
+                    if (repl.a.equals(member.getMember())) {
+                        rnew.removeMember(i);
+                        rnew.addMember(i, new RelationMember(member.getRole(), repl.b));
+                        modified = true;
+                    }
+                }
+            }
+            if (modified) {
+                cmds.add(new ChangeCommand(r, rnew));
+            }
+        }
+        cmds.add(new DeleteCommand(replaced.stream().map(p -> p.a).collect(Collectors.toList())));
+
         if (multi != 0)
             new Notification(trn("There is {0} building with multiple address nodes inside",