address_composer 1.0.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (91) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/main.yml +1 -1
  3. data/.gitmodules +1 -0
  4. data/.rubocop.yml +4 -20
  5. data/Gemfile.lock +57 -32
  6. data/README.md +26 -0
  7. data/address-formatting/.github/workflows/ci.yml +25 -0
  8. data/address-formatting/README.md +21 -12
  9. data/address-formatting/bin/coverage.pl +8 -2
  10. data/address-formatting/bin/run_tests.t +36 -10
  11. data/address-formatting/conf/abbreviations/ca.yaml +18 -1
  12. data/address-formatting/conf/abbreviations/cs.yaml +0 -3
  13. data/address-formatting/conf/abbreviations/da.yaml +1 -1
  14. data/address-formatting/conf/abbreviations/en.yaml +7 -1
  15. data/address-formatting/conf/abbreviations/es.yaml +21 -3
  16. data/address-formatting/conf/abbreviations/et.yaml +0 -3
  17. data/address-formatting/conf/abbreviations/eu.yaml +0 -1
  18. data/address-formatting/conf/abbreviations/fi.yaml +0 -3
  19. data/address-formatting/conf/abbreviations/fr.yaml +1 -1
  20. data/address-formatting/conf/abbreviations/gl.yaml +14 -0
  21. data/address-formatting/conf/abbreviations/it.yaml +1 -1
  22. data/address-formatting/conf/abbreviations/nl.yaml +17 -0
  23. data/address-formatting/conf/abbreviations/no.yaml +0 -4
  24. data/address-formatting/conf/abbreviations/pl.yaml +2 -2
  25. data/address-formatting/conf/abbreviations/pt.yaml +18 -0
  26. data/address-formatting/conf/abbreviations/ro.yaml +8 -2
  27. data/address-formatting/conf/abbreviations/sl.yaml +24 -0
  28. data/address-formatting/conf/abbreviations/{se.yaml → sv.yaml} +1 -5
  29. data/address-formatting/conf/abbreviations/tr.yaml +0 -4
  30. data/address-formatting/conf/abbreviations/{vn.yaml → vi.yaml} +1 -3
  31. data/address-formatting/conf/components.yaml +15 -4
  32. data/address-formatting/conf/countries/worldwide.yaml +403 -272
  33. data/address-formatting/conf/country2lang.yaml +33 -32
  34. data/address-formatting/conf/country_codes.yaml +216 -214
  35. data/address-formatting/conf/county_codes.yaml +19 -9
  36. data/address-formatting/conf/state_codes.yaml +199 -46
  37. data/address-formatting/cpanfile +10 -0
  38. data/address-formatting/testcases/abbreviations/de.yaml +27 -0
  39. data/address-formatting/testcases/abbreviations/en.yaml +15 -0
  40. data/address-formatting/testcases/abbreviations/fr.yaml +12 -0
  41. data/address-formatting/testcases/countries/al.yaml +17 -3
  42. data/address-formatting/testcases/countries/au.yaml +29 -3
  43. data/address-formatting/testcases/countries/be.yaml +17 -2
  44. data/address-formatting/testcases/countries/bg.yaml +1 -1
  45. data/address-formatting/testcases/countries/br.yaml +36 -2
  46. data/address-formatting/testcases/countries/ca.yaml +60 -18
  47. data/address-formatting/testcases/countries/cl.yaml +3 -2
  48. data/address-formatting/testcases/countries/cn.yaml +21 -8
  49. data/address-formatting/testcases/countries/co.yaml +19 -0
  50. data/address-formatting/testcases/countries/cu.yaml +24 -10
  51. data/address-formatting/testcases/countries/de.yaml +70 -13
  52. data/address-formatting/testcases/countries/eg.yaml +6 -6
  53. data/address-formatting/testcases/countries/eh.yaml +2 -2
  54. data/address-formatting/testcases/countries/es.yaml +12 -0
  55. data/address-formatting/testcases/countries/fr.yaml +30 -13
  56. data/address-formatting/testcases/countries/gb.yaml +63 -4
  57. data/address-formatting/testcases/countries/hu.yaml +3 -4
  58. data/address-formatting/testcases/countries/ie.yaml +43 -1
  59. data/address-formatting/testcases/countries/in.yaml +14 -1
  60. data/address-formatting/testcases/countries/ir.yaml +19 -8
  61. data/address-formatting/testcases/countries/it.yaml +30 -2
  62. data/address-formatting/testcases/countries/kg.yaml +1 -1
  63. data/address-formatting/testcases/countries/kr.yaml +13 -5
  64. data/address-formatting/testcases/countries/ml.yaml +9 -9
  65. data/address-formatting/testcases/countries/mu.yaml +17 -1
  66. data/address-formatting/testcases/countries/nz.yaml +11 -0
  67. data/address-formatting/testcases/countries/pa.yaml +17 -0
  68. data/address-formatting/testcases/countries/ph.yaml +64 -3
  69. data/address-formatting/testcases/countries/pt.yaml +17 -0
  70. data/address-formatting/testcases/countries/py.yaml +1 -1
  71. data/address-formatting/testcases/countries/ru.yaml +3 -3
  72. data/address-formatting/testcases/countries/sg.yaml +16 -0
  73. data/address-formatting/testcases/countries/sj.yaml +1 -1
  74. data/address-formatting/testcases/countries/sk.yaml +20 -2
  75. data/address-formatting/testcases/countries/sn.yaml +16 -0
  76. data/address-formatting/testcases/countries/tc.yaml +12 -0
  77. data/address-formatting/testcases/countries/th.yaml +1 -1
  78. data/address-formatting/testcases/countries/tk.yaml +1 -1
  79. data/address-formatting/testcases/countries/tw.yaml +7 -7
  80. data/address-formatting/testcases/countries/tz.yaml +1 -7
  81. data/address-formatting/testcases/countries/us.yaml +33 -17
  82. data/address-formatting/testcases/countries/uy.yaml +1 -1
  83. data/address-formatting/testcases/countries/vn.yaml +2 -1
  84. data/address-formatting/testcases/countries/xc.yaml +14 -0
  85. data/address-formatting/testcases/countries/xk.yaml +20 -0
  86. data/address_composer.gemspec +11 -9
  87. data/lib/address_composer/version.rb +1 -1
  88. data/lib/address_composer.rb +96 -18
  89. metadata +83 -34
  90. data/.travis.yml +0 -7
  91. data/address-formatting/.travis.yml +0 -12
