Changeset 5686 in josm for trunk

Timestamp:

2013-01-28T23:07:30+01:00 (11 years ago)

Author:

bastiK

Message:

fixed #7889 - Error making a way rectangular while two nodes should keep their positions

File:

• trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) (2 diffs)

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

@@ -342 +342 @@
                     }
                 }
+                for (Node n : cs) {
+                    s.remove(n);
+                }
 
                 final HashMap<Node, Double> nC = (orientation == HORIZONTAL) ? nY : nX;
@@ -358 +361 @@
                 }
 
+                // At this point, the two heading nodes (if any) are horizontally aligned, i.e. they
+                // have the same y coordinate. So in general we shouldn't find them in a vertical string
+                // of segments. This can still happen in some pathological cases (see #7889). To avoid
+                // both heading nodes collapsing to one point, we simply skip this segment string and
+                // don't touch the node coordinates.
+                if (orientation == VERTICAL && headingNodes.size() == 2 && cs.containsAll(headingNodes)) {
+                    continue;
+                }
+
                 for (Node n : cs) {
                     nC.put(n, average);
-                }
-
-                for (Node n : cs) {
-                    s.remove(n);
                 }
             }