Changeset 36136 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

Timestamp:

2023-09-11T20:01:42+02:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #23170: DataIntegrityProblemException: Deleted node referenced when reconstructing a polygon

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -64 +64 @@
         boolean wont = false;
         for (RelationMember m : r.getMembers()) {
-            if (m.isWay()) {
+            if (m.isWay() && m.getWay().getReferrers().size() == 1) {
                 ways.add(m.getWay());
             } else {
@@ -72 +72 @@
         if (wont) {
             JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
-                    tr("Multipolygon must consist only of ways"), tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
+                    tr("Multipolygon must consist only of ways with one referring relation"),
+                    tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -174 +175 @@
                                 candidateWay = tmp;
                             }
-                            final Command deleteCommand = DeleteCommand.delete(Collections.singleton(w));
-                            if (deleteCommand != null) {
-                                commands.add(deleteCommand);
-                            }
+                            commands.add(new DeleteCommand(w));
                         }
                     }