data/address-formatting/testcases/countries/be.yaml CHANGED
@@ -51,5 +51,20 @@ expected: |
51
51
  Kerkveldstraat
52
52
  1760 Strijtem
53
53
  Belgium
54
-
55
-
54
+ ---
55
+ description: 50.62084,4.82240
56
+ components:
57
+ city_district: Perwez
58
+ country: Belgium
59
+ country_code: be
60
+ county: Nivelles
61
+ house_number: 67
62
+ postcode: 1360
63
+ region: Wallonia
64
+ road: Rue Salmon
65
+ state: Walloon Brabant
66
+ village: Perwez
67
+ expected: |
68
+ Rue Salmon 67
69
+ 1360 Perwez
70
+ Belgium
data/address-formatting/testcases/countries/bg.yaml CHANGED
@@ -16,5 +16,5 @@ expected: |
16
16
  Krastyo Sarafov National Academy for Theatre and Film Arts
17
17
  Georgi Sava Rakovski St.
18
18
  Centre
19
- 1000 Sofia
19
+ Sofia 1000
20
20
  Bulgaria
data/address-formatting/testcases/countries/br.yaml CHANGED
@@ -58,5 +58,39 @@ expected: |
58
58
  Rio de Janeiro - RJ
59
59
  22221-000
60
60
  Brazil
