Changeset 6859 in josm

Timestamp:

2014-02-17T19:11:05+01:00 (11 years ago)

Author:

simon04

Message:

see #9593 - MapCSS: fix matching of negated regular expressions for missing values

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

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

@@ -6 +6 @@
 import java.text.MessageFormat;
 import java.util.EnumSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -78 +79 @@
         REGEX, NREGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS;
 
+        private static Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
+
         public boolean eval(String testString, String prototypeString) {
-            if (testString == null && this != NEQ)
+            if (testString == null && !NEGATED_OPS.contains(this))
                 return false;
             switch (this) {
@@ -202 +205 @@
         public boolean applies(Environment env) {
             final String value = env.osm.get(k);
-            return value != null && (op.equals(Op.REGEX)
-                    ? pattern.matcher(value).find()
-                    : !pattern.matcher(value).find());
+            if (Op.REGEX.equals(op)) {
+                return value != null && pattern.matcher(value).find();
+            } else if (Op.NREGEX.equals(op)) {
+                return value == null || !pattern.matcher(value).find();
+            } else {
+                throw new IllegalStateException();
+            }
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -166 +166 @@
 
     @Test
+    public void testNRegexKeyConditionSelector() throws Exception {
+        def s1 = getParser("*[sport][tourism != hotel]").selector()
+        assert s1.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar")))
+        assert !s1.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar tourism=hotel")))
+        def s2 = getParser("*[sport][tourism != hotel][leisure !~ /^(sports_centre|stadium|)\$/]").selector()
+        assert s2.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar")))
+        assert !s2.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar tourism=hotel")))
+        assert !s2.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar leisure=stadium")))
+    }
+
+    @Test
     public void testKeyKeyCondition() throws Exception {
         def c1 = (Condition.KeyValueCondition) getParser("[foo = *bar]").condition(Condition.Context.PRIMITIVE)