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

Timestamp:

2013-12-29T12:03:21+01:00 (12 years ago)

Author:

simon04

Message:

see #9485 - MapCSS: add support for set class_name instruction and .class_name condition (which is specified in the MapCSS specification)

File:

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

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

@@ -22 +22 @@
     abstract public boolean applies(Environment e);
 
-    public static Condition create(String k, String v, Op op, Context context, boolean considerValAsKey) {
+    public static Condition createKeyValueCondition(String k, String v, Op op, Context context, boolean considerValAsKey) {
         switch (context) {
         case PRIMITIVE:
@@ -41 +41 @@
     }
 
-    public static Condition create(String k, boolean not, KeyMatchType matchType, Context context) {
+    public static Condition createKeyCondition(String k, boolean not, KeyMatchType matchType, Context context) {
         switch (context) {
         case PRIMITIVE:
@@ -57 +57 @@
     }
 
-    public static Condition create(String id, boolean not, Context context) {
+    public static Condition createPseudoClassCondition(String id, boolean not, Context context) {
         return new PseudoClassCondition(id, not);
     }
 
-    public static Condition create(Expression e, Context context) {
+    public static Condition createClassCondition(String id, boolean not, Context context) {
+        return new ClassCondition(id, not);
+    }
+
+    public static Condition createExpressionCondition(Expression e, Context context) {
         return new ExpressionCondition(e);
     }
@@ -275 +279 @@
     }
 
+    public static class ClassCondition extends Condition {
+
+        public final String id;
+        public final boolean not;
+
+        public ClassCondition(String id, boolean not) {
+            this.id = id;
+            this.not = not;
+        }
+
+        @Override
+        public boolean applies(Environment env) {
+            return not ^ env.mc.getCascade(env.layer).containsKey(id);
+        }
+
+        @Override
+        public String toString() {
+            return (not ? "!" : "") + "." + id;
+        }
+    }
+
     public static class PseudoClassCondition extends Condition {