Changeset 15043 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-05-03T23:47:54+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #17674 - use addr:suburb to distinguish similar addresses in the same city, like addr:postcode

File:

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

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

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -62 +63 @@
     protected static final String ADDR_PLACE         = "addr:place";
     protected static final String ADDR_STREET        = "addr:street";
+    protected static final String ADDR_SUBURB        = "addr:suburb";
     protected static final String ADDR_CITY          = "addr:city";
     protected static final String ADDR_UNIT          = "addr:unit";
@@ -72 +74 @@
     private Map<String, Collection<OsmPrimitive>> knownAddresses;
     private Set<String> ignoredAddresses;
-
 
     /**
@@ -104 +105 @@
     }
 
-    protected void checkHouseNumbersWithoutStreet(OsmPrimitive p) {
-        List<Relation> associatedStreets = getAndCheckAssociatedStreets(p);
+    /**
+     * Checks for house numbers for which the street is unknown.
+     * @param p primitive to test
+     * @return error found, or null
+     */
+    protected TestError checkHouseNumbersWithoutStreet(OsmPrimitive p) {
         // 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)) {
-                    return;
-                }
-            }
-            if (p.referrers(Way.class).anyMatch(w -> w.hasKey(ADDR_INTERPOLATION) && w.hasKey(ADDR_STREET))) {
-                return;
-            }
-            // No street found
-            errors.add(TestError.builder(this, Severity.WARNING, HOUSE_NUMBER_WITHOUT_STREET)
-                    .message(tr("House number without street"))
-                    .primitives(p)
-                    .build());
-        }
+        if (p.hasKey(ADDR_HOUSE_NUMBER) && !p.hasKey(ADDR_STREET, ADDR_PLACE, ADDR_NEIGHBOURHOOD)
+            && getAndCheckAssociatedStreets(p).isEmpty()
+            && p.referrers(Way.class).noneMatch(w -> w.hasKey(ADDR_INTERPOLATION) && w.hasKey(ADDR_STREET))) {
+            // no street found
+            TestError e = TestError.builder(this, Severity.WARNING, HOUSE_NUMBER_WITHOUT_STREET)
+                .message(tr("House number without street"))
+                .primitives(p)
+                .build();
+            errors.add(e);
+            return e;
+        }
+        return null;
     }
 
@@ -177 +179 @@
     }
 
-    protected void checkForDuplicate(OsmPrimitive p) {
+    protected List<TestError> checkForDuplicate(OsmPrimitive p) {
         if (knownAddresses == null) {
             initAddressMap(p);
         }
         if (!isPOI(p) && hasAddress(p)) {
+            List<TestError> result = new ArrayList<>();
             String simplifiedAddress = getSimplifiedAddress(p);
-            if (ignoredAddresses.contains(simplifiedAddress)) {
-                return;
-            }
-            if (knownAddresses.containsKey(simplifiedAddress)) {
+            if (!ignoredAddresses.contains(simplifiedAddress) && knownAddresses.containsKey(simplifiedAddress)) {
                 double maxDistance = MAX_DUPLICATE_DISTANCE.get();
                 for (OsmPrimitive p2 : knownAddresses.get(simplifiedAddress)) {
@@ -198 +198 @@
                     if (city1 != null && city2 != null) {
                         if (city1.equals(city2)) {
-                            if (!p.hasKey(ADDR_POSTCODE) || !p2.hasKey(ADDR_POSTCODE) || p.get(ADDR_POSTCODE).equals(p2.get(ADDR_POSTCODE))) {
+                            if ((!p.hasKey(ADDR_POSTCODE) || !p2.hasKey(ADDR_POSTCODE) || p.get(ADDR_POSTCODE).equals(p2.get(ADDR_POSTCODE)))
+                             && (!p.hasKey(ADDR_SUBURB) || !p2.hasKey(ADDR_SUBURB) || p.get(ADDR_SUBURB).equals(p2.get(ADDR_SUBURB)))) {
                                 severityLevel = Severity.WARNING;
                             } else {
-                                // address including city identical but postcode differs
+                                // address including city identical but postcode or suburb differs
                                 // most likely perfectly fine
                                 severityLevel = Severity.OTHER;
@@ -228 +229 @@
                         }
                     }
-                    errors.add(TestError.builder(this, severityLevel, DUPLICATE_HOUSE_NUMBER)
+                    result.add(TestError.builder(this, severityLevel, DUPLICATE_HOUSE_NUMBER)
                             .message(tr("Duplicate house numbers"), marktr("''{0}'' ({1}m)"), simplifiedAddress, (int) distance)
                             .primitives(Arrays.asList(p, p2)).build());
@@ -234 +235 @@
                 knownAddresses.get(simplifiedAddress).remove(p); // otherwise we would get every warning two times
             }
-        }
+            errors.addAll(result);
+            return result;
+        }
+        return Collections.emptyList();
     }