Changeset 5570 in josm for trunk/src/org

Timestamp:

2012-11-04T18:43:45+01:00 (12 years ago)

Author:

jttt

Message:

Split way - allow special case when selected way touches way that we want to split (but it is not selected)

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -11 +11 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -190 +191 @@
             return null;
 
+        // Special case - one of the selected ways touches (not cross) way that we want to split
+        if (selectedNodes.size() == 1) {
+            Node n = selectedNodes.get(0);
+            List<Way> referedWays = OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
+            Way inTheMiddle = null;
+            boolean foundSelected = false;
+            for (Way w: referedWays) {
+                if (selectedWays.contains(w)) {
+                    foundSelected = true;
+                }
+                if (w.getNode(0) != n && w.getNode(w.getNodesCount() - 1) != n) {
+                    if (inTheMiddle == null) {
+                        inTheMiddle = w;
+                    } else {
+                        inTheMiddle = null;
+                        break;
+                    }
+                }
+            }
+            if (foundSelected && inTheMiddle != null)
+                return Collections.singletonList(inTheMiddle);
+        }
+
         // List of ways shared by all nodes
         List<Way> result = new ArrayList<Way>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
@@ -487 +511 @@
                         tr("Split way {0} into {1} parts", way.getDisplayName(DefaultNameFormatter.getInstance()),wayChunks.size()),
                         commandList
-                ),
-                newSelection,
-                way,
-                newWays
-        );
+                        ),
+                        newSelection,
+                        way,
+                        newWays
+                );
     }