Changeset 6606 in josm

Timestamp:

2014-01-03T10:36:41+01:00 (10 years ago)

Author:

simon04

Message:

see #8519 - Lanes validator: add test for lanes>=lanes:forward+lanes:backward

Location:

trunk

Files:

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

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

@@ -34 +34 @@
     }
 
-    protected void checkEqualNumberOfLanes(final OsmPrimitive p, String lanesKey, String message) {
+    protected void checkNumberOfLanesByKey(final OsmPrimitive p, String lanesKey, String message) {
         final Collection<String> keysForPattern = Utils.filter(p.keySet(),
                 Predicates.stringContainsPattern(Pattern.compile(":" + lanesKey + "$")));
@@ -62 +62 @@
     }
 
+    protected void checkNumberOfLanes(final OsmPrimitive p) {
+        final String lanes = p.get("lanes");
+        final String forward = Utils.firstNonNull(p.get("lanes:forward"), "0");
+        final String backward = Utils.firstNonNull(p.get("lanes:backward"), "0");
+        try {
+        if (Integer.parseInt(lanes) < Integer.parseInt(forward) + Integer.parseInt(backward)) {
+            errors.add(new TestError(this, Severity.WARNING,
+                    tr("Number of {0} greater than {1}", tr("{0}+{1}", "lanes:forward", "lanes:backward"), "lanes"), 3101, p));
+        }
+        } catch (NumberFormatException ignore) {
+            Main.debug(ignore.getMessage());
+        }
+    }
+
     @Override
     public void check(OsmPrimitive p) {
-        checkEqualNumberOfLanes(p, "lanes", tr("Number of lane dependent values inconsistent"));
-        checkEqualNumberOfLanes(p, "lanes:forward", tr("Number of lane dependent values inconsistent in forward direction"));
-        checkEqualNumberOfLanes(p, "lanes:backward", tr("Number of lane dependent values inconsistent in backward direction"));
+        checkNumberOfLanesByKey(p, "lanes", tr("Number of lane dependent values inconsistent"));
+        checkNumberOfLanesByKey(p, "lanes:forward", tr("Number of lane dependent values inconsistent in forward direction"));
+        checkNumberOfLanesByKey(p, "lanes:backward", tr("Number of lane dependent values inconsistent in backward direction"));
+        checkNumberOfLanes(p);
     }
 }

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

@@ -49 +49 @@
         assert lanes.errors.isEmpty()
     }
+
+    void test7() {
+        lanes.check(TestUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"))
+        assert lanes.errors.get(0).getMessage() == "Number of lanes:forward+lanes:backward greater than lanes"
+    }
 }