address_composer 0.1.4.pre → 0.1.7.pre

data/address-formatting/testcases/countries/be.yaml

@@ -18,3 +18,38 @@ expected:  |
     Vrijheidstraat 63
     2000 Antwerp
     Belgium
+---
+description: prefer municipality over hamlet, 50.5689247, 5.3918483
+components:
+        country: België
+        country_code: be
+        county: Huy
+        hamlet: Clermont-sous-Huy
+        house_number: 187
+        municipality: Engis
+        postcode: 4480
+        region: Wallonia
+        road: Chaussée de Liège
+        state: Liège
+expected:  |
+    Chaussée de Liège 187
+    4480 Engis
+    België
+---
+description: prefer village over municipality 50.84201, 4.11871
+components:
+    country: Belgium
+    country_code: be
+    county: Halle-Vilvoorde
+    municipality: Roosdaal
+    postcode: 1760
+    region: Flanders
+    road: Kerkveldstraat
+    state: Flemish Brabant
+    village: Strijtem
+expected:  |
+    Kerkveldstraat
+    1760 Strijtem
+    Belgium
+
+

data/address-formatting/testcases/countries/bf.yaml

@@ -17,6 +17,20 @@ expected:  |
     Avenue Nelson Mandela
     Ouagadougou
     Burkina Faso
-
+---
+description: village, Bank in Ouagadougou, 10.5450,-4.5787
+components:
+    country: Burkina Faso
+    country_code: bf
+    department: Tiéfora
+    province: Comoé
+    road: unnamed road
+    village: Bondorola
+expected:  |
+    unnamed road
+    Bondorola
+    Tiéfora
+    Comoé
+    Burkina Faso
 
 

data/address-formatting/testcases/countries/ca.yaml

@@ -65,8 +65,32 @@ expected:  |
     McMurchy Avenue South
     Brampton, ON L6Y 1Z4
     Canada
-
-
-
-
-
+---
+# 43.6666,-79.7482
+description: just county
+components:
+     country: Canada
+     country_code: ca
+     county: Springfield
+     state: Manitoba
+expected:  |
+    Springfield, MB
+    Canada
+---
+# 43.60242, -79.80113
+description: locality
+components:
+     country: Canada
+     country_code: ca
+     county: Halton Region
+     house_number: 7931
+     locality: Halton Hills
+     municipality: Halton Hills
+     postcode: L5N 8P7
+     road: Tenth Line
+     state: Ontario
+     state_district: Golden Horseshoe     
+expected:  |
+    7931 Tenth Line
+    Halton Hills, ON L5N 8P7
+    Canada

data/address-formatting/testcases/countries/cn.yaml

@@ -18,6 +18,15 @@ expected:  |
     Pudong New District
     200120 Shanghai
     China
+---
+description: Macau
+components:
+    country: China
+    country_code: cn
+    region: Macau
+expected:  |
+    Macau
+    China
 
 
 

data/address-formatting/testcases/countries/de.yaml

@@ -182,7 +182,7 @@ components:
         country: Germany
         country_code: de
         county: Aschaffenburg
-        postcode: 63739,63741,63743
+        postcode: '63739,63741,63743'
         road: Haselmühlweg
         state: Free State of Bavaria
         state_district: Lower Franconia

data/address-formatting/testcases/countries/fr.yaml

@@ -198,4 +198,84 @@ expected:  |
     E 15
     77630 Arbonne-la-Forêt
     France
