Changeset 6645 in josm

Timestamp:

2014-01-06T18:40:17+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 - MapCSS validator: some performance imrovements (pre-compile regular expressions, drop regular expressions for key presence checks)

Location:

trunk

Files:

• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (6 diffs)

trunk/data/validator/combinations.mapcss

@@ -71 +71 @@
 *[source:height                ][!height],
 *[source:lanes                 ][!lanes],
-*[/source:(addr:)?postcode/    ][!addr:postcode],
-*[/source:(addr:)?housenumber/ ][!addr:housenumber],
+*[source:postcode              ][!addr:postcode],
+*[source:housenumber           ][!addr:housenumber],
+*[source:addr:postcode         ][!addr:postcode],
+*[source:addr:housenumber      ][!addr:housenumber],
 *[source:addr                  ][!/^addr:/],
 *[source:maxspeed              ][!/^maxspeed:?/] {

trunk/data/validator/deprecated.mapcss

@@ -179 +179 @@
 
 /* from http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Deprecated_tags */
-*[/(day|date|hour)_(on|off)/][!restriction] {
+*[day_on][!restriction],
+*[day_off][!restriction],
+*[date_on][!restriction],
+*[date_off][!restriction],
+*[hour_on][!restriction],
+*[hour_off][!restriction] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "*:conditional";

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

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
@@ -26 +27 @@
         switch (context) {
         case PRIMITIVE:
-            return new KeyValueCondition(k, v, op, considerValAsKey);
+            return KeyValueRegexpCondition.SUPPORTED_OPS.contains(op) && !considerValAsKey
+                    ? new KeyValueRegexpCondition(k, v, op, false)
+                    : new KeyValueCondition(k, v, op, considerValAsKey);
         case LINK:
             if (considerValAsKey)
@@ -180 +183 @@
         public String toString() {
             return "[" + k + "'" + op + "'" + v + "]";
+        }
+    }
+
+    public static class KeyValueRegexpCondition extends KeyValueCondition {
+
+        public final Pattern pattern;
+        public static final EnumSet<Op> SUPPORTED_OPS = EnumSet.of(Op.REGEX, Op.NREGEX);
+
+        public KeyValueRegexpCondition(String k, String v, Op op, boolean considerValAsKey) {
+            super(k, v, op, considerValAsKey);
+            CheckParameterUtil.ensureThat(!considerValAsKey, "considerValAsKey is not supported");
+            CheckParameterUtil.ensureThat(SUPPORTED_OPS.contains(op), "Op must be REGEX or NREGEX");
+            this.pattern = Pattern.compile(v);
+        }
+
+        @Override
+        public boolean applies(Environment env) {
+            final String value = env.osm.get(k);
+            return value != null && (op.equals(Op.REGEX)
+                    ? pattern.matcher(value).find()
+                    : !pattern.matcher(value).find());
         }
     }
@@ -244 +268 @@
         public final boolean negateResult;
         public final KeyMatchType matchType;
+        public Predicate<String> containsPattern;
 
         public KeyCondition(String label, boolean negateResult, KeyMatchType matchType){
@@ -249 +274 @@
             this.negateResult = negateResult;
             this.matchType = matchType;
+            this.containsPattern = KeyMatchType.REGEX.equals(matchType)
+                    ? Predicates.stringContainsPattern(Pattern.compile(label))
+                    : null;
         }
 
@@ -259 +287 @@
                 else if (KeyMatchType.FALSE.equals(matchType))
                     return e.osm.isKeyFalse(label) ^ negateResult;
-                else if (KeyMatchType.REGEX.equals(matchType))
-                    return Utils.exists(e.osm.keySet(), Predicates.stringContainsPattern(Pattern.compile(label))) ^ negateResult;
-                else
+                else if (KeyMatchType.REGEX.equals(matchType)) {
+                    return Utils.exists(e.osm.keySet(), containsPattern) ^ negateResult;
+                } else {
                     return e.osm.hasKey(label) ^ negateResult;
+                }
             case LINK:
                 Utils.ensure(false, "Illegal state: KeyCondition not supported in LINK context");