Changeset 1019 in josm

Timestamp:

2008-10-05T13:30:59+02:00 (16 years ago)

Author:

stoecker

Message:

allow localized name display. close #1586

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.Locale;
 
 import javax.swing.ImageIcon;
@@ -44 +45 @@
         protected ElemStyles styles;
         protected double circum;
+        protected String regionalNameOrder[];
 
         protected boolean isZoomOk(ElemStyle e) {
@@ -226 +228 @@
                 int w = icon.getIconWidth(), h=icon.getIconHeight();
                 icon.paintIcon ( Main.map.mapView, g, p.x-w/2, p.y-h/2 );
-                String name = (n.keys==null) ? null : n.keys.get("name");
+                String name = getNodeName(n);
                 if (name!=null && annotate)
                 {
@@ -240 +242 @@
                         g.drawRect (p.x-w/2-2,p.y-w/2-2, w+4, h+4);
                 }
+        }
+
+        protected String getNodeName(Node n) {
+                String name = null;
+                if (n.keys != null) {
+                        for (int i = 0; i < regionalNameOrder.length; i++) {
+                                name = n.keys.get(regionalNameOrder[i]);
+                                if (name != null) break;
+                        }
+                }
+                return name;
         }
 
@@ -322 +335 @@
                 styles = MapPaintStyles.getStyles();
                 orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
+                String currentLocale = Locale.getDefault().getLanguage();
+                regionalNameOrder = Main.pref.get("mappaint.nameOrder", "name:"+currentLocale+";name;int_name").split(";");
 
                 if(styles.hasAreas())