Changeset 3876 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

Timestamp:

2011-02-09T12:02:41+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: support for more exotic constructs; make parser more robust: if parsing as an expression fails, read everything between colon and semicolon as string, e.g. 'icon-image: images/img.png;' where the path should be in quotes, but it isn't

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (6 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
+import static org.openstreetmap.josm.tools.Utils.equal;
+
+import java.util.EnumSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.Environment;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Op;
 
 abstract public class Condition {
@@ -11 +18 @@
     abstract public boolean applies(Environment e);
 
-    public static enum Op {EQ, NEQ}
+    public static enum Op { EQ, NEQ, GREATER_OR_EQUAL, GREATER, LESS_OR_EQUAL, LESS,
+        REGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS }
+
+    public final static EnumSet<Op> COMPARISON_OPERATERS =
+            EnumSet.of(Op.GREATER_OR_EQUAL, Op.GREATER, Op.LESS_OR_EQUAL, Op.LESS);
 
     public static class KeyValueCondition extends Condition {
@@ -18 +29 @@
         public String v;
         public Op op;
+        private float v_float;
 
         public KeyValueCondition(String k, String v, Op op) {
-
             this.k = k;
             this.v = v;
             this.op = op;
+            if (COMPARISON_OPERATERS.contains(op)) {
+                v_float = Float.parseFloat(v);
+            }
         }
 
         @Override
-        public boolean applies(Environment e) {
+        public boolean applies(Environment env) {
+            String val = env.osm.get(k);
+            if (val == null)
+                return false;
             switch (op) {
                 case EQ:
-                    return Utils.equal(e.osm.get(k), v);
+                    return equal(val, v);
                 case NEQ:
-                    return !Utils.equal(e.osm.get(k), v);
+                    return !equal(val, v);
+                case REGEX:
+                    Pattern p = Pattern.compile(v);
+                    Matcher m = p.matcher(val);
+                    return m.find();
+                case ONE_OF:
+                    String[] parts = val.split(";");
+                    for (String part : parts) {
+                        if (equal(v, part.trim()))
+                            return true;
+                    }
+                    return false;
+                case BEGINS_WITH:
+                    return val.startsWith(v);
+                case ENDS_WITH:
+                    return val.endsWith(v);
+                case CONTAINS:
+                    return val.contains(v);
+            }
+            float val_float;
+            try {
+                val_float = Float.parseFloat(val);
+            } catch (NumberFormatException e) {
+                return false;
+            }
+            switch (op) {
+                case GREATER_OR_EQUAL:
+                    return val_float >= v_float;
+                case GREATER:
+                    return val_float > v_float;
+                case LESS_OR_EQUAL:
+                    return val_float <= v_float;
+                case LESS:
+                    return val_float < v_float;
                 default:
                     throw new AssertionError();
@@ -40 +90 @@
         @Override
         public String toString() {
-            return "[" + k + (op == Op.EQ ? "=" : "!=") + v + "]";
+            return "[" + k + "'" + op + "'" + v + "]";
         }
     }
@@ -77 +127 @@
         @Override
         public boolean applies(Environment e) {
-            if ("closed".equals(id)) {
+            if (equal(id, "closed")) {
                 if (e.osm instanceof Way && ((Way) e.osm).isClosed())
                     return true;
@@ -83 +133 @@
                     return true;
                 return false;
+            } else if (equal(id, "modified")) {
+                return e.osm.isModified() || e.osm.isNewOrUndeleted();
+            } else if (equal(id, "new")) {
+                return e.osm.isNew();
+            } else if (equal(id, "connection") && (e.osm instanceof Node)) {
+                return ((Node) e.osm).isConnectionNode();
             }
             return true;