Changeset 6693 in josm for trunk/src

Timestamp:

2014-01-15T21:46:11+01:00 (10 years ago)

Author:

simon04

Message:

see #9577 - Improve "Way contains segment twice" test (false-positives)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -158 +159 @@
             @Override
             public int compare(WaySegment o1, WaySegment o2) {
-                return o1.getFirstNode().compareTo(o2.getFirstNode());
+                final List<Node> n1 = Arrays.asList(o1.getFirstNode(), o1.getSecondNode());
+                final List<Node> n2 = Arrays.asList(o2.getFirstNode(), o2.getSecondNode());
+                Collections.sort(n1);
+                Collections.sort(n2);
+                final int first = n1.get(0).compareTo(n2.get(0));
+                final int second = n1.get(1).compareTo(n2.get(1));
+                return first != 0 ? first : second;
             }
         });