Changeset 5217 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.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/LineElemStyle.java (modified) (5 diffs)

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

@@ -40 +40 @@
 
     protected enum LineType {
-        NORMAL(""),
-        CASING("casing-"),
-        LEFT_CASING("left-casing-"),
-        RIGHT_CASING("right-casing-");
-
-        public String prefix;
-
-        LineType(String prefix) {
+        NORMAL("", 3f),
+        CASING("casing-", 2f),
+        LEFT_CASING("left-casing-", 2.1f),
+        RIGHT_CASING("right-casing-", 2.1f);
+
+        public final String prefix;
+        public final float default_major_z_index;
+
+        LineType(String prefix, float default_major_z_index) {
             this.prefix = prefix;
-        }
-    }
-
-    protected LineElemStyle(Cascade c, BasicStroke line, Color color, BasicStroke dashesLine, Color dashesBackground, float offset, float realWidth) {
-        super(c, 0f);
+            this.default_major_z_index = default_major_z_index;
+        }
+    }
+
+    protected LineElemStyle(Cascade c, float default_major_z_index, BasicStroke line, Color color, BasicStroke dashesLine, Color dashesBackground, float offset, float realWidth) {
+        super(c, default_major_z_index);
         this.line = line;
         this.color = color;
@@ -69 +71 @@
         LineElemStyle leftCasing = createImpl(env, LineType.LEFT_CASING);
         if (leftCasing != null) {
-            leftCasing.z_index += -90;
             leftCasing.isModifier = true;
         }
@@ -78 +79 @@
         LineElemStyle rightCasing = createImpl(env, LineType.RIGHT_CASING);
         if (rightCasing != null) {
-            rightCasing.z_index += -90;
             rightCasing.isModifier = true;
         }
@@ -87 +87 @@
         LineElemStyle casing = createImpl(env, LineType.CASING);
         if (casing != null) {
-            casing.z_index += -100;
             casing.isModifier = true;
         }
@@ -263 +262 @@
         }
 
-        return new LineElemStyle(c, line, color, dashesLine, dashesBackground, offset, realWidth);
+        return new LineElemStyle(c, type.default_major_z_index, line, color, dashesLine, dashesBackground, offset, realWidth);
     }