Changeset 1208 in josm for trunk

Timestamp:

2009-01-03T16:03:54+01:00 (16 years ago)

Author:

ulfl

Message:

fix #1834: display names even for simple nodes without an icon
fix #1835: display ref, operator or brand string (in this order), if no name is given

File:

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

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

@@ -751 +751 @@
             } else
                 g.drawRect(p.x - radius, p.y - radius, size, size);
+
+                        String name = getNodeName(n);
+                        if (name!=null /* && annotate */)
+                        {
+                                g.setColor(textColor);
+                                Font defaultFont = g.getFont();
+                                g.setFont (orderFont);
+                                g.drawString (name, p.x+radius+2, p.y+radius+2);
+                                g.setFont(defaultFont);
+                        }
         }
     }
@@ -769 +779 @@
         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(";");
+        regionalNameOrder = Main.pref.get("mappaint.nameOrder", "name:"+currentLocale+";name;int_name;ref;operator;brand").split(";");
 
         alreadyDrawn = new LinkedList<OsmPrimitive>();