Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / country_settings.yaml

diff --git a/settings/country_settings.yaml b/settings/country_settings.yaml
index 67905ea2a3a9880b03ad87aa7f97a23422239c23..b0bacdfcc5d4dc60c944d4a14cfaf9e455a897d8 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)
@@ -1999,7 +1998,7 @@ ua:
     languages: uk
     names: !include country-names/ua.yaml
     postcode:
-      pattern: "ddddd"
+      pattern: "d?ddddd"
 
 
 # Uganda (Uganda)
@@ -2025,7 +2024,7 @@ us:
     languages: en
     names: !include country-names/us.yaml
     postcode:
-      pattern: "(ddddd)(?:-dddd)?"
+      pattern: "ddddd"
 
 
 # Uruguay (Uruguay)