Changeset 10967 in josm for trunk

Timestamp:

2016-09-06T23:01:03+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #13554 - Allow multipolygon as street member in associatedStreet relations; see #13357 - update preset unit test ignore list

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -10177 +10177 @@
             <text key="name" text="Street name" />
             <roles>
-                <role key="street" text="street" requisite="required" type="way,closedway" member_expression="highway" />
+                <role key="street" text="street" requisite="required" type="way,closedway,multipolygon" member_expression="highway" />
                 <role key="house" text="house" requisite="required" type="node,way,closedway,multipolygon" member_expression="&quot;addr:housenumber&quot; | &quot;addr:interpolation&quot; | &quot;addr:housename&quot;" />
             </roles>

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -97 +97 @@
                 error = true;
                 // ignore https://github.com/yopaseopor/traffic_signs_preset_JOSM because of far too frequent missing icons errors
-                // ignore https://github.com/OsmHackTW/josm-presets/pull/4 until pull request is merged
-                if (!source.url.contains("yopaseopor/traffic_signs") && !source.url.contains("OsmHackTW/josm-presets")) {
+                if (!source.url.contains("yopaseopor/traffic_signs")) {
                     allMessages.add(message);
                 }