diff --git a/docs/model/MX.html b/docs/model/MX.html
index a2bdf71..3c2e0e5 100644
--- a/docs/model/MX.html
+++ b/docs/model/MX.html
@@ -4198,13 +4198,13 @@ Children:
Formatting:
address =
-street-address-alternative-1⏎locality2⏎admin-area2⏎postal-codelocality1,␣admin-area1⏎country-name
+street-address-alternative-1⏎locality2⏎admin-area2⏎postal-code␣locality1,␣admin-area1⏎country-name
Flattened formatting:
address =
-streetbuilding,␣Piso floor,␣unit-typeunit-name
Entre Calles cross-street1␣y␣cross-street2
landmark
locality2
admin-area2
postal-code-prefix-postal-code-suffixlocality1,␣admin-area1
country-name
+streetbuilding,␣Piso floor,␣unit-typeunit-name
Entre Calles cross-street1␣y␣cross-street2
landmark
locality2
admin-area2
postal-code-prefix-postal-code-suffix␣locality1,␣admin-area1
country-name
diff --git a/docs/model/NL.html b/docs/model/NL.html
index ba83054..9533e0b 100644
--- a/docs/model/NL.html
+++ b/docs/model/NL.html
@@ -1691,6 +1691,10 @@ Example addresses
+
+ | admin-area1 | Noord-Holland |
+
+
@@ -1771,6 +1775,7 @@ Example addresses
Output for "address":
Kerkstraat 10-A
1234 AB Amsterdam
+Noord-Holland
Netherlands
@@ -1862,6 +1867,10 @@ Example addresses
+
+ | admin-area1 | Noord-Holland |
+
+
@@ -1942,6 +1951,7 @@ Example addresses
Output for "address":
Kerkstraat 10
1234 AB Amsterdam
+Noord-Holland
Netherlands
@@ -4082,13 +4092,13 @@ Children:
Formatting:
address =
-street-address-alternative-1⏎postal-code␣locality1⏎country-name
+street-address-alternative-1⏎postal-code␣locality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building-unit-typeunit-name
postal-code-prefixpostal-code-suffix␣locality1
country-name
+street␣building-unit-typeunit-name
postal-code-prefixpostal-code-suffix␣locality1
admin-area1
country-name
diff --git a/docs/model/PL.html b/docs/model/PL.html
index a715ac5..fe795e9 100644
--- a/docs/model/PL.html
+++ b/docs/model/PL.html
@@ -1608,6 +1608,10 @@ Example addresses
+
+ | admin-area1 | mazowieckie |
+
+
@@ -1684,6 +1688,7 @@ Example addresses
Output for "address":
ul. Warsaw 9/10
01-001 Warsaw
+mazowieckie
Polska
@@ -1769,6 +1774,10 @@ Example addresses
+
+ | admin-area1 | mazowieckie |
+
+
@@ -1845,6 +1854,7 @@ Example addresses
Output for "address":
ul. Warsaw 9
01-001 Warsaw
+mazowieckie
Polska
@@ -3840,13 +3850,13 @@ Children:
Formatting:
address =
-street-address-alternative-1⏎postal-code␣locality1⏎country-name
+street-address-alternative-1⏎postal-code␣locality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building/unit-typeunit-name
postal-code-prefix-postal-code-suffix␣locality1
country-name
+street␣building/unit-typeunit-name
postal-code-prefix-postal-code-suffix␣locality1
admin-area1
country-name
diff --git a/docs/model/US.html b/docs/model/US.html
index 7e500b2..5794993 100644
--- a/docs/model/US.html
+++ b/docs/model/US.html
@@ -3586,13 +3586,13 @@ Children:
Formatting:
address =
-street-address⏎locality1,␣admin-area1postal-code⏎country-name
+street-address⏎locality1,␣admin-area1␣postal-code⏎country-name
Flattened formatting:
address =
-address-line1
address-line2
address-line3
address-line4
locality1,␣admin-area1postal-code-prefix-postal-code-suffix
country-name
+address-line1
address-line2
address-line3
address-line4
locality1,␣admin-area1␣postal-code-prefix-postal-code-suffix
country-name
diff --git a/docs/model/XX.html b/docs/model/XX.html
index c3de174..4813789 100644
--- a/docs/model/XX.html
+++ b/docs/model/XX.html
@@ -3369,13 +3369,13 @@ Children:
Formatting:
address =
-street-address-alternative-1⏎locality1locality2,␣admin-area1admin-area2postal-code⏎country-name
+street-address-alternative-1⏎locality1␣locality2,␣admin-area1␣admin-area2␣postal-code⏎country-name
Flattened formatting:
address =
-streetbuilding
Apt. unit-name,␣Floor floor
locality1locality2,␣admin-area1admin-area2postal-code-prefix-postal-code-suffix
country-name
+streetbuilding
Apt. unit-name,␣Floor floor
locality1␣locality2,␣admin-area1␣admin-area2␣postal-code-prefix-postal-code-suffix
country-name
diff --git a/model/countries/CA/CA-formatting-rules.yaml b/model/countries/CA/CA-formatting-rules.yaml
index 3ae98d6..a527349 100644
--- a/model/countries/CA/CA-formatting-rules.yaml
+++ b/model/countries/CA/CA-formatting-rules.yaml
@@ -5,11 +5,11 @@ formatting-rules:
- locality1
- separator: ", "
- admin-area1
+ - separator: " "
- postal-code
- separator: "\n"
- country-name
- skip: country # redundant with country-name
- - skip: street-address # redundant with street-address-alternative-1
postal-code:
- postal-code-prefix
diff --git a/model/countries/DE/DE-formatting-rules.yaml b/model/countries/DE/DE-formatting-rules.yaml
index e73ac5e..36fdc09 100644
--- a/model/countries/DE/DE-formatting-rules.yaml
+++ b/model/countries/DE/DE-formatting-rules.yaml
@@ -6,10 +6,11 @@ formatting-rules:
- separator: " "
- locality1
- separator: "\n"
+ - admin-area1
+ - separator: "\n"
- country-name
- skip: country # redundant with country-name
- skip: street-address # redundant with street-address-alternative-1
- - skip: admin-area1
street-address-alternative-1:
- building-location
@@ -42,6 +43,7 @@ examples:
address-overflow: Obergeschoss 2 Wohnung 3
locality1: Enkenbach
postal-code: 67677
+ admin-area1: Rheinland-Pfalz
country: DE
country-name: Deutschland
@@ -52,4 +54,5 @@ examples:
Mozartstr. 9
Obergeschoss 2 Wohnung 3
67677 Enkenbach
+ Rheinland-Pfalz
Deutschland
diff --git a/model/countries/FR/FR-formatting-rules.yaml b/model/countries/FR/FR-formatting-rules.yaml
index 8edeeba..ad486ce 100644
--- a/model/countries/FR/FR-formatting-rules.yaml
+++ b/model/countries/FR/FR-formatting-rules.yaml
@@ -8,10 +8,11 @@ formatting-rules:
- separator: " "
- locality1
- separator: "\n"
+ - admin-area1
+ - separator: "\n"
- country-name
- skip: country # redundant with country-name
- skip: street-address # redundant with street-address-alternative-1
- - skip: admin-area1 # redundant with postal-code
street-address-alternative-1:
- building-location
@@ -57,4 +58,5 @@ examples:
Appartament 36
Quartier du Marais
59491 Villeneuve-d'ascq
+ Nord-Pas-de-Calais
France
\ No newline at end of file
diff --git a/model/countries/MX/MX-formatting-rules.yaml b/model/countries/MX/MX-formatting-rules.yaml
index ae5c278..97da328 100644
--- a/model/countries/MX/MX-formatting-rules.yaml
+++ b/model/countries/MX/MX-formatting-rules.yaml
@@ -2,18 +2,16 @@ formatting-rules:
address:
- street-address-alternative-1
- separator: "\n"
- # {neighborhood}
- locality2
- separator: "\n"
- admin-area2
- separator: "\n"
- # {post-code} {city}, {state}
- postal-code
+ - separator: " "
- locality1
- separator: ", "
- admin-area1
- separator: "\n"
- # {country}
- country-name
- skip: country # redundant with country-name
- skip: street-address # redundant with street-address-alternative-1
diff --git a/model/countries/NL/NL-formatting-rules.yaml b/model/countries/NL/NL-formatting-rules.yaml
index f1e0fbc..4512a44 100644
--- a/model/countries/NL/NL-formatting-rules.yaml
+++ b/model/countries/NL/NL-formatting-rules.yaml
@@ -6,10 +6,11 @@ formatting-rules:
- separator: " "
- locality1
- separator: "\n"
+ - admin-area1
+ - separator: "\n"
- country-name
- skip: country # redundant with country-name
- skip: street-address # redundant with street-address-alternative-1
- - skip: admin-area1 # not commonly used
street-address-alternative-1:
- building-location
@@ -52,6 +53,7 @@ examples:
locality1: Amsterdam
postal-code-prefix: 1234
postal-code-suffix: AB
+ admin-area1: Noord-Holland
country: NL
country-name: Netherlands
output:
@@ -60,6 +62,7 @@ examples:
text: |
Kerkstraat 10-A
1234 AB Amsterdam
+ Noord-Holland
Netherlands
- id: address-without-unit
@@ -72,6 +75,7 @@ examples:
locality1: Amsterdam
postal-code-prefix: 1234
postal-code-suffix: AB
+ admin-area1: Noord-Holland
country: NL
country-name: Netherlands
output:
@@ -80,4 +84,5 @@ examples:
text: |
Kerkstraat 10
1234 AB Amsterdam
+ Noord-Holland
Netherlands
diff --git a/model/countries/PL/PL-formatting-rules.yaml b/model/countries/PL/PL-formatting-rules.yaml
index 8d276c4..86fdc57 100644
--- a/model/countries/PL/PL-formatting-rules.yaml
+++ b/model/countries/PL/PL-formatting-rules.yaml
@@ -6,10 +6,11 @@ formatting-rules:
- separator: " "
- locality1
- separator: "\n"
+ - admin-area1
+ - separator: "\n"
- country-name
- skip: country # redundant with country-name
- skip: street-address # redundant with street-address-alternative-1
- - skip: admin-area1
street-address-alternative-1:
- building-location
@@ -46,6 +47,7 @@ examples:
building-and-unit: 9/10
locality1: Warsaw
postal-code: 01-001
+ admin-area1: mazowieckie
country: PL
country-name: Polska
@@ -55,6 +57,7 @@ examples:
text: |
ul. Warsaw 9/10
01-001 Warsaw
+ mazowieckie
Polska
- id: address-without-apartment
@@ -66,6 +69,7 @@ examples:
building-and-unit: 9
locality1: Warsaw
postal-code: 01-001
+ admin-area1: mazowieckie
country: PL
country-name: Polska
@@ -75,4 +79,5 @@ examples:
text: |
ul. Warsaw 9
01-001 Warsaw
+ mazowieckie
Polska
diff --git a/model/countries/US/US-formatting-rules.yaml b/model/countries/US/US-formatting-rules.yaml
index 828d8bf..93fdb34 100644
--- a/model/countries/US/US-formatting-rules.yaml
+++ b/model/countries/US/US-formatting-rules.yaml
@@ -2,16 +2,14 @@ formatting-rules:
address:
- street-address
- separator: "\n"
- # {city}, {state} {post-code}
- locality1
- separator: ", "
- admin-area1
+ - separator: " "
- postal-code
- separator: "\n"
- # {country}
- country-name
- skip: country # redundant with country-name
- - skip: street-address # redundant with street-address-alternative-1
examples:
- id: name
diff --git a/model/countries/XX/XX-formatting-rules.yaml b/model/countries/XX/XX-formatting-rules.yaml
index 19dffbe..c1ec30e 100644
--- a/model/countries/XX/XX-formatting-rules.yaml
+++ b/model/countries/XX/XX-formatting-rules.yaml
@@ -2,15 +2,16 @@ formatting-rules:
address:
- street-address-alternative-1
- separator: "\n"
- # {city} {dummy-neighborhood}, {state} {dummy-adminarea2} {post-code}
- locality1
+ - separator: " "
- locality2
- separator: ", "
- admin-area1
+ - separator: " "
- admin-area2
+ - separator: " "
- postal-code
- separator: "\n"
- # {country}
- country-name
- skip: country # redundant with country-name
- skip: street-address # redundant with street-address-alternative-1
@@ -23,7 +24,6 @@ formatting-rules:
- separator: "\n"
- in-building-location
- # Apartamento 5A, Piso 10
in-building-location:
- prefix: "Apt. "
- unit-name