Changeset 6592 in josm for trunk/src/org

Timestamp:

2014-01-01T15:27:25+01:00 (11 years ago)

Author:

simon04

Message:

fix #8519 - Validator: validate :lanes values

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/OsmValidator.java (modified) (2 diffs)
• data/validation/tests/Lanes.java (added)
• tools/Predicates.java (modified) (1 diff)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.data.validation.tests.Highways;
+import org.openstreetmap.josm.data.validation.tests.Lanes;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
@@ -120 +121 @@
         OpeningHourTest.class, // 2901 .. 2999
         MapCSSTagChecker.class, // 3000 .. 3099
+        Lanes.class, // 3100 .. 3199
     };
     

trunk/src/org/openstreetmap/josm/tools/Predicates.java

@@ -11 +11 @@
 
     private Predicates() {
+    }
+
+    /**
+     * Returns the negation of {@code predicate}.
+     */
+    public static <T> Predicate<T> not(final Predicate<T> predicate) {
+        return new Predicate<T>() {
+            @Override
+            public boolean evaluate(T obj) {
+                return !predicate.evaluate(obj);
+            }
+        };
+    }
+
+    /**
+     * Returns a {@link Predicate} executing {@link Utils#equal}.
+     */
+    public static <T> Predicate<T> equalTo(final T ref) {
+        return new Predicate<T>() {
+            @Override
+            public boolean evaluate(T obj) {
+                return Utils.equal(obj, ref);
+            }
+        };
     }