Changeset 12032 in josm for trunk/src

Timestamp:

2017-04-30T23:24:11+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14708 - no warning about potentially erroneous movement of existing nodes

File:

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

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
@@ -14 +18 @@
 
 /**
- * Checks for untagged ways
+ * Checks for very long segments.
  *
  * @since 8320
@@ -24 +28 @@
     /** Maximum segment length for this test */
     protected int maxlength;
+    /** set of visited ways */
+    private final Set<Way> visitedWays = new HashSet<>();
 
     /**
@@ -34 +40 @@
 
     @Override
+    public void visit(Node n) {
+        for (Way w : n.getParentWays()) {
+            if (isPrimitiveUsable(w)) {
+                testWay(w);
+            }
+        }
+    }
+
+    @Override
     public void visit(Way w) {
-        if (w.hasTag("route", "ferry")) {
+        testWay(w);
+    }
+
+    private void testWay(Way w) {
+        if (visitedWays.contains(w) || w.hasTag("route", "ferry")) {
             return;
         }
+        visitedWays.add(w);
         Double length = w.getLongestSegmentLength();
         if (length > maxlength) {
@@ -52 +72 @@
         super.startTest(monitor);
         maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15_000);
+        visitedWays.clear();
+    }
+
+    @Override
+    public void endTest() {
+        visitedWays.clear();
+        super.endTest();
     }
 
     @Override
     public boolean isPrimitiveUsable(OsmPrimitive p) {
-        return p.isUsable() && p instanceof Way && ((Way) p).getNodesCount() > 1; // test only Ways with at least 2 nodes
+        // test only nodes and Ways with at least 2 nodes
+        return p.isUsable() && ((p instanceof Node && p.isDrawable()) || (p instanceof Way && ((Way) p).getNodesCount() > 1));
     }
 }