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

Timestamp:

2011-02-15T12:02:25+01:00 (15 years ago)

Author:

bastiK

Message:

mapcss: minor fixes

File:

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

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

@@ -124 +124 @@
     public static final NodeElemStyle SIMPLE_NODE_ELEMSTYLE;
     static {
-        Cascade c = new Cascade();
+        MultiCascade mc = new MultiCascade();
+        Cascade c = mc.getOrCreateCascade("default");
         c.put("text", "auto");
-        SIMPLE_NODE_ELEMSTYLE = create(c, true);
+        SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), true);
     }
 
@@ -137 +138 @@
     }
 
-    public static NodeElemStyle create(Cascade c) {
-        return create(c, false);
-    }
-
-    private static NodeElemStyle create(Cascade c, boolean allowOnlyText) {
+    public static NodeElemStyle create(Environment env) {
+        return create(env, false);
+    }
+
+    private static NodeElemStyle create(Environment env, boolean allowOnlyText) {
+        Cascade c = env.mc.getCascade(env.layer);
+
         IconReference iconRef = c.get("icon-image", null, IconReference.class);
         ImageIcon icon = null;
@@ -158 +161 @@
             }
         } else {
-            symbol = createSymbol(c);
+            symbol = createSymbol(env);
         }
 
@@ -195 +198 @@
     }
 
-    private static Symbol createSymbol(Cascade c) {
+    private static Symbol createSymbol(Environment env) {
+        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c_def = env.mc.getCascade("default");
+
         SymbolShape shape;
         String shapeStr = c.get("symbol-shape", null, String.class);
@@ -204 +210 @@
         } else
             return null;
-
-        float size = c.get("symbol-size", 10f, Float.class);
+        
+        Float sizeOnDefault = c_def.get("symbol-size", null, Float.class);
+        if (sizeOnDefault != null && sizeOnDefault <= 0) {
+            sizeOnDefault = null;
+        }
+        Float size = getWidth(c, "symbol-size", sizeOnDefault);
+
+        if (size == null) {
+            size = 10f;
+        }
+
         if (size <= 0)
             return null;
 
-        Float strokeWidth = c.get("symbol-stroke-width", null, Float.class);
-        if (strokeWidth != null && strokeWidth <= 0) {
-            strokeWidth = null;
-        }
+        Float strokeWidthOnDefault = getWidth(c_def, "symbol-stroke-width", null);
+        Float strokeWidth = getWidth(c, "symbol-stroke-width", strokeWidthOnDefault);
+
         Color strokeColor = c.get("symbol-stroke-color", null, Color.class);