implement is-a-name option for housenumbers

diff --git a/nominatim/tokenizer/sanitizers/clean_housenumbers.py b/nominatim/tokenizer/sanitizers/clean_housenumbers.py
index 49f9b4f05c6c14c237e46c76d99be6711abeff23..480217934e8689ecc49ffc8bb38289169893159e 100644 (file)
--- a/nominatim/tokenizer/sanitizers/clean_housenumbers.py
+++ b/nominatim/tokenizer/sanitizers/clean_housenumbers.py
@@ -29,6 +29,10 @@ class _HousenumberSanitizer:
         self.filter_kind = create_kind_filter(config, 'housenumber')
         self.split_regexp = create_split_regex(config)
 
+        nameregexps = config.get('is-a-name', [])
+        self.is_name_regexp = [re.compile(r) for r in nameregexps]
+
+
 
     def __call__(self, obj):
         if not obj.address:
@@ -37,8 +41,11 @@ class _HousenumberSanitizer:
         new_address = []
         for item in obj.address:
             if self.filter_kind(item):
-                new_address.extend(item.clone(kind='housenumber', name=n)
-                                   for n in self.sanitize(item.name))
+                if self.treat_as_name(item.name):
+                    obj.names.append(item.clone(kind='housenumber'))
+                else:
+                    new_address.extend(item.clone(kind='housenumber', name=n)
+                                       for n in self.sanitize(item.name))
             else:
                 # Don't touch other address items.
                 new_address.append(item)
@@ -62,6 +69,10 @@ class _HousenumberSanitizer:
         yield hnr
 
 
+    def _treat_as_name(self, housenumber):
+        return any(r.fullmatch(housenumber) is not None for r in self.is_name_regexp)
+
+
 def create(config):
     """ Create a housenumber processing function.
     """

diff --git a/settings/icu_tokenizer.yaml b/settings/icu_tokenizer.yaml
index bf51f56344e12ae4e6986d8fc60683fa77a8d002..7f53c5a7a19e71b171c8bce33a1d62f8862f5f72 100644 (file)
--- a/settings/icu_tokenizer.yaml
+++ b/settings/icu_tokenizer.yaml
@@ -25,13 +25,15 @@ transliteration:
     - "[^a-z0-9[:Space:]] >"
     - ":: NFC ()"
 sanitizers:
-    - step: split-name-list
-    - step: strip-brace-terms
     - step: clean-housenumbers
       filter-kind:
         - housenumber
         - conscriptionnumber
         - streetnumber
+      is-a-name:
+        - (\A|.*,)[^\d,]{3,}(,.*|\Z)
+    - step: split-name-list
+    - step: strip-brace-terms
     - step: tag-analyzer-by-language
       filter-kind: [".*name.*"]
       whitelist: [bg,ca,cs,da,de,el,en,es,et,eu,fi,fr,gl,hu,it,ja,mg,ms,nl,no,pl,pt,ro,ru,sk,sl,sv,tr,uk,vi]

diff --git a/test/bdd/db/query/housenumbers.feature b/test/bdd/db/query/housenumbers.feature
index 63bd89840dd0088d695cde75a03e6e052a669dca..bbb43f179e1477bcc8dde45e6cd91136c4941a27 100644 (file)
--- a/test/bdd/db/query/housenumbers.feature
+++ b/test/bdd/db/query/housenumbers.feature
@@ -53,3 +53,17 @@ Feature: Searching of house numbers
         | 2;4;12 |
         | 2,4,12 |
         | 2, 4, 12 |
+
+
+    Scenario: A name mapped as a housenumber is found
+        Given the places
+         | osm | class    | type | housenr | geometry |
+         | N1  | building | yes  | Warring | 9        |
+        And the places
+         | osm | class   | type | name       | geometry |
+         | W10 | highway | path | Chester St | 1,2,3    |
+        When importing
+        When sending search query "Chester St Warring"
+        Then results contain
+         | osm |
+         | N1  |