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 bda3b9e79edb263e0386c007258c0c3220bb2380..667684c670a0dacb46b1d052f4a4f82547c3ed83 100644 (file)
--- a/settings/country_settings.yaml
+++ b/settings/country_settings.yaml
@@ -4,7 +4,8 @@ ad:
     languages: ca
     names: !include country-names/ad.yaml
     postcode:
     languages: ca
     names: !include country-names/ad.yaml
     postcode:

-      pattern: "ADddd"
+      pattern: "(ddd)"
+      output: AD\1

 
 
 # United Arab Emirates (الإمارات العربية المتحدة)
 
 
 # United Arab Emirates (الإمارات العربية المتحدة)


@@ -38,7 +39,8 @@ ai:
     languages: en
     names: !include country-names/ai.yaml
     postcode:
     languages: en
     names: !include country-names/ai.yaml
     postcode:

-      pattern: "AI-2640"
+      pattern: "2640"
+      output: AI-2640

 
 
 # Albania (Shqipëria)
 
 
 # Albania (Shqipëria)


@@ -963,7 +965,8 @@ ky:
     languages: en
     names: !include country-names/ky.yaml
     postcode:
     languages: en
     names: !include country-names/ky.yaml
     postcode:

-      pattern: "KYd-dddd"
+      pattern: "(d)-(dddd)"
+      output: KY\1-\2

 
 
 # Kazakhstan (Қазақстан)
 
 
 # Kazakhstan (Қазақстан)


@@ -999,7 +1002,7 @@ lc:
     languages: en
     names: !include country-names/lc.yaml
     postcode:
     languages: en
     names: !include country-names/lc.yaml
     postcode:

-      pattern: "LC(dd) ?(ddd)"
+      pattern: "(dd) ?(ddd)"

       output: LC\1 \2
 
 
       output: LC\1 \2
 
 


@@ -1063,7 +1066,8 @@ lv:
     languages: lv
     names: !include country-names/lv.yaml
     postcode:
     languages: lv
     names: !include country-names/lv.yaml
     postcode:

-      pattern: "LV-dddd"
+      pattern: "(dddd)"
+      output: LV-\1

 
 
 # Libya (ليبيا)
 
 
 # Libya (ليبيا)


@@ -1098,7 +1102,8 @@ md:
     languages: ro, ru, uk
     names: !include country-names/md.yaml
     postcode:
     languages: ro, ru, uk
     names: !include country-names/md.yaml
     postcode:

-      pattern: "MD-dddd"
+      pattern: "(dddd)"
+      output: MD-\1

 
 
 # Montenegro (Crna Gora / Црна Гора)
 
 
 # Montenegro (Crna Gora / Црна Гора)


@@ -1840,7 +1845,8 @@ vc:
     languages: en
     names: !include country-names/vc.yaml
     postcode:
     languages: en
     names: !include country-names/vc.yaml
     postcode:

-      pattern: "VCdddd"
+      pattern: "(dddd)"
+      output: VC\1

 
 
 # Venezuela (Venezuela)
 
 
 # Venezuela (Venezuela)


@@ -1858,7 +1864,8 @@ vg:
     languages: en
     names: !include country-names/vg.yaml
     postcode:
     languages: en
     names: !include country-names/vg.yaml
     postcode:

-      pattern: "VGdddd"
+      pattern: "(dddd)"
+      output: VG\1

 
 
 # Vietnam (Việt Nam)
 
 
 # Vietnam (Việt Nam)