Changeset 6619 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2014-01-04T01:51:27+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9523 - validator: Only raise "Way contains segment twice" error if at least two nodes are found twice

File:

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

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

@@ -158 +158 @@
             @Override
             public int compare(WaySegment o1, WaySegment o2) {
-                return o1.way.getNode(o1.lowerIndex).compareTo(o2.way.getNode(o2.lowerIndex));
+                return o1.getFirstNode().compareTo(o2.getFirstNode());
             }
         });
         final Set<Integer> wayNodesToFix = new TreeSet<Integer>(Collections.reverseOrder());
+        
         for (int i = 0; i < w.getNodesCount() - 1; i++) {
             final boolean wasInSet = !segments.add(new WaySegment(w, i));
@@ -168 +169 @@
             }
         }
-        if (!wayNodesToFix.isEmpty()) {
+        if (wayNodesToFix.size() > 1) {
             final List<Node> newNodes = new ArrayList<Node>(w.getNodes());
             for (final int i : wayNodesToFix) {