Changeset 4007 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

Timestamp:

2011-03-27T13:41:58+02:00 (15 years ago)

Author:

bastiK

Message:

see #6150 mapcss - extended functionality for instruction text: ... (patch by Gubaer)

File:

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

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy;
+import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy;
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.TagKeyReference;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -81 +83 @@
      */
     protected static LabelCompositionStrategy buildLabelCompositionStrategy(Cascade c, boolean defaultAnnotate){
-        Keyword textKW = c.get("text", null, Keyword.class, true);
-        if (textKW == null) {
-            String textKey = c.get("text", null, String.class);
-            if (textKey == null) 
-                return defaultAnnotate ? AUTO_LABEL_COMPOSITION_STRATEGY : null;
-            return new TagLookupCompositionStrategy(textKey);
-        } else if (textKW.val.equals("auto"))
+        /*
+         * If the cascade includes a TagKeyReference we will lookup the rendered label
+         * from a tag value.
+         */
+        TagKeyReference tkr = c.get("text", null, TagKeyReference.class, true);
+        if (tkr != null)
+            return new TagLookupCompositionStrategy(tkr.key);
+
+        /*
+         * Check whether the label composition strategy is given by
+         * a keyword
+         */
+        Keyword keyword = c.get("text", null, Keyword.class, true);
+        if (equal(keyword, Keyword.AUTO))
             return AUTO_LABEL_COMPOSITION_STRATEGY;
-        else
-            return new TagLookupCompositionStrategy(textKW.val);
+
+        /*
+         * Do we have a static text label?
+         */
+        String text = c.get("text", null, String.class, true);
+        if (text != null)
+            return new StaticLabelCompositionStrategy(text);
+        return defaultAnnotate ? AUTO_LABEL_COMPOSITION_STRATEGY : null;
     }