Changeset 12311 in josm for trunk

Timestamp:

2017-06-04T16:58:52+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14895 - allow addr:neighbourhood as assignment additional to addr:street and addr:place

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java

@@ -44 +44 @@
     protected static final String ADDR_HOUSE_NUMBER  = "addr:housenumber";
     protected static final String ADDR_INTERPOLATION = "addr:interpolation";
+    protected static final String ADDR_NEIGHBOURHOOD = "addr:neighbourhood";
     protected static final String ADDR_PLACE         = "addr:place";
     protected static final String ADDR_STREET        = "addr:street";
@@ -80 +81 @@
     protected void checkHouseNumbersWithoutStreet(OsmPrimitive p) {
         List<Relation> associatedStreets = getAndCheckAssociatedStreets(p);
-        // Find house number without proper location (neither addr:street, associatedStreet, addr:place or addr:interpolation)
-        if (p.hasKey(ADDR_HOUSE_NUMBER) && !p.hasKey(ADDR_STREET) && !p.hasKey(ADDR_PLACE)) {
+        // Find house number without proper location (neither addr:street, associatedStreet, addr:place, addr:neighbourhood or addr:interpolation)
+        if (p.hasKey(ADDR_HOUSE_NUMBER) && !p.hasKey(ADDR_STREET, ADDR_PLACE, ADDR_NEIGHBOURHOOD)) {
             for (Relation r : associatedStreets) {
                 if (r.hasTag("type", ASSOCIATED_STREET)) {