Changeset 7644 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java

Timestamp:

2014-10-22T12:25:23+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #10655 - WayConnectedToArea should not warn on leisure=slipway

File:

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

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

@@ -71 +71 @@
             return;
         } else if (isArea(p)) {
-            addError(w, wayNode, p);
+            addPossibleError(w, wayNode, p, p);
         } else {
             for (OsmPrimitive r : p.getReferrers()) {
@@ -77 +77 @@
                         && r.hasTag("type", "multipolygon")
                         && isArea(r)) {
-                    addError(w, wayNode, p);
+                    addPossibleError(w, wayNode, p, r);
                     break;
                 }
@@ -89 +89 @@
     }
 
-    private void addError(Way w, Node wayNode, OsmPrimitive p) {
+    private void addPossibleError(Way w, Node wayNode, OsmPrimitive p, OsmPrimitive area) {
+        // Avoid "legal" cases (see #10655)
+        if (w.hasKey("highway") && wayNode.hasTag("leisure", "slipway") && area.hasTag("natural", "water")) {
+            return;
+        }
         errors.add(new TestError(this, Severity.WARNING,
                 tr("Way terminates on Area"), 2301,