-
+#
+# town and municpality
+#
+---
+description: 43.42981,6.77514
+components:
+    amenity: A1X4E0
+    country: France
+    country_code: fr
+    county: Var
+    municipality: Draguignan
+    postcode: 83700
+    road: Avenue du XVe Corps
+    state: Provence-Alpes-Côte dAzur
+    suburb: Valescure
+    town: Saint-Raphaël
+expected:  | 
+    A1X4E0
+    Avenue du XVe Corps
+    83700 Saint-Raphaël
+    France
+#
+# Paris, remove Arrondissement
+#
+---
+description: 48.8564, 2.2961
+components:
+    city: Paris 7e Arrondissement
+    country: France
+    country_code: fr
+    house_number: 15
+    postcode: 75007
+    state: Île-de-France
+    state_district: Paris
+    street: Avenue Charles Floquet
+expected:  |
+    15 Avenue Charles Floquet
+    75007 Paris
+    France
+#
+# village and municpality
+#
+---
+description: 45.08523,5.73302
+components:
+    country: France
+    country_code: fr
+    county: Isère
+    house_number: 83
+    municipality: Grenoble
+    neighbourhood: Lotissement des cartonneries
+    postcode: 38560
+    road: Avenue Jean Navarre
+    state: Auvergne-Rhône-Alpes
+    state_code: ARA
+    village: Champ-sur-Drac
+expected:  | 
+    83 Avenue Jean Navarre
+    38560 Champ-sur-Drac
+    France
+#
+# hamlet and town
+#
+---
+description: 7.06073496297967,6.60534772183623
+components:
+    country: France
+    country_code: fr
+    county: Doubs
+    hamlet: Les Communaux
+    house_number: 20
+    municipality: Pontarlier
+    postcode: 25500
+    road: Rue Antoine de Roche
+    state: Bourgogne-Franche-Comté
+    state_code: BFC
+    town: Morteau
+expected:  |
+    20 Rue Antoine de Roche
+    25500 Morteau
+    France

data/address-formatting/testcases/countries/gb.yaml

@@ -1,10 +1,10 @@
 ---
 description: Lokku office
 components:
-    city: London Borough of Islington
+    city: London
+    city_district: London Borough of Islington
     country: United Kingdom
     country_code: GB
-    county: London
     house: Lokku Ltd
     house_number: 82
     postcode: EC1M 5RF
@@ -15,7 +15,8 @@ components:
 expected:  |
     Lokku Ltd
     82 Clerkenwell Road
-    London EC1M 5RF
+    London
+    EC1M 5RF
     United Kingdom
     
 ---
@@ -29,6 +30,7 @@ components:
     suburb: Barbican
 expected:  |
     Barbican
+    City of London
     London
     United Kingdom
     
@@ -62,7 +64,8 @@ expected:  |
 ---
 description: just a suburb
 components:
-    city: London Borough of Islington
+    city: London
+    city_district: London Borough of Islington
     country: United Kingdom
     country_code: gb
     county: London
@@ -91,7 +94,8 @@ components:
 expected:  |
     University of Westminster
     115 New Cavendish Street
-    London W1T 5DU
+    London
+    W1T 5DU
     United Kingdom
 ---
 description: village in Cambridgeshire, 52.281523,-0.115179
@@ -106,7 +110,28 @@ components:
     town: Huntingdonshire
     village: Hilton
 expected:  |
-    Hilton PE28 9QA
+    Hilton
+    PE28 9QA
+    United Kingdom
+---
+description: Willoughby House, Barbican
+components:
+    building: Willoughby House
+    city: London
+    country: United Kingdom
+    country_code: gb
+    county: City of London
+    postcode: EC2Y 9DP
+    quarter: Barbican
+    road: Moor Lane
+    state: England
+    state_district: Greater London
+expected:  |
+    Willoughby House
+    Moor Lane
+    Barbican
+    London
+    EC2Y 9DP
     United Kingdom
 ---
 description: City of Nottingham
@@ -123,7 +148,8 @@ components:
     suburb: St Ann's
 expected:  |
     121 Abbotsford Drive
-    Nottingham NG3 1NB
+    Nottingham
+    NG3 1NB
     United Kingdom
 ---
 description: London Borough of Waltham Forest
@@ -141,7 +167,8 @@ components:
     suburb: Leyton
 expected:  |
     64 Melbourne Road
-    London E10
+    London
+    E10
     United Kingdom
 ---
 description: London Borough of Waltham Forest - partial_postcode
@@ -159,5 +186,44 @@ components:
     suburb: Leyton
 expected:  |
     64 Melbourne Road
-    London E10
+    London
+    E10
     United Kingdom
+---
+description: Prefer town over city (Ossett vs Wakefield)
+components:
+    building: Orchard House
+    city: Wakefield
+    country: United Kingdom
+    country_code: gb
+    county: West Yorkshire
+    postcode: WF5 8PG
+    road: West Wells Road
+    state: England
+    state_code: ENG
+    state_district: Yorkshire and the Humber
+    town: Ossett
+expected:  |
+    Orchard House
+    West Wells Road
+    Ossett
+    WF5 8PG
+    United Kingdom
+---
+description: Farmland 
+components:
+    country: United Kingdom
+    country_code: gb
+    county: York
+    farmland: Fair Field
+    hamlet: Kexby
+    state: England
+    state_district: Yorkshire and the Humber
+expected:  |
+    Fair Field
+    Kexby
+    York
+    England
+    United Kingdom
+
+

