Changeset 3987 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2011-03-13T20:44:57+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: improvements in text label selection, performance and typo (patch by anonymous, see #6107)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (10 diffs)

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

@@ -39 +39 @@
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.HorizontalTextAlignment;
+import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.NodeTextElement;
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
-import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.NodeTextElement;
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.VerticalTextAlignment;
 import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -73 +72 @@
 
     private final boolean leftHandTraffic;
-
-    private final Collection<String> regionalNameOrder;
 
     private static final double PHI = Math.toRadians(20);
@@ -104 +101 @@
         this.segmentNumberSpace = Main.pref.getInteger("mappaint.segmentnumber.space", 40);
 
-        String[] names = {"name:" + LanguageInfo.getJOSMLocaleCode(), "name", "int_name", "ref", "operator", "brand", "addr:housenumber"};
-        this.regionalNameOrder = Main.pref.getCollection("mappaint.nameOrder", Arrays.asList(names));
         this.circum = circum;
         this.leftHandTraffic = leftHandTraffic;
@@ -118 +113 @@
      * @param onewayReversed for oneway=-1 and similar
      */
-    public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, 
+    public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor,
             TextElement text, boolean showOrientation, boolean showHeadArrowOnly,
             boolean showOneway, boolean onewayReversed) {
@@ -253 +248 @@
         if (text == null)
             return;
-        String name = text.getString(way, this);
+        String name = text.getString(way);
         if (name == null || name.equals(""))
             return;
@@ -292 +287 @@
 
         if (p1[0] < p2[0] &&
-            p1[2] < Math.PI/2 &&
-            p1[2] > -Math.PI/2) {
+                p1[2] < Math.PI/2 &&
+                p1[2] > -Math.PI/2) {
             angleOffset = 0;
             offsetSign = 1;
@@ -347 +342 @@
             }
             return new double[] {poly.xpoints[i-1]+(totalLen - curLen)/segLen*dx,
-                                 poly.ypoints[i-1]+(totalLen - curLen)/segLen*dy,
-                                 Math.atan2(dy, dx)};
+                    poly.ypoints[i-1]+(totalLen - curLen)/segLen*dy,
+                    Math.atan2(dy, dx)};
         }
         return null;
@@ -495 +490 @@
             return;
 
-        String s = text.textKey == null ? getNodeName(n) : n.get(text.textKey);
-        if (s == null)
-            return;
+        /*
+         * abort if we can't compose the label to be rendered
+         */
+        if (text.labelCompositionStrategy == null) return;
+        String s = text.labelCompositionStrategy.compose(n);
+        if (s == null) return;
 
         Font defaultFont = g.getFont();
@@ -598 +596 @@
 
         if (text != null && isShowNames()) {
-            String name = text.textKey == null ? getAreaName(osm) : osm.get(text.textKey);
-            if (name == null)
-                return;
+            /*
+             * abort if we can't compose the label to be rendered
+             */
+            if (text.labelCompositionStrategy == null) return;
+            String name = text.labelCompositionStrategy.compose(osm);
+            if (name == null) return;
 
             Rectangle pb = polygon.getBounds();
@@ -931 +932 @@
     }
 
-    //TODO Not a good place for this method
-    public String getNodeName(Node n) {
-        String name = null;
-        if (n.hasKeys()) {
-            for (String rn : regionalNameOrder) {
-                name = n.get(rn);
-                if (name != null) {
-                    break;
-                }
-            }
-        }
-        return name;
-    }
-
-    //TODO Not a good place for this method
-    public String getAreaName(OsmPrimitive w) {
-        String name = null;
-        if (w.hasKeys()) {
-            for (String rn : regionalNameOrder) {
-                name = w.get(rn);
-                if (name != null) {
-                    break;
-                }
-            }
-        }
-        return name;
-    }
-
     public boolean isInactive() {
         return inactive;