Changeset 6647 in josm for trunk

Timestamp:

2014-01-06T18:42:37+01:00 (11 years ago)

Author:

simon04

Message:

see #8519 - Lanes validator: correctly handle consecutive |s (e.g., yes|| defines 3 lanes)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/Lanes.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy (modified) (2 diffs)

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

@@ -31 +31 @@
 
     static int getLanesCount(String value) {
-        return value.isEmpty() ? 0 : value.split("\\|").length;
+        return value.isEmpty() ? 0 : value.replaceAll("[^|]", "").length() + 1;
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy

@@ -18 +18 @@
         assert lanes.getLanesCount("left|right") == 2
         assert lanes.getLanesCount("yes|no|yes") == 3
+        assert lanes.getLanesCount("yes||") == 3
     }
 
@@ -54 +55 @@
         assert lanes.errors.get(0).getMessage() == "Number of lanes:forward+lanes:backward greater than lanes"
     }
+
+    void test8() {
+        lanes.check(TestUtils.createPrimitive("way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"))
+        assert lanes.errors.isEmpty()
+    }
 }