Changeset 3268 in josm for trunk

Timestamp:

2010-05-22T19:02:48+02:00 (14 years ago)

Author:

stoecker

Message:

improve naming of relations

File:

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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -48 +49 @@
 
     /** 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", "public_transport", ":LocationCode", "note"};
+    static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
+    "public_transport", ":LocationCode", "note"};
 
     /** the current list of tags used as naming tags in relations */
@@ -166 +168 @@
             if (name == null) {
                 name = (relation.get("public_transport") != null) ? tr("public transport") : "";
+            }
+            if (name == null) {
+                String building  = relation.get("building");
+                if(OsmUtils.isTrue(building))
+                    name = tr("building");
+                else if(building != null)
+                    name = tr(building); // translate tag!
             }
             if (name == null) {