Changeset 4882 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-01T13:01:14+01:00 (13 years ago)

Author:

simon04

Message:

fix #7349 - relation shows up as "ref"

File:

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

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

@@ -82 +82 @@
     }
 
-    /** the default list of tags which are used as naming tags in relations */
+    /** The default list of tags which are used as naming tags in relations.
+     * A ? prefix indicates a boolean value, for which the key (instead of the value) is used.
+     */
     static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
-        "public_transport", ":LocationCode", "note", "building"};
+        "public_transport", ":LocationCode", "note", "?building"};
 
     /** the current list of tags used as naming tags in relations */
@@ -473 +475 @@
             }
             return null;
-        } else if (OsmUtils.isTrue(relation.get(nameTag))) {
-            return tr(nameTag);
-        } else if (OsmUtils.isFalse(relation.get(nameTag))) {
+        } else if (nameTag.startsWith("?") && OsmUtils.isTrue(relation.get(nameTag.substring(1)))) {
+            return tr(nameTag.substring(1));
+        } else if (nameTag.startsWith("?") && OsmUtils.isFalse(relation.get(nameTag.substring(1)))) {
             return null;
         } else {