Changeset 5217 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

Timestamp:

2012-05-06T21:23:18+02:00 (12 years ago)

Author:

bastiK

Message:

mapcss: change z-index handling

In contrast to previous default z-index of 1000 for nodes and -1000 for areas, the default z-index is
now always 0. An additional "major-z-index" is used to sort elemstyles by category, this property
can be adjusted in the style, so icons can be rendered below lines, if you want to.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (modified) (6 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.BoxProvider;
+import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.SimpleBoxProvider;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.BoxProvider;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.SimpleBoxProvider;
-import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -85 +84 @@
         MultiCascade mc = new MultiCascade();
         Cascade c = mc.getOrCreateCascade("default");
-        SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), true);
+        SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), 4.1f, true);
         if (SIMPLE_NODE_ELEMSTYLE == null) throw new AssertionError();
     }
@@ -92 +91 @@
     public static final StyleList DEFAULT_NODE_STYLELIST_TEXT = new StyleList(NodeElemStyle.SIMPLE_NODE_ELEMSTYLE, BoxTextElemStyle.SIMPLE_NODE_TEXT_ELEMSTYLE);
 
-    protected NodeElemStyle(Cascade c, MapImage mapImage, Symbol symbol) {
-        super(c, 1000f);
+    protected NodeElemStyle(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index) {
+        super(c, default_major_z_index);
         this.mapImage = mapImage;
         this.symbol = symbol;
@@ -99 +98 @@
 
     public static NodeElemStyle create(Environment env) {
-        return create(env, false);
-    }
-
-    private static NodeElemStyle create(Environment env, boolean allowDefault) {
+        return create(env, 4f, false);
+    }
+
+    private static NodeElemStyle create(Environment env, float default_major_z_index, boolean allowDefault) {
         Cascade c = env.mc.getCascade(env.layer);
 
@@ -116 +115 @@
         if (!allowDefault && symbol == null && mapImage == null) return null;
 
-        return new NodeElemStyle(c, mapImage, symbol);
+        return new NodeElemStyle(c, mapImage, symbol, default_major_z_index);
     }
 
@@ -302 +301 @@
 
     public BoxProvider getBoxProvider() {
-        if (mapImage != null) {
+        if (mapImage != null)
             return mapImage.getBoxProvider();
-        } else if (symbol != null) {
+        else if (symbol != null)
             return new SimpleBoxProvider(new Rectangle(-symbol.size/2, -symbol.size/2, symbol.size, symbol.size));
-        } else {
+        else {
             // This is only executed once, so no performance concerns.
             // However, it would be better, if the settings could be changed at runtime.