61
-
62
-
61
+ ---
62
+ description: village
63
+ components:
64
+ country: Brazil
65
+ country_code: br
66
+ municipality: Região Geográfica Imediata de Picos
67
+ postcode: 64675-000
68
+ region: Northeast Region
69
+ state: Piauí
70
+ state_code: PI
71
+ state_district: Região Geográfica Intermediária de Picos
72
+ village: Alegrete do Piauí
73
+ expected: |
74
+ Alegrete do Piauí
75
+ Região Geográfica Intermediária de Picos - PI
76
+ 64675-000
77
+ Brazil
78
+ ---
79
+ description: Maranhão [+quarter] / -2.493246,-44.267475
80
+ components:
81
+ road: Av. dos Holandeses
82
+ house_number: 9
83
+ quarter: Quadra 33
84
+ suburb: Calhau
85
+ city: São Luís
86
+ state: Maranhão
87
+ state_code: MA
88
+ postcode: 65071-380
89
+ country_code: br
90
+ country: Brazil
91
+ expected: |
92
+ Av. dos Holandeses 9, Quadra 33
93
+ Calhau
94
+ São Luís - MA
95
+ 65071-380
96
+ Brazil
data/address-formatting/testcases/countries/ca.yaml CHANGED
@@ -41,13 +41,30 @@ components:
41
41
  city: London
42
42
  country: Canada
43
43
  country_code: ca
44
- county: Middlesex County
44
+ county: Middlesex County
45
45
  state: Ontario
46
46
  state_code: "ON"
47
47
  expected: |
48
- London, ON
48
+ London, Ontario
49
+ Canada
50
+ ---
51
+ # London treated as county
52
+ description: London treated as county - 42.95608,-81.23792
53
+ components:
54
+ country: Canada
55
+ country_code: ca
56
+ county: London
57
+ house_number: 6
58
+ neighbourhood: Lockwood Park
59
+ postcode: N6C 2W9
60
+ road: Cowan Avenue
61
+ state: Ontario
62
+ state_code: "ON"
63
+ state_district: Southwestern Ontario
64
+ expected: |
65
+ 6 Cowan Avenue
66
+ London, ON N6C 2W9
49
67
  Canada
50
-
51
68
  ---
52
69
  # 43.6666,-79.7482
53
70
  description: no housenumber
@@ -69,28 +86,53 @@ expected: |
69
86
  # 43.6666,-79.7482
70
87
  description: just county
71
88
  components:
72
- country: Canada
73
- country_code: ca
74
- county: Springfield
75
- state: Manitoba
89
+ country: Canada
90
+ country_code: ca
91
+ county: Springfield
92
+ state: Manitoba
76
93
  expected: |
77
- Springfield, MB
94
+ Springfield, Manitoba
78
95
  Canada
79
96
  ---
80
97
  # 43.60242, -79.80113
81
98
  description: locality
82
99
  components:
83
- country: Canada
84
- country_code: ca
85
- county: Halton Region
86
- house_number: 7931
87
- locality: Halton Hills
88
- municipality: Halton Hills
89
- postcode: L5N 8P7
90
- road: Tenth Line
91
- state: Ontario
92
- state_district: Golden Horseshoe
100
+ country: Canada
101
+ country_code: ca
102
+ county: Halton Region
103
+ house_number: 7931
104
+ locality: Halton Hills
105
+ municipality: Halton Hills
106
+ postcode: L5N 8P7
107
+ road: Tenth Line
108
+ state: Ontario
109
+ state_district: Golden Horseshoe
93
110
  expected: |
94
111
  7931 Tenth Line
95
112
  Halton Hills, ON L5N 8P7
96
113
  Canada
114
+ ---
115
+ # postformat_replace applied to abbreviated street type
116
+ description: postformat_replace applied to abbreviated street type
117
+ components:
118
+ country: Canada
119
+ country_code: ca
120
+ house_number: 12345
121
+ locality: St-Hyancinth
122
+ postcode: J2T 3T5
123
+ road: Av Demars
124
+ expected: |
125
+ 12345 Av Demars
126
+ St-Hyancinth, J2T 3T5
127
+ Canada
128
+ ---
129
+ # region
130
+ components:
131
+ country: Canada
132
+ country_code: ca
133
+ region: Greater Edmonton
134
+ state: Alberta
135
+ state_code: AB
136
+ expected: |
137
+ Greater Edmonton, Alberta
138
+ Canada
data/address-formatting/testcases/countries/cl.yaml CHANGED
@@ -9,13 +9,14 @@ components:
9
9
  house_number: 920
10
10
  neighbourhood: Unidad Vecinal Providencia
11
11
  postcode: 7500000
