Changeset 3836 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java

Timestamp:

2011-01-31T14:18:47+01:00 (14 years ago)

Author:

bastiK

Message:

mappaint restructuring aimed at mapcss support:

• area- and line style of multipolygon outer & inner ways are no longer determined by MapPaintVisitor, but the information is calculated in advance and cached
• cache is aware of zoom level
• z_index property to allow more fancy styles in future

Performance: when the style cache is filled, painting is the same or ~5% faster. The first painting, which includes style generation, takes ~30% longer than before. (There is potential for optimization, though.) Memory usage unchanged.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.xml;
 
-import org.openstreetmap.josm.gui.mappaint.IconElemStyle;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
-import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
-import org.openstreetmap.josm.gui.mappaint.SimpleNodeElemStyle;
+import org.openstreetmap.josm.gui.mappaint.Range;
 
 public class IconPrototype extends Prototype {
     
     public IconReference icon;
-    public boolean annotate;
+    public Boolean annotate;
 
-    public IconPrototype (IconPrototype i, long maxScale, long minScale) {
-        super(maxScale, minScale);
+    public IconPrototype (IconPrototype i, Range range) {
+        super(range);
         this.icon = i.icon;
         this.annotate = i.annotate;
@@ -24 +21 @@
 
     public void init() {
+        priority = 0;
+        range = new Range();
         icon = null;
-        priority = 0;
-        annotate = true;
-    }
-
-    public NodeElemStyle createStyle() {
-        if (icon == null) {
-            return SimpleNodeElemStyle.INSTANCE;
-        } else {
-            IconElemStyle i = new IconElemStyle(minScale, maxScale, MapPaintStyles.getIcon(icon));
-            i.annotate = annotate;
-            return i;
-        }
+        annotate = null;
     }
 }