X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/929a13d4cdc8d2fcfd30ae6bdbc64a381859893d..9b8ef97d4b8b9a9b3efd1c05896e946896761569:/settings/icu_tokenizer.yaml?ds=sidebyside

diff --git a/settings/icu_tokenizer.yaml b/settings/icu_tokenizer.yaml
index 1fa467be..a6545bdd 100644
--- a/settings/icu_tokenizer.yaml
+++ b/settings/icu_tokenizer.yaml
@@ -1,3 +1,6 @@
+query-preprocessing:
+    - step: split_japanese_phrases
+    - step: normalize
 normalization:
     - ":: lower ()"
     - ":: Hans-Hant"
@@ -7,16 +10,17 @@ normalization:
     - "'nº' > 'no'"
     - "ª > a"
     - "º > o"
-    - "[[:Punctuation:][:Symbol:]\u02bc]  > ' '"
+    - "[[:Punctuation:][:Symbol:][\u02bc] - [-:]]+  > '-'"
     - "ß > 'ss'" # German szet is unambiguously equal to double ss
-    - "[^[:alnum:] [:Canonical_Combining_Class=Virama:] [:Space:]] >"
+    - "[^[:alnum:] [:Canonical_Combining_Class=Virama:] [:Space:] [-:]] >"
     - "[:Lm:] >"
     - ":: [[:Number:]] Latin ()"
     - ":: [[:Number:]] Ascii ();"
     - ":: [[:Number:]] NFD ();"
     - "[[:Nonspacing Mark:] [:Cf:]] >;"
-    - "[:Space:]+ > ' '"
+    - "[-:]?[:Space:]+[-:]? > ' '"
 transliteration:
+    - "[-:]  > ' '"
     - ":: Latin ()"
     - !include icu-rules/extended-unicode-to-asccii.yaml
     - ":: Ascii ()"
@@ -45,6 +49,7 @@ sanitizers:
       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]
       use-defaults: all
       mode: append
+    - step: tag-japanese
 token-analysis:
     - analyzer: generic
     - id: "@housenumber"
@@ -178,6 +183,9 @@ token-analysis:
       mode: variant-only
       variants:
           - !include icu-rules/variants-ru.yaml
+      mutations:
+          - pattern: ё
+            replacements: ["ё", "е"]
     - id: sk
       analyzer: generic
       mode: variant-only