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

Timestamp:

2011-12-23T14:44:32+01:00 (13 years ago)

Author:

simon04

Message:

fix #2746 - improve validation: Way connected to Area

File:

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

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

@@ -35 +35 @@
 
     private void testForError(Way w, Node wayNode, OsmPrimitive p) {
-        if (ElemStyles.hasAreaElemStyle(p, false)) {
+        if (isArea(p)) {
             addError(w, wayNode, p);
         } else {
@@ -41 +41 @@
                 if (r instanceof Relation
                         && r.hasTag("type", "multipolygon")
-                        && ElemStyles.hasAreaElemStyle(r, false)) {
+                        && isArea(r)) {
                     addError(w, wayNode, p);
                     break;
@@ -47 +47 @@
             }
         }
+    }
+
+    private boolean isArea(OsmPrimitive p) {
+        return (p.hasKey("landuse") || p.hasKey("natural"))
+                && ElemStyles.hasAreaElemStyle(p, false);
     }