Changeset 4950 in josm for trunk/src

Timestamp:

2012-02-16T08:37:57+01:00 (13 years ago)

Author:

stoecker

Message:

fix way ends on area check

File:

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

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

@@ -4 +4 @@
 
 import java.util.Arrays;
+import java.util.List;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -25 +26 @@
         }
 
-        for (OsmPrimitive p : w.firstNode().getReferrers()) {
-            testForError(w, w.firstNode(), p);
+        boolean hasway = false;
+        List<OsmPrimitive> r = w.firstNode().getReferrers();
+        for (OsmPrimitive p : r) {
+            if(p != w && p.hasKey("highway")) {
+                hasway = true;
+                break;
+            }
         }
-        for (OsmPrimitive p : w.lastNode().getReferrers()) {
-            testForError(w, w.lastNode(), p);
+        if(!hasway)
+        {
+            for (OsmPrimitive p : r) {
+                testForError(w, w.firstNode(), p);
+            }
         }
-
+        hasway = false;
+        r = w.lastNode().getReferrers();
+        for (OsmPrimitive p : r) {
+            if(p != w && p.hasKey("highway")) {
+                hasway = true;
+                break;
+            }
+        }
+        if(!hasway) {
+            for (OsmPrimitive p : r) {
+                testForError(w, w.lastNode(), p);
+            }
+        }
     }