12
+ region: Región Metropolitana de Santiago
12
13
  road: Avenida Ricardo Lyon
13
14
  state: XIII Región Metropolitana de Santiago
14
15
  suburb: Providencia
15
16
  expected: |
16
17
  Avenida Ricardo Lyon 920
17
- 750 0000 Providencia
18
+ 7500000 Providencia
19
+ Región Metropolitana de Santiago
18
20
  Chile
19
21
 
20
22
 
21
-
data/address-formatting/testcases/countries/cn.yaml CHANGED
@@ -7,17 +7,17 @@ components:
7
7
  country_code: cn
8
8
  county: Pudong New District
9
9
  house_number: 99号
10
- neighbourhood: Lijuazul
10
+ neighbourhood: Lijuazui
11
11
  postcode: 200120
12
12
  road: West Lujiazui Road
13
13
  state: Shanghai
14
14
  expected: |
15
- 万向大厦
16
- 99号 West Lujiazui Road
17
- Lijuazul
15
+ 200120 China
16
+ Shanghai
18
17
  Pudong New District
19
- 200120 Shanghai
20
- China
18
+ Lijuazui
19
+ West Lujiazui Road 99号
20
+ 万向大厦
21
21
  ---
22
22
  description: Macau
23
23
  components:
@@ -27,7 +27,20 @@ components:
27
27
  expected: |
28
28
  Macau
29
29
  China
30
-
31
-
30
+ ---
31
+ description:
32
+ components:
33
+ city: Nyingchi
34
+ country: China
35
+ country_code: cn
36
+ district: Bayi District
37
+ postcode: 860000
38
+ region: Nyingchi Prefecture
39
+ state: Tibet
40
+ town: Bayi
41
+ expected: |
42
+ 860000 China
43
+ Tibet
44
+ Nyingchi
32
45
 
33
46
 
data/address-formatting/testcases/countries/co.yaml CHANGED
@@ -16,3 +16,22 @@ expected: |
16
16
  Chapinero
17
17
  110231 Bogota
18
18
  Colombia
19
+ ---
20
+ description: deal with Bogota, Capital District / 4.61164, -74.08527
21
+ components:
22
+ city: Bogota
23
+ country: Colombia
24
+ country_code: co
25
+ neighbourhood: UPZs de Bogotá
26
+ postcode: 111411
27
+ region: RAP (Especial) Central
28
+ road: Transversal 22
29
+ shop: Polytech
30
+ state: Bogota, Capital District
31
+ suburb: Localidad Los Mártires
32
+ expected: |
33
+ Polytech
34
+ Transversal 22
35
+ Los Mártires
36
+ 111411 Bogota
37
+ Colombia
data/address-formatting/testcases/countries/cu.yaml CHANGED
@@ -2,21 +2,35 @@
2
2
  ---
3
3
  description: Embassy in Havana, 23.13763,-82.38976
4
4
  components:
5
- building: Embajada de Hungría
6
- city: Havana
7
- country: Cuba
8
- country_code: cu
9
- county: Plaza de la Revolución
10
- neighbourhood: Barrio El Fanguito
11
- postcode: 10400
12
- road: Calle 19
13
- state: Havana
14
- suburb: El Vedado
5
+ building: Embajada de Hungría
6
+ city: Havana
7
+ country: Cuba
8
+ country_code: cu
9
+ county: Plaza de la Revolución
10
+ neighbourhood: Barrio El Fanguito
11
+ postcode: 10400
12
+ road: Calle 19
13
+ state: Havana
14
+ suburb: El Vedado
15
15
  expected: |
16
16
  Embajada de Hungría
17
17
  Calle 19
18
18
  Havana, 10400
19
19
  Cuba
20
+ ---
21
+ description: address in Havana / no city, 23.13895,-82.36652
22
+ components:
23
+ country: Cuba
24
+ country_code: cu
25
+ county: Centro Habana
26
+ house_number: 209
27
+ neighbourhood: Colón
28
+ road: Perseverancia
29
+ state: Havana
30
+ expected: |
31
+ Perseverancia 209
32
+ Havana
33
+ Cuba
20
34
 
21
35
 
22
36
 