data/address-formatting/testcases/countries/gg.yaml

@@ -12,7 +12,8 @@ components:
 expected:  |
     Post Office
     Le Marchant Street
-    Saint Peter Port GY1
+    Saint Peter Port
+    GY1
     Guernsey, Channel Islands
 
 

data/address-formatting/testcases/countries/hk.yaml

@@ -2,19 +2,29 @@
 ---
 description: Cinema in HK, 22.29987,114.17933
 components:
-            cinema: Chinachem Golden Plaza Cinema
-            country: Hong Kong
-            country_code: hk
-            county: Yau Tsim Mong District
-            road: Science Museum Road
-            state: Hong Kong
-            state_district: Kowloon
-            suburb: Tsim Sha Tsui
+  cinema: Chinachem Golden Plaza Cinema
+  country: Hong Kong
+  country_code: hk
+  county: Yau Tsim Mong District
+  road: Science Museum Road
+  state: Hong Kong
+  state_district: Kowloon
+  suburb: Tsim Sha Tsui
 expected:  |
     Chinachem Golden Plaza Cinema
     Science Museum Road
     Kowloon
     Hong Kong
+---
+description: just city, no state
+components:
+    city: Hong Kong
+    country: Hong Kong
+    country_code: hk
+    road: 211 Test Street
+expected:  |
+    211 Test Street
+    Hong Kong
 
 
 

data/address-formatting/testcases/countries/ie.yaml

@@ -28,7 +28,6 @@ components:
 expected:  |
     Kilkenny
     Ireland
-
 ---
 # Friar's Hill - 52.54593995, -6.95706874120767
 description: Friar's Hill, Graiguenamanagh
@@ -44,7 +43,28 @@ expected:  |
     Graiguenamanagh
     County Kilkenny
     Ireland
-
+---
+# 53.3388,-6.2691
+description: condense "Dublin, County Dublin"
+components:
+    city: Dublin
+    city_district: Wood Quay A ED
+    continent: Europe
+    country: Ireland
+    country_code: ie
+    county: County Dublin
+    county_code: D
+    library: The National Archives
+    postcode: D02 TD99
+    road: Bishop Street
+    state: Leinster
+    state_code: L
+expected:  |
+    The National Archives
+    Bishop Street
+    Wood Quay A ED
+    Dublin
+    Ireland
 ---
 # 52.6726,-8.6407
 description: remove "The Metropolitan District of"
@@ -63,5 +83,27 @@ expected:  |
     Shelbourne Road
     Farranshone
     Limerick
-    County Limerick
     Ireland
+---
+# 53.49137,-10.02117
+description: no "Electoral Division"
+components:
+    city_district: Clifden Electoral Division
+    continent: Europe
+    country: Ireland
+    country_code: ie
+    county: County Galway
+    county_code: G
+    guest_house: Connemara Country Lodge
+    region: Conamara Municipal District
+    road: N59
+    state: Connacht
+    state_code: C
+    town: Clifden
+expected:  |
+    Connemara Country Lodge
+    N59
+    Clifden
+    County Galway
+    Ireland
+    

data/address-formatting/testcases/countries/im.yaml

@@ -13,7 +13,8 @@ components:
 expected:  |
     3FM
     45 Victoria Street
-    Douglas IM1 2AY
+    Douglas
+    IM1 2AY
     Isle of Man
 
 

data/address-formatting/testcases/countries/je.yaml

@@ -11,5 +11,6 @@ components:
         town: Saint Helier
 expected:  |
     5 Le Geyt Street
-    Saint Helier JE2 4TN
+    Saint Helier
+    JE2 4TN
     Jersey, Channel Islands

data/address-formatting/testcases/countries/no.yaml

@@ -16,3 +16,20 @@ expected:  |
     Åkebergveien 28
     0650 Oslo
     Norway
+---
+description: house in village with postal_city
+components:
+    country: Norge
+    country_code: "no"
+    county: Viken
+    house_number: 33
+    neighbourhood: Belset
+    postal_city: Rykkinn
+    postcode: 1349
+    road: Grindstuveien
+    suburb: Angerst
+    village: Ringvoll
+expected:  |
+    Grindstuveien 33
+    1349 Rykkinn
+    Norge

