Changeset 6635 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2014-01-05T17:09:25+01:00 (10 years ago)

Author:

simon04

Message:

fix #4280 - Validator, crossing ways: undo valdation relaxation (one way is bridge/tunnel and the other one is not) - reverts r6579

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (modified) (1 diff)

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

@@ -193 +193 @@
         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;