Changeset 6722 in josm for trunk/src/org

Timestamp:

2014-01-17T23:35:14+01:00 (11 years ago)

Author:

simon04

Message:

fix #9577 - Remove automatic fix for "Way contains segment twice"

Since we highlight duplicate segments since r6694, it seems easier/safer to let the user manually fix this (rare?) error.

File:

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

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

@@ -16 +16 @@
 import java.util.TreeSet;
 
-import org.openstreetmap.josm.command.ChangeNodesCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -24 +22 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -155 +152 @@
     }
 
-    public static Pair<ChangeNodesCommand, Set<WaySegment>> fixDuplicateWaySegment(Way w) {
+    protected static Set<WaySegment> checkDuplicateWaySegment(Way w) {
         // test for ticket #4959
         Set<WaySegment> segments = new TreeSet<WaySegment>(new Comparator<WaySegment>() {
@@ -169 +166 @@
             }
         });
-        final Set<Integer> wayNodesToFix = new TreeSet<Integer>(Collections.reverseOrder());
         final Set<WaySegment> duplicateWaySegments = new HashSet<WaySegment>();
 
@@ -176 +172 @@
             final boolean wasInSet = !segments.add(segment);
             if (wasInSet) {
-                wayNodesToFix.add(i);
                 duplicateWaySegments.add(segment);
             }
         }
-        if (wayNodesToFix.size() > 1) {
-            final List<Node> newNodes = new ArrayList<Node>(w.getNodes());
-            for (final int i : wayNodesToFix) {
-                newNodes.remove(i);
-            }
-            return Pair.create(new ChangeNodesCommand(w, newNodes), duplicateWaySegments);
+        if (duplicateWaySegments.size() > 1) {
+            return duplicateWaySegments;
         } else {
             return null;
@@ -194 +185 @@
     public void visit(Way w) {
 
-        final Pair<ChangeNodesCommand, Set<WaySegment>> duplicateWaySegment = fixDuplicateWaySegment(w);
+        final Set<WaySegment> duplicateWaySegment = checkDuplicateWaySegment(w);
         if (duplicateWaySegment != null) {
-            errors.add(new FixableTestError(this, Severity.ERROR, tr("Way contains segment twice"),
-                    DUPLICATE_WAY_SEGMENT, Collections.singleton(w), duplicateWaySegment.b, duplicateWaySegment.a));
+            errors.add(new TestError(this, Severity.ERROR, tr("Way contains segment twice"),
+                    DUPLICATE_WAY_SEGMENT, Collections.singleton(w), duplicateWaySegment));
             return;
         }