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

Timestamp:

2021-10-27T09:11:31+02:00 (3 years ago)

Author:

GerdP

Message:

see #21154
Don't deny split with message "The selected nodes can not be consecutive nodes in the object." when a splitway is used that has more than two nodes.

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java

@@ -222 +222 @@
         }
         // both nodes aren't allowed to be consecutive
-        if (nodeIndex1 == nodeIndex2 + 1 ||
-                nodeIndex2 == nodeIndex1 + 1 ||
-                // minus 2 because we've a circular way where
-                // the penultimate node is the last unique one
-                (nodeIndex1 == 0 && nodeIndex2 == selectedWay.getNodesCount() - 2) ||
-                (nodeIndex2 == 0 && nodeIndex1 == selectedWay.getNodesCount() - 2)) {
+                if ((splitWay == null || splitWay.getNodesCount() == 2)
+                                && (nodeIndex1 == nodeIndex2 + 1 || nodeIndex2 == nodeIndex1 + 1 ||
+                                // minus 2 because we've a circular way where
+                                // the penultimate node is the last unique one
+                                                (nodeIndex1 == 0 && nodeIndex2 == selectedWay.getNodesCount() - 2)
+                                                || (nodeIndex2 == 0 && nodeIndex1 == selectedWay.getNodesCount() - 2))) {
             showWarningNotification(
                     tr("The selected nodes can not be consecutive nodes in the object."));