Changeset 6574 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-31T11:34:53+01:00 (11 years ago)

Author:

simon04

Message:

fix #4959 - Validator: check and fix ways with duplicate way segments

For instance, a way with nodes 0 2 4 2 4 6 is fixed to 0 2 4 6.

File:

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

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+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;
@@ -17 +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;
@@ -41 +47 @@
     protected static final int OVERLAPPING_WAY_AREA = 113;
     protected static final int OVERLAPPING_AREA = 120;
+    protected static final int DUPLICATE_WAY_SEGMENT = 121;
 
     /** Constructor */
@@ -146 +153 @@
     }
 
+    public static Command fixDuplicateWaySegment(Way w) {
+        // test for ticket #4959
+        Set<WaySegment> segments = new TreeSet<WaySegment>(new Comparator<WaySegment>() {
+            @Override
+            public int compare(WaySegment o1, WaySegment o2) {
+                return o1.way.getNode(o1.lowerIndex).compareTo(o2.way.getNode(o2.lowerIndex));
+            }
+        });
+        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));
+            if (wasInSet) {
+                wayNodesToFix.add(i);
+            }
+        }
+        if (!wayNodesToFix.isEmpty()) {
+            final List<Node> newNodes = new ArrayList<Node>(w.getNodes());
+            for (final int i : wayNodesToFix) {
+                newNodes.remove(i);
+            }
+            return new ChangeNodesCommand(w, newNodes);
+        } else {
+            return null;
+        }
+    }
+
     @Override
     public void visit(Way w) {
+
+        final Command duplicateWaySegmentFix = fixDuplicateWaySegment(w);
+        if (duplicateWaySegmentFix != null) {
+            errors.add(new FixableTestError(this, Severity.ERROR, tr("Way contains segment twice"),
+                    DUPLICATE_WAY_SEGMENT, w, duplicateWaySegmentFix));
+            return;
+        }
+
         Node lastN = null;
         int i = -2;