Changeset 3882 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

Timestamp:

2011-02-10T11:41:33+01:00 (15 years ago)

Author:

bastiK

Message:

mapcss: fix layer handling

File:

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

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

@@ -278 +278 @@
     @Override
     public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
-        Cascade def = mc.getCascade("default");
+        Cascade def = mc.get("default");
+        if (def == null) {
+            def = new Cascade(false);
+            mc.put("default", def);
+        }
         boolean useMinMaxScale = Main.pref.getBoolean("mappaint.zoomLevelDisplay", false);
 
@@ -321 +325 @@
                     Cascade c;
                     if (mod.over) {
-                        c = mc.getCascade(String.format("over_%d", numOver));
+                        String layer = String.format("over_%d", numOver);
+                        c = mc.get(layer);
+                        if (c == null) {
+                            c = new Cascade(true);
+                            mc.put(layer, c);
+                        }
                         c.put("object-z-index", new Float(numOver));
                         ++numOver;
                     } else {
-                        c = mc.getCascade(String.format("under_%d", numUnder));
+                        String layer = String.format("under_%d", numUnder);
+                        c = mc.get(layer);
+                        if (c == null) {
+                            c = new Cascade(true);
+                            mc.put(layer, c);
+                        }
                         c.put("object-z-index", new Float(-numUnder));
                         ++numUnder;