fix postcode pattern for Mozambique

Optional groups are not implemented yet.

diff --git a/nominatim/tokenizer/sanitizers/clean_postcodes.py b/nominatim/tokenizer/sanitizers/clean_postcodes.py
index fbc46fa582215460f7f7e62f6fe63087b3019ab9..43d297695f1d2e7fc0be8087284aa9987ad5ee65 100644 (file)
--- a/nominatim/tokenizer/sanitizers/clean_postcodes.py
+++ b/nominatim/tokenizer/sanitizers/clean_postcodes.py
@@ -57,7 +57,8 @@ class _PostcodeSanitizer:
         if match is None:
             return None
 
-        return self.matcher.normalize(country, match), ' '.join(match.groups())
+        return self.matcher.normalize(country, match),\
+               ' '.join(filter(lambda p: p is not None, match.groups()))
 
 
 

diff --git a/settings/country_settings.yaml b/settings/country_settings.yaml
index 67905ea2a3a9880b03ad87aa7f97a23422239c23..14d08de3a30098faf19946c811290e9c5ce92499 100644 (file)
--- a/settings/country_settings.yaml
+++ b/settings/country_settings.yaml
@@ -1386,8 +1386,7 @@ mz:
     languages: pt
     names: !include country-names/mz.yaml
     postcode:
-      pattern: "(dddd)-?(dd)?"
-      output: \1-\2
+      pattern: "(dddd)(?:-dd)?"
 
 
 # Namibia (Namibia)