Changeset 2136 in josm for trunk/src/org

Timestamp:

2009-09-14T21:39:03+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3328: show note= again at relations

File:

• trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -9 +9 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.Main;
@@ -160 +161 @@
             name += " (";
             String nameTag = null;
-            for (String n : getNamingtagsForRelations()) {
-                if (n.equals("name")) {
+            Set<String> namingTags = new HashSet<String>(getNamingtagsForRelations());
+            for (String n : relation.keySet()) {
+                // #3328: "note " and " note" are name tags too
+                if (namingTags.contains(n.trim())) {
                     if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
                         nameTag = relation.getLocalName();
@@ -167 +170 @@
                         nameTag = relation.getName();
                     }
-                } else {
-                    nameTag =  relation.get(n);
+                    if (nameTag == null) {
+                        nameTag = relation.get(n);
+                    }
                 }
                 if (nameTag != null) {