data/address-formatting/testcases/countries/de.yaml CHANGED
@@ -8,7 +8,6 @@ components:
8
8
  expected: |
9
9
  Berlin
10
10
  Germany
11
-
12
11
  ---
13
12
  description: Moabit!
14
13
  components:
@@ -22,7 +21,6 @@ expected: |
22
21
  Moabit
23
22
  Berlin
24
23
  Germany
25
-
26
24
  ---
27
25
  description: Alt-berlin
28
26
  components:
@@ -40,9 +38,25 @@ expected: |
40
38
  Gontardstraße 7
41
39
  10178 Berlin
42
40
  Germany
43
-
44
41
  ---
45
- description: Köln, NRW
42
+ description: housenumber not house_number
43
+ components:
44
+ city: Alt-Berlin
45
+ city_district: Mitte
46
+ country: Germany
47
+ country_code: de
48
+ housenumber: 7
49
+ neighbourhood: Scheunenviertel
50
+ pedestrian: Gontardstraße
51
+ postcode: 10178
52
+ state: Berlin
53
+ suburb: Mitte
54
+ expected: |
55
+ Gontardstraße 7
56
+ 10178 Berlin
57
+ Germany
58
+ ---
59
+ description: Köln, NRW
46
60
  components:
47
61
  country: Germany
48
62
  country_code: de
@@ -53,7 +67,6 @@ expected: |
53
67
  Cologne
54
68
  North Rhine-Westphalia
55
69
  Germany
56
-
57
70
  ---
58
71
  description: Köln, hamlet
59
72
  components:
@@ -67,7 +80,6 @@ expected: |
67
80
  Köln
68
81
  Bavaria
69
82
  Germany
70
-
71
83
  ---
72
84
  description: Bonn formatting
73
85
  components:
@@ -77,7 +89,6 @@ components:
77
89
  expected: |
78
90
  Bonn
79
91
  Germany
80
-
81
92
  ---
82
93
  description: Fabisch
83
94
  components:
@@ -97,7 +108,6 @@ expected: |
97
108
  Rosenthaler Straße 1
98
109
  10119 Berlin
99
110
  Germany
100
-
101
111
  ---
102
112
  description: Fabisch no city
103
113
  components:
@@ -116,7 +126,6 @@ expected: |
116
126
  Rosenthaler Straße 1
117
127
  10119 Berlin
118
128
  Germany
119
-
120
129
  ---
121
130
  description: Heyerode
122
131
  components:
@@ -124,14 +133,13 @@ components:
124
133
  continent: Europa
125
134
  country: Germany
126
135
  country_code: de
127
- county: Südeichsfeld
136
+ county: Unstrut-Hainich-Kreis
128
137
  postcode: 99988
129
138
  state: Thüringen
130
139
  village: Heyerode
131
140
  expected: |
132
141
  99988 Heyerode
133
142
  Germany
134
-
135
143
  ---
136
144
  description: Berlin state
137
145
  components:
@@ -141,7 +149,6 @@ components:
141
149
  expected: |
142
150
  Berlin
143
151
  Germany
144
-
145
152
  ---
146
153
  description: no middle comma
147
154
  components:
@@ -240,7 +247,7 @@ components:
240
247
  country: Germany
241
248
  country_code: de
242
249
  house_number: 29A
243
- local_administrative_area: Pankow
250
+ local_administrative_area: Pankow
244
251
  neighbourhood: Kollwitzkiez
245
252
  postcode: 10405
246
253
  road: Jablonskistraße
@@ -251,3 +258,53 @@ expected: |
251
258
  Jablonskistraße 29A
252
259
  10405 Berlin
253
260
  Germany
