Changeset 5293 in josm

Timestamp:

Jun 21, 2012 2:21:43 AM (11 months ago)

Author:

Don-vip

Message:

fix #7758 - Do not restrict building validator tests to "building=yes", but take into account "no" and "entrance"

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (1 diff)
• tests/BuildingInBuilding.java (modified) (1 diff)
• tests/CrossingWays.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -245 +245 @@
         }
     }
+
+    /**
+     * Determines if the specified primitive denotes a building.
+     * @param p The primitive to be tested
+     * @return True if building key is set and different from no,entrance
+     */
+    protected static final boolean isBuilding(OsmPrimitive p) {
+        String v = p.get("building");
+        return v != null && !v.equals("no") && !v.equals("entrance");
+    }
 }

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

@@ -121 +121 @@
         return false;
     }
-
-    private static boolean isBuilding(OsmPrimitive p) {
-        return "yes".equals(p.get("building"));
-    }
 }

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

@@ -73 +73 @@
         boolean isSubway1 = "subway".equals(railway1);
         boolean isTram1 = "tram".equals(railway1);
-        boolean isBuilding = (w.get("building") != null);
+        boolean isBuilding = isBuilding(w);
         String waterway1 = w.get("waterway");