Changeset 7054 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

Timestamp:

2014-05-03T01:07:19+02:00 (10 years ago)

Author:

bastiK

Message:

mapcss: major performance improvement for style creation, "rendering phase 1" (see #9691)

File:

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

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

@@ -22 +22 @@
 import org.openstreetmap.josm.tools.Utils;
 
+/**
+ * MapCSS selector.
+ * 
+ * A rule has two parts, a selector and a declaration block
+ * e.g.
+ * <pre>
+ * way[highway=residential]    
+ * { width: 10; color: blue; } 
+ * </pre>
+ * 
+ * The selector decides, if the declaration block gets applied or not.
+ * 
+ * Currently all implementing classes of Selector are immutable.
+ */
 public interface Selector {
 
@@ -32 +46 @@
      * @return true, if the selector applies
      */
-    public boolean matches(Environment env);
-
-    public String getSubpart();
-
-    public Range getRange();
+    boolean matches(Environment env);
+    
+    String getSubpart();
+
+    Range getRange();
+    
+    /**
+     * Create an "optimized" copy of this selector that omits the base check.
+     * 
+     * For the style source, the list of rules is preprocessed, such that
+     * there is a separate list of rules for nodes, ways, ...
+     * 
+     * This means that the base check does not have to be performed
+     * for each rule, but only once for each primitive.
+     * 
+     * @return a selector that is identical to this object, except the base of the
+     * "rightmost" selector is not checked
+     */
+    Selector optimizedBaseCheck();
 
     public static enum ChildOrParentSelectorType {
@@ -319 +347 @@
             return right.getRange();
         }
+        
+        @Override
+        public Selector optimizedBaseCheck() {
+            return new ChildOrParentSelector(left, link, right.optimizedBaseCheck(), type);
+        }
 
         @Override
@@ -348 +381 @@
          * @return {@code true} if all conditions apply, false otherwise.
          */
-        public final boolean matchesConditions(Environment env) {
+        public boolean matches(Environment env) {
             if (conds == null) return true;
             for (Condition c : conds) {
@@ -378 +411 @@
         public boolean matches(Environment env) {
             Utils.ensure(env.isLinkContext(), "Requires LINK context in environment, got ''{0}''", env.getContext());
-            return matchesConditions(env);
+            return super.matches(env);
         }
 
@@ -392 +425 @@
 
         @Override
+        public Selector optimizedBaseCheck() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
         public String toString() {
             return "LinkSelector{" + "conditions=" + conds + '}';
@@ -397 +435 @@
     }
 
-    public static class GeneralSelector extends AbstractSelector {
+    public static class GeneralSelector extends OptimizedGeneralSelector {
+
+        public GeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, String subpart) {
+            super(base, zoom, conds, subpart);
+        }
+        
+        public boolean matchesBase(OsmPrimitiveType type) {
+            if ("*".equals(base)) {
+                return true;
+            } else if (OsmPrimitiveType.NODE.equals(type)) {
+                return "node".equals(base);
+            } else if (OsmPrimitiveType.WAY.equals(type)) {
+                return "way".equals(base) || "area".equals(base);
+            } else if (OsmPrimitiveType.RELATION.equals(type)) {
+                return "area".equals(base) || "relation".equals(base) || "canvas".equals(base);
+            }
+            return false;
+        }
+
+        public boolean matchesBase(OsmPrimitive p) {
+            if (!matchesBase(p.getType())) {
+                return false;
+            } else {
+                if (p instanceof Relation) {
+                    if ("area".equals(base)) {
+                        return ((Relation) p).isMultipolygon();
+                    } else if ("canvas".equals(base)) {
+                        return p.get("#canvas") != null;
+                    }
+                }
+                return true;
+            }
+        }
+
+        public boolean matchesBase(Environment e) {
+            return matchesBase(e.osm);
+        }
+        
+        public boolean matchesConditions(Environment e) {
+            return super.matches(e);
+        }
+
+        @Override
+        public Selector optimizedBaseCheck() {
+            return new OptimizedGeneralSelector(this);
+        }
+
+        @Override
+        public boolean matches(Environment e) {
+            return matchesBase(e) && super.matches(e);
+        }
+    }
+    
+    public static class OptimizedGeneralSelector extends AbstractSelector {
         public final String base;
         public final Range range;
         public final String subpart;
 
-        public GeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, String subpart) {
+        public OptimizedGeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, String subpart) {
             super(conds);
             this.base = base;
@@ -418 +509 @@
             this.subpart = subpart;
         }
+        
+        public OptimizedGeneralSelector(String base, Range range, List<Condition> conds, String subpart) {
+            super(conds);
+            this.base = base;
+            this.range = range;
+            this.subpart = subpart;
+        }
+        
+        public OptimizedGeneralSelector(GeneralSelector s) {
+            this(s.base, s.range, s.conds, s.subpart);
+        }
 
         @Override
@@ -428 +530 @@
         }
 
-        public boolean matchesBase(OsmPrimitiveType type) {
-            if ("*".equals(base)) {
-                return true;
-            } else if (OsmPrimitiveType.NODE.equals(type)) {
-                return "node".equals(base);
-            } else if (OsmPrimitiveType.WAY.equals(type)) {
-                return "way".equals(base) || "area".equals(base);
-            } else if (OsmPrimitiveType.RELATION.equals(type)) {
-                return "area".equals(base) || "relation".equals(base) || "canvas".equals(base);
-            }
-            return false;
-        }
-
-        public boolean matchesBase(OsmPrimitive p) {
-            if (!matchesBase(p.getType())) {
-                return false;
-            } else {
-                if (p instanceof Relation) {
-                    if ("area".equals(base)) {
-                        return ((Relation) p).isMultipolygon();
-                    } else if ("canvas".equals(base)) {
-                        return p.get("#canvas") != null;
-                    }
-                }
-                return true;
-            }
-        }
-
-        public boolean matchesBase(Environment e) {
-            return matchesBase(e.osm);
-        }
-
-        @Override
-        public boolean matches(Environment e) {
-            return matchesBase(e) && matchesConditions(e);
-        }
-
         public String getBase() {
             return base;
         }
 
+        @Override
+        public Selector optimizedBaseCheck() {
+            throw new UnsupportedOperationException();
+        }
+        
         public static Range fromLevel(int a, int b) {
             if (a > b)