261
+ ---
262
+ #
263
+ description: house in hamlet with no road 48.474124, 10.017457
264
+ components:
265
+ city: Langenau
266
+ country: Deutschland
267
+ country_code: de
268
+ county: Alb-Donau-Kreis
269
+ hamlet: Witthau
270
+ house_number: 3
271
+ municipality: GVV Langenau
272
+ postcode: 89129
273
+ state: Baden-Württemberg
274
+ state_code: BW
275
+ town: Langenau
276
+ expected: |
277
+ Witthau 3
278
+ 89129 Langenau
279
+ Deutschland
280
+ ---
281
+ #
282
+ description: village and town
283
+ components:
284
+ country: Germany
285
+ country_code: de
286
+ county: Sächsische Schweiz-Osterzgebirge
287
+ postcode: "01744"
288
+ state: Saxony
289
+ state_code: SN
290
+ town: Dippoldiswalde
291
+ village: Oberhäslich
292
+ expected: |
293
+ 01744 Oberhäslich
294
+ Germany
295
+ ---
296
+ #
297
+ description: village and town (fallback)
298
+ components:
299
+ country: Germany
300
+ country_code: de
301
+ county: Landkreis Schwäbisch Hall
302
+ municipality: Verwaltungsgemeinschaft Schwäbisch Hall
303
+ state: Baden-Württemberg
304
+ state_code: BW
305
+ town: Schwäbisch Hall
306
+ village: Tüngental
307
+ expected: |
308
+ Tüngental
309
+ Baden-Württemberg
310
+ Germany
data/address-formatting/testcases/countries/eg.yaml CHANGED
@@ -70,13 +70,13 @@ expected: |
70
70
  ---
71
71
  description: Same univerisity, language=ar, 30.79623,2C30.99934
72
72
  components:
73
- city: ‏طنطا
74
- college: جامعة طنطا
75
- country: مصر
76
- country_code: eg
73
+ city: ‏طنطا
74
+ college: جامعة طنطا
75
+ country: مصر
76
+ country_code: eg
77
77
  postcode: 31111
78
- road: شارع محب
79
- state: ‏محافظة الغربي
78
+ road: شارع محب
79
+ state: ‏محافظة الغربي
80
80
  suburb: محلة مرحوم
81
81
  expected: |
82
82
  جامعة طنطا
data/address-formatting/testcases/countries/eh.yaml CHANGED
@@ -1,7 +1,7 @@
1
- # Western Sahara
1
+ # Western Sahara
2
2
  # note - unclear legal status, claimed as part of Morocco
3
3
  # see: https://en.wikipedia.org/wiki/Western_Sahara
4
- #
4
+ #
5
5
  ---
6
6
  description: Hotel in Laayoune, 27.15658,-13.20123
7
7
  components:
data/address-formatting/testcases/countries/es.yaml CHANGED
@@ -41,4 +41,16 @@ expected: |
41
41
  San Sebastián
42
42
  Basque Country
43
43
  Spain
44
+ ---
45
+ description: Costa del Sol Occidental
46
+ components:
47
+ country: Spanien
48
+ country_code: es
49
+ county: Costa del Sol Occidental
50
+ state: Andalusien
51
+ expected: |
52
+ Costa del Sol Occidental
53
+ Andalusien
54
+ Spanien
55
+
44
56
 
data/address-formatting/testcases/countries/fr.yaml CHANGED
@@ -159,7 +159,7 @@ components:
159
159
  road_reference_intl : E 15
160
160
  state : Ile-de-France
161
161
  village : Arbonne-la-Forêt
162
- expected: |
162
+ expected: |
163
163
  Autoroute du Soleil
164
164
  77630 Arbonne-la-Forêt
165
165
  France
@@ -169,15 +169,15 @@ expected: |
169
169
  ---
170
170
  description: road_reference, 48.406168,2.55452
171
171
  components:
172
- country : France
173
- country_code : fr
174
- county : Fontainebleau
175
- postcode : 77630
176
- road_reference : A 6
177
- road_reference_intl : E 15
178
- state : Ile-de-France
179
- village : Arbonne-la-Forêt
180
- expected: |
172
+ country : France
173
+ country_code : fr
174
+ county : Fontainebleau
175
+ postcode : 77630
176
+ road_reference : A 6
177
+ road_reference_intl : E 15
178
+ state : Ile-de-France
179
+ village : Arbonne-la-Forêt
180
+ expected: |
181
181
  A 6
182
182
  77630 Arbonne-la-Forêt
183
183
  France
@@ -194,7 +194,7 @@ components:
194
194
  road_reference_intl : E 15
195
195
  state : Ile-de-France
196
196
  village : Arbonne-la-Forêt
