Changeset 4053 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-04-21T00:05:17+02:00 (14 years ago)

Author:

stoecker

Message:

fix #6219 - don't create ways containing a double node

File:

• trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) (4 diffs)

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

@@ -58 +58 @@
                 this.nodes = nodes.toArray(new Node[nodes.size()]);
             }
-            for (Node node:this.nodes) {
+            for (Node node: this.nodes) {
                 node.addReferrer(this);
             }
@@ -67 +67 @@
             writeUnlock(locked);
         }
+    }
+
+    /**
+     * Prevent directly following identical nodes in ways.
+     */
+    private List<Node> removeDouble(List<Node> nodes) {
+        Node last = null;
+        int count = nodes.size();
+        for(int i = 0; i < count && count > 2; ++i) {
+            Node n = nodes.get(i);
+            if(last == n) {
+                nodes.remove(i);
+                --count;
+            }
+            last = n;
+        }
+        return nodes;
     }
 
@@ -278 +295 @@
                 copy.remove(i-1);
             }
-            setNodes(copy);
+            setNodes(removeDouble(copy));
         } finally {
             writeUnlock(locked);
@@ -303 +320 @@
                 copy.remove(i-1);
             }
-            setNodes(copy);
+            setNodes(removeDouble(copy));
         } finally {
             writeUnlock(locked);