Changeset 6694 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-01-15T21:59:27+01:00 (10 years ago)

Author:

simon04

Message:

see #9577 - Highlight duplicate way segments of "Way contains segment twice" test

File:

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

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

@@ -10 +10 @@
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -154 +155 @@
     }
 
-    public static Command fixDuplicateWaySegment(Way w) {
+    public static Pair<ChangeNodesCommand, Set<WaySegment>> fixDuplicateWaySegment(Way w) {
         // test for ticket #4959
         Set<WaySegment> segments = new TreeSet<WaySegment>(new Comparator<WaySegment>() {
@@ -169 +170 @@
         });
         final Set<Integer> wayNodesToFix = new TreeSet<Integer>(Collections.reverseOrder());
-        
+        final Set<WaySegment> duplicateWaySegments = new HashSet<WaySegment>();
+
         for (int i = 0; i < w.getNodesCount() - 1; i++) {
-            final boolean wasInSet = !segments.add(new WaySegment(w, i));
+            final WaySegment segment = new WaySegment(w, i);
+            final boolean wasInSet = !segments.add(segment);
             if (wasInSet) {
                 wayNodesToFix.add(i);
+                duplicateWaySegments.add(segment);
             }
         }
@@ -181 +185 @@
                 newNodes.remove(i);
             }
-            return new ChangeNodesCommand(w, newNodes);
+            return Pair.create(new ChangeNodesCommand(w, newNodes), duplicateWaySegments);
         } else {
             return null;
@@ -190 +194 @@
     public void visit(Way w) {
 
-        final Command duplicateWaySegmentFix = fixDuplicateWaySegment(w);
-        if (duplicateWaySegmentFix != null) {
+        final Pair<ChangeNodesCommand, Set<WaySegment>> duplicateWaySegment = fixDuplicateWaySegment(w);
+        if (duplicateWaySegment != null) {
             errors.add(new FixableTestError(this, Severity.ERROR, tr("Way contains segment twice"),
-                    DUPLICATE_WAY_SEGMENT, w, duplicateWaySegmentFix));
+                    DUPLICATE_WAY_SEGMENT, Collections.singleton(w), duplicateWaySegment.b, duplicateWaySegment.a));
             return;
         }