Changeset 3899 in josm

Timestamp:

Feb 13, 2011 8:26:58 PM (2 years ago)

Author:

bastiK

Message:

mapcss: small fix

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/TextElement.java (modified) (2 diffs)
• styles_nodist/potlatch2/build.xml (modified) (1 prop)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -248 +248 @@
         if (text == null)
             return;
-        String name = getAreaName(way);
+        String name = text.getString(way, this);
         if (name == null || name.equals(""))
             return;

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

@@ -47 +47 @@
                 RelativeFloat width_rel = c.get(key, null, RelativeFloat.class, true);
                 if (width_rel != null)
-                    return relativeTo + 2*width_rel.val;
+                    return relativeTo + width_rel.val;
             }
         }

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

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Font;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -80 +82 @@
     }
 
+    public String getString(OsmPrimitive osm, MapPainter painter) {
+        if (textKey == null)
+            return painter.getAreaName(osm);
+        else
+            return osm.get(textKey);
+    }
+
+
 }