Changeset 27698 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2012-02-03T16:49:50+01:00 (12 years ago)

Author:

joshdoe

Message:

utilsplugin2: Fix #7295, allow Replace Geometry action with ways which share tagged nodes

File:

• applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java

@@ -198 +198 @@
         }
         
-        if (hasImportantNode(way)) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("The way to be replaced cannot have any nodes with properties or relation memberships."),
+        if (hasImportantNode(geometry, way)) {
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("The way to be replaced cannot have any nodes with properties or relation memberships unless they belong to both ways."),
                     TITLE, JOptionPane.WARNING_MESSAGE);
             return;
@@ -297 +297 @@
      * @return 
      */
-    protected boolean hasImportantNode(Way way) {
+    protected boolean hasImportantNode(Way geometry, Way way) {
         for (Node n : way.getNodes()) {
+            // if original and replacement way share a node, it's safe to replace
+            if (geometry.containsNode(n)) {
+                continue;
+            }
             //TODO: if way is connected to other ways, warn or disallow?
             for (OsmPrimitive o : n.getReferrers()) {