Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

Timestamp:

2017-02-25T03:14:20+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #14402 - add blacklist for leisure area values to avoid false positives - improve globally the detection of keys/tags

File:

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

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

@@ -169 +169 @@
                 }
                 if (n == null) {
-                    String s;
-                    if ((s = node.get("addr:housename")) != null) {
+                    String s = node.get("addr:housename");
+                    if (s != null) {
                         /* I18n: name of house as parameter */
                         n = tr("House {0}", s);
@@ -250 +250 @@
                 }
                 if (n == null) {
-                    n = (way.get("highway") != null) ? tr("highway") :
-                            (way.get("railway") != null) ? tr("railway") :
-                                (way.get("waterway") != null) ? tr("waterway") :
-                                        (way.get("landuse") != null) ? tr("landuse") : null;
+                    n = way.hasKey("highway") ? tr("highway") :
+                        way.hasKey("railway") ? tr("railway") :
+                        way.hasKey("waterway") ? tr("waterway") :
+                        way.hasKey("landuse") ? tr("landuse") : null;
                 }
                 if (n == null) {
-                    String s;
-                    if ((s = way.get("addr:housename")) != null) {
+                    String s = way.get("addr:housename");
+                    if (s != null) {
                         /* I18n: name of house as parameter */
                         n = tr("House {0}", s);
@@ -273 +273 @@
                     }
                 }
-                if (n == null && way.get("building") != null) n = tr("building");
+                if (n == null && way.hasKey("building")) {
+                    n = tr("building");
+                }
                 if (n == null || n.isEmpty()) {
                     n = String.valueOf(way.getId());
@@ -407 +409 @@
         String name = trc("Relation type", relation.get("type"));
         if (name == null) {
-            name = (relation.get("public_transport") != null) ? tr("public transport") : null;
+            name = relation.hasKey("public_transport") ? tr("public transport") : null;
         }
         if (name == null) {
@@ -573 +575 @@
         if (sb.length() == 0) {
             sb.append(
-                    (way.get("highway") != null) ? tr("highway") :
-                        (way.get("railway") != null) ? tr("railway") :
-                            (way.get("waterway") != null) ? tr("waterway") :
-                                (way.get("landuse") != null) ? tr("landuse") : ""
+                    way.hasKey("highway") ? tr("highway") :
+                    way.hasKey("railway") ? tr("railway") :
+                    way.hasKey("waterway") ? tr("waterway") :
+                    way.hasKey("landuse") ? tr("landuse") : ""
                     );
         }
 
-        int nodesNo = way.isClosed() ? way.getNumNodes() -1 : way.getNumNodes();
+        int nodesNo = way.isClosed() ? (way.getNumNodes() -1) : way.getNumNodes();
         String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
         if (sb.length() == 0) {
@@ -587 +589 @@
         /* note: length == 0 should no longer happen, but leave the bracket code
            nevertheless, who knows what future brings */
-        sb.append((sb.length() > 0) ? " ("+nodes+')' : nodes);
+        sb.append((sb.length() > 0) ? (" ("+nodes+')') : nodes);
         decorateNameWithId(sb, way);
         return sb.toString();
@@ -595 +597 @@
     public String format(HistoryRelation relation) {
         StringBuilder sb = new StringBuilder();
-        if (relation.get("type") != null) {
-            sb.append(relation.get("type"));
+        String type = relation.get("type");
+        if (type != null) {
+            sb.append(type);
         } else {
             sb.append(tr("relation"));