197
- expected: |
197
+ expected: |
198
198
  E 15
199
199
  77630 Arbonne-la-Forêt
200
200
  France
@@ -214,7 +214,7 @@ components:
214
214
  state: Provence-Alpes-Côte dAzur
215
215
  suburb: Valescure
216
216
  town: Saint-Raphaël
217
- expected: |
217
+ expected: |
218
218
  A1X4E0
219
219
  Avenue du XVe Corps
220
220
  83700 Saint-Raphaël
@@ -254,7 +254,7 @@ components:
254
254
  state: Auvergne-Rhône-Alpes
255
255
  state_code: ARA
256
256
  village: Champ-sur-Drac
257
- expected: |
257
+ expected: |
258
258
  83 Avenue Jean Navarre
259
259
  38560 Champ-sur-Drac
260
260
  France
@@ -279,3 +279,20 @@ expected: |
279
279
  20 Rue Antoine de Roche
280
280
  25500 Morteau
281
281
  France
282
+ ---
283
+ description: 48.80868,7.78761
284
+ components:
285
+ country: France
286
+ country_code: fr
287
+ county: Bas-Rhin
288
+ municipality: Haguenau-Wissembourg
289
+ postcode: 67500
290
+ region: Metropolitan France
291
+ road: Rue des Voituriers
292
+ state: Grand Est
293
+ state_code: GES
294
+ town: Haguenau
295
+ expected: |
296
+ Rue des Voituriers
297
+ 67500 Haguenau
298
+ France
data/address-formatting/testcases/countries/gb.yaml CHANGED
@@ -18,7 +18,6 @@ expected: |
18
18
  London
19
19
  EC1M 5RF
20
20
  United Kingdom
21
-
22
21
  ---
23
22
  description: Lokku office
24
23
  components:
@@ -33,7 +32,6 @@ expected: |
33
32
  City of London
34
33
  London
35
34
  United Kingdom
36
-
37
35
  ---
38
36
  description: London
39
37
  components:
@@ -210,7 +208,7 @@ expected: |
210
208
  WF5 8PG
211
209
  United Kingdom
212
210
  ---
213
- description: Farmland
211
+ description: Farmland
214
212
  components:
215
213
  country: United Kingdom
216
214
  country_code: gb
@@ -225,5 +223,66 @@ expected: |
225
223
  York
226
224
  England
227
225
  United Kingdom
228
-
226
+ ---
227
+ description: suburb before city_district
228
+ components:
229
+ city: London
230
+ city_district: London Borough of Hackney
231
+ country: United Kingdom
232
+ country_code: gb
233
+ state: England
234
+ state_code: ENG
235
+ state_district: Greater London
236
+ suburb: Hoxton
237
+ expected: |
238
+ Hoxton
239
+ London
240
+ United Kingdom
241
+ ---
242
+ description: village and city
243
+ components:
244
+ city: Stratford-on-Avon
245
+ country: United Kingdom
246
+ country_code: gb
247
+ county: Warwickshire
248
+ state: England
249
+ village: Welford on Avon CP
250
+ expected: |
251
+ Welford on Avon
252
+ Stratford-on-Avon
253
+ Warwickshire
254
+ England
255
+ United Kingdom
256
+ ---
257
+ description: town and city
258
+ components:
259
+ city: East Hertfordshire
260
+ country: United Kingdom
261
+ country_code: gb
262
+ county: Hertfordshire
263
+ county_code: HRT
264
+ state: England
265
+ state_code: ENG
266
+ town: Bishop's Stortford
267
+ expected: |
268
+ Bishop's Stortford
269
+ Hertfordshire
270
+ England
271
+ United Kingdom
272
+ ---
273
+ description: place name with & in name
274
+ components:
275
+ city: London
276
+ country: United Kingdom
277
+ country_code: gb
278
+ house: St. Judes & St. Pauls C of E (Va) Primary School
279
+ house_number: 10
280
+ postcode: N1 4AZ
281
+ road: Kingsbury Road
282
+ expected: |
283
+ St. Judes & St. Pauls C of E (Va) Primary School
284
+ 10 Kingsbury Road
285
+ London
286
+ N1 4AZ
287
+ United Kingdom
229
288