Changeset 3882 in josm

Timestamp:

Feb 10, 2011 11:41:33 AM (2 years ago)

Author:

bastiK

Message:

mapcss: fix layer handling

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (1 diff)
• dialogs/MapPaintDialog.java (modified) (1 diff)
• mappaint/Cascade.java (modified) (1 diff)
• mappaint/MultiCascade.java (modified) (1 diff)
• mappaint/TextElement.java (modified) (1 diff)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• mappaint/xml/XmlStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -868 +868 @@
             Layer layer = model.getLayer(index);
             LayerListPopup menu = new LayerListPopup(getModel().getSelectedLayers(), layer);
-            menu.show(LayerListDialog.this, p.x, p.y-3);
+            menu.show(layerList, p.x, p.y-3);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -608 +608 @@
             }
             MapPaintPopup menu = new MapPaintPopup();
-            menu.show(MapPaintDialog.this, p.x, p.y);
+            menu.show(tblStyles, p.x, p.y);
         }
     }

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

@@ -139 +139 @@
             return a;
         }
+        Float f = toFloat(o);
+        if (f != null)
+            return new float[] { f };
         return null;
     }

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

@@ -17 +17 @@
     }
 
-    public Cascade getCascade(String key) {
-        if (key == null)
+    /**
+     * Return the cascade for the given layer key. If it does not exist,
+     * return a new cascade, but do not keep it.
+     */
+    public Cascade getCascade(String layer) {
+        if (layer == null)
             throw new IllegalArgumentException();
-        Cascade c = get(key);
+        Cascade c = get(layer);
         if (c == null) {
-            c = new Cascade(!key.equals("default"));
-            put(key, c);
+            c = new Cascade(!layer.equals("default"));
         }
         return c;

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

@@ -38 +38 @@
 
         Font font = ElemStyle.getFont(c);
-        int xOffset = c.get("text-offset-x", 0f, Float.class).intValue();
-        int yOffset = -c.get("text-offset-y", 0f, Float.class).intValue();
+
+        float xOffset = 0;
+        float yOffset = 0;
+        float[] offset = c.get("text-offset", null, float[].class);
+        if (offset != null) {
+            if (offset.length == 1) {
+                yOffset = offset[0];
+            } else if (offset.length >= 2) {
+                xOffset = offset[0];
+                yOffset = offset[1];
+            }
+        }
+        xOffset = c.get("text-offset-x", xOffset, Float.class);
+        yOffset = c.get("text-offset-y", yOffset, Float.class);
+        
         Color color = c.get("text-color", PaintColors.TEXT.get(), Color.class);
-        return new TextElement(textKey, font, xOffset, yOffset, color);
+        
+        return new TextElement(textKey, font, (int) xOffset, (int) yOffset, color);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -134 +134 @@
                     }
 
-                    if (sub.equals("*")) { // fixme: proper subparts handling
+                    if (sub.equals("*")) {
                         for (Entry<String, Cascade> entry : mc.entrySet()) {
                             env.layer = entry.getKey();

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;