data/address-formatting/testcases/countries/pt.yaml

@@ -14,3 +14,25 @@ expected:  |
     Avenida Conselheiro Barjona de Freitas 11
     1500-203 Lisbon
     Portugal
+---
+# Guest house in the Azores
+description: 37.74851,-25.60450
+components:
+    archipelago: Azores
+    city: Ponta Delgada
+    city_district: Rosto do Cão (Livramento)
+    country: Portugal
+    country_code: pt
+    guest_house: Casa Do Populo
+    house_number: 1015
+    neighbourhood: Livramento
+    postcode: 9500-614
+    road: Rua Padre Domingos da Silva Costay
+    state_district: São Miguel
+expected:  |
+    Casa Do Populo
+    Rua Padre Domingos da Silva Costay 1015
+    9500-614 Ponta Delgada
+    Azores
+    Portugal
+

data/address-formatting/testcases/countries/sh.yaml

@@ -26,7 +26,8 @@ components:
         state: Tristan da Cunha
 expected:  |
     Prince Philip Hall
-    Edinburgh of the Seven Seas TDCU 1ZZ
+    Edinburgh of the Seven Seas
+    TDCU 1ZZ
     Tristan da Cunha
     United Kingdom
 

data/address-formatting/testcases/countries/ug.yaml

@@ -18,6 +18,19 @@ expected:  |
     6/6A Kampala Road
     Kampala
     Uganda
+---
+description: subcounty
+components:
+    country: Uganda
+    country_code: ug
+    state: Arua
+    subcounty: Ayivuni
+expected:  |
+    Ayivuni
+    Arua
+    Uganda
+
+
 
 
 

data/address-formatting/testcases/countries/um.yaml

@@ -6,7 +6,7 @@ components:
         country_code: um
         island: Wake Island
 expected:  |
-    Wake Island, UM
+    Wake Island, US Minor Outlying Islands
     United States of America
 
 

data/address-formatting/testcases/countries/us.yaml

@@ -75,7 +75,7 @@ components:
     county: Santa Clara County
     state: California
 expected:  |
-    Palo Alto, CA
+    Palo Alto, California
     United States of America
 ---
 description: NY, NY
@@ -85,7 +85,7 @@ components:
     country_code: US
     state: New York
 expected:  |
-    New York, NY
+    New York, New York
     United States of America
 ---    
 description: house number in New York, no city
@@ -183,3 +183,39 @@ expected:  |
     Dronningens Gade
     Charlotte Amalie, VI 00803
     United States of America
+#
+# state_district
+---
+description: state_district
+components:
+        country: United States of America
+        country_code: us
+        state: New York
+        state_district: New York
+expected:  |
+    New York, New York
+    United States of America
+---
+description: just state
+components:
+        country: United States of America
+        country_code: us
+        state: New York
+expected:  |
+    New York
+    United States of America
+#
+# municipality
+---
+description: municipality
+components:
+    country: United States of America
+    country_code: us
+    county: Saginaw County
+    municipality: Taymouth Township
+    state: Michigan
+    village: Burt
+expected:  |
+    Burt
+    Taymouth Township, Michigan
+    United States of America

data/address-formatting/testcases/other/xx.yaml

@@ -0,0 +1,28 @@
+# Dummy test country to check that we fall back to the defaults
+---
+description: generic format
+components:
+    city: City
+    country: Null Island
+    country_code: XX
+    county: County
+    house_number: 123
+    postcode: PCPCPC
+    road: Main Street
+    state: State
+    suburb: The Hood
+expected:  |
+    Main Street 123
+    PCPCPC City
+    Null Island
+---
+description: generic fallback
+components:
+    city: City
+    country: Null Island
+    country_code: XX
+    state: State
+expected:  |
+    City
+    State
+    Null Island

data/lib/address_composer/version.rb

@@ -1,3 +1,3 @@
 class AddressComposer
-  VERSION = "0.1.4.pre".freeze
+  VERSION = "0.1.7.pre".freeze
 end

data/lib/address_composer.rb

@@ -155,7 +155,7 @@ class AddressComposer
     unknown_components = components.keys - AllComponents
 
     components["attention"] = unknown_components.map do |unknown|
-      components[unknown]
+      components.delete(unknown)
     end.join(" ")
   end