Merge pull request #2685 from lonvia/show-inherited-housenumber

[nominatim.git] / settings / icu_tokenizer.yaml

diff --git a/settings/icu_tokenizer.yaml b/settings/icu_tokenizer.yaml
index 7f53c5a7a19e71b171c8bce33a1d62f8862f5f72..cd9c0d6dd56974888c9e12fdf834b51a5b55b22e 100644 (file)
--- a/settings/icu_tokenizer.yaml
+++ b/settings/icu_tokenizer.yaml
@@ -8,8 +8,8 @@ normalization:
     - "ª > a"
     - "º > o"
     - "[[:Punctuation:][:Symbol:]\u02bc]  > ' '"
-    - "ß > 'ss'" # German szet is unimbigiously equal to double ss
-    - "[^[:Letter:] [:Number:] [:Space:]] >"
+    - "ß > 'ss'" # German szet is unambiguously equal to double ss
+    - "[^[:alnum:] [:Canonical_Combining_Class=Virama:] [:Space:]] >"
     - "[:Lm:] >"
     - ":: [[:Number:]] Latin ()"
     - ":: [[:Number:]] Ascii ();"
@@ -30,7 +30,7 @@ sanitizers:
         - housenumber
         - conscriptionnumber
         - streetnumber
-      is-a-name:
+      convert-to-name:
         - (\A|.*,)[^\d,]{3,}(,.*|\Z)
     - step: split-name-list
     - step: strip-brace-terms
@@ -41,6 +41,8 @@ sanitizers:
       mode: append
 token-analysis:
     - analyzer: generic
+    - id: "@housenumber"
+      analyzer: housenumbers
     - id: bg
       analyzer: generic
       mode: variant-only