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

Timestamp:

2011-01-31T14:18:47+01:00 (15 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/AreaElemStyle.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
@@ -14 +15 @@
     public Color color;
 
-    public AreaElemStyle(long minScale, long maxScale, Color color) {
-        super(minScale, maxScale);
+    protected AreaElemStyle(Cascade c, Color color) {
+        super(c);
         this.color = color;
+    }
+
+    public static AreaElemStyle create(Cascade c) {
+        Color color = c.get("fill-color", null, Color.class);
+        if (color == null)
+            return null;
+        return new AreaElemStyle(c, color);
     }
 
@@ -25 +33 @@
             String name = painter.isShowNames() ? painter.getAreaName(w) : null;
             painter.drawArea(w, w.isSelected() ? paintSettings.getSelectedColor() : color, name);
-            // line.paintPrimitive(way, paintSettings, painter, selected);
+        } else if (primitive instanceof Relation) {
+            painter.drawArea((Relation) primitive, selected ? paintSettings.getRelationSelectedColor() : color, painter.getAreaName(primitive));
         }
     }
@@ -40 +49 @@
     @Override
     public int hashCode() {
-        return color.hashCode();
+        return 11 * super.hashCode() + color.hashCode();
     }
 
     @Override
     public String toString() {
-        return "AreaElemStyle{" + "color=" + color + '}';
+        return "AreaElemStyle{" + super.toString() + "color=" + color + '}';
     }
 }