Changeset 7112 in josm for trunk

Timestamp:

2014-05-12T21:45:02+02:00 (10 years ago)

Author:

simon04

Message:

fix #9880 - Recognise building=(!yes) relations as buildings (name formatter)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (modified) (3 diffs)

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

@@ -461 +461 @@
         } else if (nameTag.startsWith("?") && OsmUtils.isFalse(relation.get(nameTag.substring(1)))) {
             return null;
+        } else if (nameTag.startsWith("?")) {
+            return trc_lazy(nameTag, I18n.escape(relation.get(nameTag.substring(1))));
         } else {
             return trc_lazy(nameTag, I18n.escape(relation.get(nameTag)));

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -17 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
 import org.openstreetmap.josm.gui.tagging.TaggingPresets;
@@ -76 +79 @@
         }
     }
+
+    @Test
+    public void testRelationName() throws Exception {
+        assertThat(getFormattedRelationName("X=Y"), is("relation (0, 0 members)"));
+        assertThat(getFormattedRelationName("name=Foo"), is("relation (\"Foo\", 0 members)"));
+        assertThat(getFormattedRelationName("type=route route=tram ref=123"), is("route (\"123\", 0 members)"));
+        assertThat(getFormattedRelationName("type=multipolygon building=yes"), is("multipolygon (\"building\", 0 members)"));
+        assertThat(getFormattedRelationName("type=multipolygon building=yes ref=123"), is("multipolygon (\"123\", 0 members)"));
+        assertThat(getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"), is("multipolygon (\"building\", 0 members)"));
+        assertThat(getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"), is("multipolygon (\"residential\", 0 members)"));
+    }
+
+    @Test
+    public void testWayName() throws Exception {
+        assertThat(getFormattedWayName("building=yes"), is("building (0 nodes)"));
+        assertThat(getFormattedWayName("building=yes addr:housenumber=123"), is("House number 123 (0 nodes)"));
+        assertThat(getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"), is("House number 123 at FooStreet (0 nodes)"));
+        assertThat(getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"), is("House FooName (0 nodes)"));
+    }
+
+    static String getFormattedRelationName(String tagsString) {
+        return DefaultNameFormatter.getInstance().format((Relation) TestUtils.createPrimitive("relation " + tagsString));
+    }
+
+    static String getFormattedWayName(String tagsString) {
+        return DefaultNameFormatter.getInstance().format((Way) TestUtils.createPrimitive("way " + tagsString));
+    }
 }