Changeset 7055 in josm for trunk/src/org

Timestamp:

2014-05-03T10:41:01+02:00 (11 years ago)

Author:

bastiK

Message:

mapcss: optimisation by adding an extra class for the most common type of condition (see #9691)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/Condition.java (modified) (2 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)

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

@@ -232 +232 @@
                 final Tag tag = c instanceof Condition.KeyCondition
                         ? ((Condition.KeyCondition) c).asTag()
+                        : c instanceof Condition.SimpleKeyValueCondition
+                        ? ((Condition.SimpleKeyValueCondition) c).asTag()
                         : c instanceof Condition.KeyValueCondition
                         ? ((Condition.KeyValueCondition) c).asTag()

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

@@ -29 +29 @@
         switch (context) {
         case PRIMITIVE:
-            return KeyValueRegexpCondition.SUPPORTED_OPS.contains(op) && !considerValAsKey
-                    ? new KeyValueRegexpCondition(k, v, op, false)
-                    : new KeyValueCondition(k, v, op, considerValAsKey);
+            if (KeyValueRegexpCondition.SUPPORTED_OPS.contains(op) && !considerValAsKey)
+                return new KeyValueRegexpCondition(k, v, op, false);
+            if (!considerValAsKey && op.equals(Op.EQ))
+                return new SimpleKeyValueCondition(k, v);
+            return new KeyValueCondition(k, v, op, considerValAsKey);
         case LINK:
             if (considerValAsKey)
@@ -150 +152 @@
 
     /**
+     * Most common case of a KeyValueCondition.
+     * 
+     * Extra class for performance reasons.
+     */
+    public static class SimpleKeyValueCondition extends Condition {
+        public final String k;
+        public final String v;
+
+        public SimpleKeyValueCondition(String k, String v) {
+            this.k = k;
+            this.v = v;
+        }
+
+        @Override
+        public boolean applies(Environment e) {
+            return v.equals(e.osm.get(k));
+        }
+        
+        public Tag asTag() {
+            return new Tag(k, v);
+        }
+    }
+
+    /**
      * <p>Represents a key/value condition which is either applied to a primitive.</p>
      *

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

@@ -525 +525 @@
             return subpart;
         }
+
         @Override
         public Range getRange() {