Changeset 3515 in josm for trunk

Timestamp:

2010-09-09T17:14:05+02:00 (14 years ago)

Author:

stoecker

Message:

fixed #5431 - splitting way fails when outer-node is also inner node

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SplitWayAction.java (modified) (1 diff)
• data/osm/Way.java (modified) (1 diff)

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

@@ -118 +118 @@
                 while (it.hasNext()) {
                     Way w = it.next();
-                    assert w.isUsable(); // Way is referrer of selected node(s) so it must be usable
-                    int last = w.getNodesCount() - 1;
-                    boolean circular = w.isClosed();
-
                     for (Node n : selectedNodes) {
-                        int i = w.getNodes().indexOf(n);
-                        if (!(circular || (i > 0 && i < last))) {
+                        if(!w.isInnerNode(n)) {
                             it.remove();
                             continue WAY_LOOP;

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -407 +407 @@
     }
 
+    public boolean isInnerNode(Node n) {
+        Node[] nodes = this.nodes;
+        if (isIncomplete() || nodes.length <= 2) return false;
+        /* circular ways have only inner nodes, so return true for them! */
+        if (n == nodes[0] && n == nodes[nodes.length-1]) return true;
+        for(int i = 1; i < nodes.length - 1; ++i) {
+            if(nodes[i] == n) return true;
+        }
+        return false;
+    }
+
+
     @Override
     public String getDisplayName(NameFormatter formatter) {