Merge pull request #917 from lonvia/conflicting-address-tags

Correctly handle addr:street and addr:place appearing together

Author: lonvia

src/main/java/de/komoot/photon/PhotonDocAddressSet.java

@@ -31,53 +31,45 @@ public Iterator<PhotonDoc> iterator() {
     }
 
     private void addPlaceAddress(PhotonDoc base, Map<String, String> address, String key) {
-        Map<AddressType, Map<String, String>> placeAddress = null;
-        for (String hnr : splitHousenumber(address, key)) {
-            if (placeAddress == null) {
-                placeAddress = new EnumMap<>(AddressType.class);
-
-                for (var entry : base.getAddressParts().entrySet()) {
-                    if (entry.getKey() != AddressType.STREET) {
-                        placeAddress.put(entry.getKey(), entry.getValue());
-                    }
+        final String place = address.get("place");
+        if (place != null && !place.isBlank()) {
+            Map<AddressType, Map<String, String>> placeAddress = null;
+            for (String hnr : splitHousenumber(address, key)) {
+                if (placeAddress == null) {
+                    placeAddress = copyAddressWithStreet(base, place);
                 }
 
-                final String place = address.get("place");
-                if (place != null && !place.isBlank()) {
-                    placeAddress.put(AddressType.STREET, Map.of("default", place));
-                }
+                docs.add(new PhotonDoc(base).replaceAddress(placeAddress).houseNumber(hnr));
             }
-
-            docs.add(new PhotonDoc(base).replaceAddress(placeAddress).houseNumber(hnr));
         }
     }
 
     private void addStreetAddress(PhotonDoc base, Map<String, String> address, String key) {
-        for (String hnr : splitHousenumber(address, key)) {
-            docs.add(new PhotonDoc(base).houseNumber(hnr));
+        if (address.containsKey("street")) {
+            for (String hnr : splitHousenumber(address, key)) {
+                docs.add(new PhotonDoc(base).houseNumber(hnr));
+            }
         }
     }
 
     private void addGenericAddress(PhotonDoc base, Map<String, String> address, String key) {
         Map<AddressType, Map<String, String>> placeAddress = null;
         for (String hnr : splitHousenumber(address, key)) {
             if (placeAddress == null) {
-                String place = address.get("place");
-                if (place == null || place.isBlank()) {
-                    place = address.get("block_number");
-                }
-                if (place != null && !place.isBlank()) {
-                    placeAddress = new EnumMap<>(AddressType.class);
-
-                    for (var entry : base.getAddressParts().entrySet()) {
-                        if (entry.getKey() != AddressType.STREET) {
-                            placeAddress.put(entry.getKey(), entry.getValue());
-                        }
-                    }
-
-                    placeAddress.put(AddressType.STREET, Map.of("default", place));
+                String block = address.get("block_number");
+                if (block != null && !block.isBlank()) {
+                    // block numbers replace streets unconditionally.
+                    // We assume that addr:street is a tagging error and ignore it.
+                    placeAddress = copyAddressWithStreet(base, block);
                 } else {
-                    placeAddress = base.getAddressParts();
+                    String place = address.get("place");
+                    // When addr:place and addr:Street appear together, then assume
+                    // that addr:place is a tagging error and ignore it.
+                    if (place != null && !place.isBlank() && !address.containsKey("street")) {
+                        placeAddress = copyAddressWithStreet(base, place);
+                    } else {
+                        placeAddress = base.getAddressParts();
+                    }
                 }
             }
 
@@ -98,4 +90,18 @@ private String[] splitHousenumber(Map<String, String> address, String key) {
                 .toArray(String[]::new);
     }
 
+    private EnumMap<AddressType, Map<String, String>> copyAddressWithStreet(PhotonDoc base, String streetName) {
+        final EnumMap<AddressType, Map<String, String>> outmap = new EnumMap<>(AddressType.class);
+
+        for (var entry : base.getAddressParts().entrySet()) {
+            if (entry.getKey() != AddressType.STREET) {
+                outmap.put(entry.getKey(), entry.getValue());
+            }
+        }
+
+        outmap.put(AddressType.STREET, Map.of("default", streetName));
+
+        return outmap;
+    }
+
 }

src/test/java/de/komoot/photon/PhotonDocAddressSetTest.java

@@ -89,20 +89,30 @@ void testHousenumberList() {
     void testPlaceAddress() {
         assertThat(new PhotonDocAddressSet(baseDoc, Map.of(
                 "housenumber", "34;50 b",
-                "place", "Nowhere",
-                "street", "irrelevant")))
+                "place", "Nowhere")))
                 .satisfiesExactly(
                         d -> assertDocWithHnrAndStreet(d, "34", "Nowhere"),
                         d2 -> assertDocWithHnrAndStreet(d2, "50 b", "Nowhere"));
     }
 
+    @Test
+    void testPlaceAndStreetAddress() {
+        assertThat(new PhotonDocAddressSet(baseDoc, Map.of(
+                "housenumber", "34",
+                "place", "Nowhere",
+                "street", "Chaussee")))
+                .satisfiesExactly(
+                        d -> assertDocWithHnrAndStreet(d, "34", "Chaussee"));
+    }
+
     @Test
     void testConscriptionAddress() {
         assertThat(new PhotonDocAddressSet(baseDoc, Map.of(
                 "housenumber", "34/50",
                 "conscriptionnumber", "50",
                 "streetnumber", "34",
-                "place", "Nowhere")))
+                "place", "Nowhere",
+                "street", "Chaussee")))
                 .satisfiesExactly(
                         d -> assertDocWithHnrAndStreet(d, "50", "Nowhere"),
                         d2 -> assertDocWithHnrAndStreet(d2, "34", "Chaussee"));
@@ -118,6 +128,7 @@ void testBlockAddress() {
                 );
     }
 
+
     @ParameterizedTest
     @ValueSource(strings = {
             "987987誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマーケット誰も住んでいないスーパーマー",

src/test/java/de/komoot/photon/nominatim/NominatimConnectorDBTest.java

@@ -341,6 +341,7 @@ void testObjectWithConscriptionNumber() {
                 .addr("streetnumber", "34")
                 .addr("conscriptionnumber", "99521")
                 .addr("place", "Village")
+                .addr("street", "Main St")
                 .parent(parent).add(jdbc);
 
         place.addAddresslines(jdbc,