Changeset 9247 in josm for trunk

Timestamp:

2016-01-01T22:34:11+01:00 (9 years ago)

Author:

simon04

Message:

fix #12267 - MapCSS conditions does not handle unquoted 0 value

Such as in [frequency=0].

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy (modified) (1 diff)

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

@@ -157 +157 @@
 {
     < IDENT: ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","-","0"-"9"] )* >
-|   < UINT: ["1"-"9"] ( ["0"-"9"] )* >
+|   < UINT: ( ["0"-"9"] )+ >
 |   < STRING: "\"" ( [" ","!","#"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\\"" | "\\\\" )*  "\"" >
 |   < #PREDEFINED: "\\" ["d","D","s","S","w","W","b","B","A","G","Z","z"] >

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

@@ -101 +101 @@
         assert selNeg.matches(new Environment(OsmUtils.createPrimitive("way foo=bar src=1,2")))
     }
+
+    @Test
+    public void testValueFive() throws Exception {
+        // ticket #5985
+        def sel = new MapCSSParser(new StringReader("*[width=5]")).selector()
+        assert sel.matches(new Environment(OsmUtils.createPrimitive("way highway=track width=5")))
+        assert !sel.matches(new Environment(OsmUtils.createPrimitive("way highway=track width=2")))
+    }
+
+    @Test
+    public void testValueZero() throws Exception {
+        // ticket #12267
+        def sel = new MapCSSParser(new StringReader("*[frequency=0]")).selector()
+        assert sel.matches(new Environment(OsmUtils.createPrimitive("way railway=rail frequency=0")))
+        assert !sel.matches(new Environment(OsmUtils.createPrimitive("way railway=rail frequency=50")))
+    }
 }