Changeset 6513 in josm for trunk/src

Timestamp:

2013-12-23T00:13:58+01:00 (12 years ago)

Author:

simon04

Message:

see #9414 - convert some tagchecker tests to MapCSS, extend MapCSS by test for false values

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Tag.java (modified) (1 diff)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/Condition.java (modified) (5 diffs)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Tag.java

@@ -99 +99 @@
     }
 
+    /**
+     * This constructs a {@link Tag} by splitting {@code s} on the first equality sign.
+     * @see org.openstreetmap.josm.tools.TextTagParser
+     * @param s the string to convert
+     * @return the constructed tag
+     */
     public static Tag ofString(String s) {
         CheckParameterUtil.ensureParameterNotNull(s, "s");

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

@@ -229 +229 @@
     public void initialize() throws Exception {
         addMapCSS(new InputStreamReader(getClass().getResourceAsStream("/data/validator/deprecated.mapcss"), "UTF-8"));
+        addMapCSS(new InputStreamReader(getClass().getResourceAsStream("/data/validator/highway.mapcss"), "UTF-8"));
     }
 }

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

@@ -38 +38 @@
     }
 
-    public static Condition create(String k, boolean not, boolean yes, Context context) {
+    public static Condition create(String k, boolean not, boolean yes, boolean no, Context context) {
         switch (context) {
         case PRIMITIVE:
-            return new KeyCondition(k, not, yes);
+            return new KeyCondition(k, not, yes, no);
         case LINK:
-            if (yes)
+            if (yes || no)
                 throw new MapCSSException("Question mark operator ''?'' not supported in LINK context");
             if (not)
@@ -216 +216 @@
      *     ["a label"?]  PRIMITIVE:  the primitive has a tag "a label" whose value evaluates to a true-value
      *                   LINK:       not supported
+     *
+     *     ["a label"?!] PRIMITIVE:  the primitive has a tag "a label" whose value evaluates to a false-value
+     *                   LINK:       not supported
      * </pre>
      */
@@ -221 +224 @@
 
         private String label;
-        private boolean exclamationMarkPresent;
-        private boolean questionMarkPresent;
-
-        /**
-         *
-         * @param label
-         * @param exclamationMarkPresent
-         * @param questionMarkPresent
-         */
-        public KeyCondition(String label, boolean exclamationMarkPresent, boolean questionMarkPresent){
+        private boolean negateResult;
+        private boolean testForTrueValues;
+        private boolean testForFalseValues;
+
+        public KeyCondition(String label, boolean negateResult, boolean testForTrueValues, boolean testForFalseValues){
             this.label = label;
-            this.exclamationMarkPresent = exclamationMarkPresent;
-            this.questionMarkPresent = questionMarkPresent;
+            this.negateResult = negateResult;
+            this.testForTrueValues = testForTrueValues;
+            this.testForFalseValues = testForFalseValues;
         }
 
@@ -240 +239 @@
             switch(e.getContext()) {
             case PRIMITIVE:
-                if (questionMarkPresent)
-                    return OsmUtils.isTrue(e.osm.get(label)) ^ exclamationMarkPresent;
+                if (testForTrueValues)
+                    return OsmUtils.isTrue(e.osm.get(label)) ^ negateResult;
+                else if (testForFalseValues)
+                    return OsmUtils.isFalse(e.osm.get(label)) ^ negateResult;
                 else
-                    return e.osm.hasKey(label) ^ exclamationMarkPresent;
+                    return e.osm.hasKey(label) ^ negateResult;
             case LINK:
                 Utils.ensure(false, "Illegal state: KeyCondition not supported in LINK context");
@@ -253 +254 @@
         @Override
         public String toString() {
-            return "[" + (exclamationMarkPresent ? "!" : "") + label + "]";
+            return "[" + (negateResult ? "!" : "") + label + "]";
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -345 +345 @@
     boolean not = false;
     boolean yes = false;
+    boolean no = false;
     String key;
 }
@@ -350 +351 @@
     ( <EXCLAMATION> { not = true; } )?
     key=tag_key()
+    ( LOOKAHEAD(2) <QUESTION> <EXCLAMATION> { no = true; } )?
     ( <QUESTION> { yes = true; } )?
-    { return Condition.create(key, not, yes, context); }
+    { return Condition.create(key, not, yes, no, context); }
 }