Changeset 4744 in josm for trunk/src

Timestamp:

2011-12-29T16:16:17+01:00 (13 years ago)

Author:

Don-vip

Message:

Building presets

File:

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

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

@@ -84 +84 @@
     /** the default list of tags which are used as naming tags in relations */
     static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
-        "public_transport", ":LocationCode", "note"};
+        "public_transport", ":LocationCode", "note", "building"};
 
     /** the current list of tags used as naming tags in relations */
@@ -226 +226 @@
                                 (way.get("railway") != null) ? tr("railway") :
                                     (way.get("waterway") != null) ? tr("waterway") :
-                                        (way.get("landuse") != null) ? tr("landuse") : null;
+                                        (way.get("building") != null) ? tr("building") :
+                                            (way.get("landuse") != null) ? tr("landuse") : null;
                 }
                 if(n == null)
@@ -433 +434 @@
         if (name == null) {
             String building  = relation.get("building");
-            if(OsmUtils.isTrue(building)) {
+            if (OsmUtils.isTrue(building)) {
                 name = tr("building");
             } else if(building != null)
@@ -472 +473 @@
             }
             return null;
-        } else
+        } else if (OsmUtils.isTrue(relation.get(nameTag))) {
+            return tr(nameTag);
+        } else if (OsmUtils.isFalse(relation.get(nameTag))) {
+            return null;
+        } else {
             return trc_lazy(nameTag, I18n.escape(relation.get(nameTag)));
+        }
     }