Changeset 6579 in josm for trunk

Timestamp:

2013-12-31T13:18:44+01:00 (11 years ago)

Author:

simon04

Message:

fix #4280 - Validator, crossing ways: do not warn if layer is missing for simple, unambiguous cases (one way is bridge/tunnel and the other one is not)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/validation/tests/CrossingWays.java (modified) (3 diffs)
• data/validation/tests/UnconnectedWays.java (modified) (3 diffs)
• gui/mappaint/mapcss/Condition.java (modified) (1 diff)
• gui/mappaint/xml/XmlStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -603 +603 @@
     }
 
+    /**
+     * Returns true if the {@code key} corresponds to an OSM true value.
+     * @see {@link OsmUtils#isTrue(String) }
+     */
+    public final boolean isKeyTrue(String key) {
+        return OsmUtils.isTrue(get(key));
+    }
+
+    /**
+     * Returns true if the {@code key} corresponds to an OSM false value.
+     * @see {@link OsmUtils#isFalse(String) }
+     */
+    public final boolean isKeyFalse(String key) {
+        return OsmUtils.isFalse(get(key));
+    }
+
     public final String getIgnoreCase(String key) {
         String[] keys = this.keys;

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

@@ -15 +15 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
@@ -61 +62 @@
         errorSegments = null;
         seenWays = null;
+    }
+
+    private String getLayer(OsmPrimitive w) {
+        String layer1 = w.get("layer");
+        if ("0".equals(layer1)) {
+            layer1 = null; // 0 is default value for layer.
+        } else if (layer1 == null && w.isKeyTrue("bridge")) {
+            /* see #4280.
+               In order to avoid a test error for simple settings (such as one way is a bridge, the other one isn't),
+               set layer to a marker value <bridge>. Then, two crossing bridges w/o a layer set are still detected.
+            */
+            layer1 = "<bridge>";
+        } else if (layer1 == null && w.isKeyTrue("tunnel")) {
+            /* likewise for tunnels */
+            layer1 = "<tunnel>";
+        }
+        return layer1;
     }
 
@@ -84 +102 @@
 
         String level1 = w.get("level");
-        String layer1 = w.get("layer");
-        if ("0".equals(layer1)) {
-            layer1 = null; // 0 is default value for layer. Don't assume the same for levels
-        }
+        String layer1 = getLayer(w);
 
         int nodesSize = w.getNodesCount();

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

@@ -130 +130 @@
                             || en.hasTag("amenity", "parking_entrance")
                             || en.hasTag("railway", "buffer_stop")
-                            || OsmUtils.isTrue(en.get("noexit"))
+                            || en.isKeyTrue("noexit")
                             || en.hasKey("entrance")
                             || en.hasKey("barrier")) {
@@ -235 +235 @@
             String railway = w.get("railway");
             String highway = w.get("highway");
-            this.isAbandoned = "abandoned".equals(railway) || OsmUtils.isTrue(w.get("disused"));
+            this.isAbandoned = "abandoned".equals(railway) || w.isKeyTrue("disused");
             this.highway = (highway != null || railway != null) && !isAbandoned;
             this.isBoundary = !this.highway && "administrative".equals(w.get("boundary"));
@@ -252 +252 @@
             if (w.containsNode(n))
                 return false;
-            if (OsmUtils.isTrue(n.get("noexit")))
+            if (n.isKeyTrue("noexit"))
                 return false;
             EastNorth coord = n.getEastNorth();

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -255 +255 @@
             case PRIMITIVE:
                 if (KeyMatchType.TRUE.equals(matchType))
-                    return OsmUtils.isTrue(e.osm.get(label)) ^ negateResult;
+                    return e.osm.isKeyTrue(label) ^ negateResult;
                 else if (KeyMatchType.FALSE.equals(matchType))
-                    return OsmUtils.isFalse(e.osm.get(label)) ^ negateResult;
+                    return e.osm.isKeyFalse(label) ^ negateResult;
                 else if (KeyMatchType.REGEX.equals(matchType))
                     return Utils.exists(e.osm.keySet(), Predicates.stringContainsPattern(Pattern.compile(label))) ^ negateResult;

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -177 +177 @@
         String lineIdx = null;
         HashMap<String, LinemodPrototype> overlayMap = new HashMap<String, LinemodPrototype>();
-        boolean isNotArea = OsmUtils.isFalse(primitive.get("area"));
+        boolean isNotArea = primitive.isKeyFalse("area");
         for (String key : primitive.keySet()) {
             String val = primitive.get(key);