From f3527830d3ab3d3416839200500218435a792773 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Sun, 13 Aug 2017 21:29:28 +0100 Subject: [PATCH 1/4] Adding unit field to USA --- data/address-formats.json | 2 +- data/presets.yaml | 4 +++- data/presets/fields.json | 6 ++++-- data/presets/fields/address.json | 6 ++++-- data/presets/presets.json | 8 +++++++- dist/locales/en.json | 5 +++-- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/data/address-formats.json b/data/address-formats.json index 8444d11d6..0d0477d10 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -63,7 +63,7 @@ { "countryCodes": ["us"], "format": [ - ["housenumber", "street"], + ["housenumber", "street", "unit"], ["city", "state", "postcode"] ] }, diff --git a/data/presets.yaml b/data/presets.yaml index 5895a11b2..e9cc12f4b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -84,7 +84,7 @@ en: # access=* label: Access address: - # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*' + # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*, addr:unit=*' label: Address placeholders: block_number: Block Number @@ -117,6 +117,7 @@ en: subdistrict!vn: Ward/Commune/Townlet suburb: Suburb suburb!jp: Ward + unit: Unit admin_level: # admin_level=* label: Admin Level @@ -3556,6 +3557,7 @@ en: natural/wetland: # natural=wetland name: Wetland + # 'terms: bog,marsh,reedbed,swamp,tidalflat' terms: '' natural/wood: # natural=wood diff --git a/data/presets/fields.json b/data/presets/fields.json index e099f5416..2359a42b1 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -99,7 +99,8 @@ "addr:state", "addr:street", "addr:subdistrict", - "addr:suburb" + "addr:suburb", + "addr:unit" ], "reference": { "key": "addr" @@ -138,7 +139,8 @@ "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", - "suburb!jp": "Ward" + "suburb!jp": "Ward", + "unit": "Unit" } } }, diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json index 198967c7d..dacaa71a6 100644 --- a/data/presets/fields/address.json +++ b/data/presets/fields/address.json @@ -21,7 +21,8 @@ "addr:state", "addr:street", "addr:subdistrict", - "addr:suburb" + "addr:suburb", + "addr:unit" ], "reference": {"key": "addr"}, "icon": "address", @@ -58,7 +59,8 @@ "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", - "suburb!jp": "Ward" + "suburb!jp": "Ward", + "unit": "Unit" } } } diff --git a/data/presets/presets.json b/data/presets/presets.json index 936001dd7..38e6f8317 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -9694,7 +9694,13 @@ "tags": { "natural": "wetland" }, - "terms": [], + "terms": [ + "bog", + "marsh", + "reedbed", + "swamp", + "tidalflat" + ], "name": "Wetland" }, "natural/wood": { diff --git a/dist/locales/en.json b/dist/locales/en.json index 2f4cfb3f9..4a6014dd4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1162,7 +1162,8 @@ "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", - "suburb!jp": "Ward" + "suburb!jp": "Ward", + "unit": "Unit" } }, "admin_level": { @@ -4211,7 +4212,7 @@ }, "natural/wetland": { "name": "Wetland", - "terms": "" + "terms": "bog,marsh,reedbed,swamp,tidalflat" }, "natural/wood": { "name": "Wood", From 809938a410bd2f007c2f2ff4d75766b542c04fab Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Thu, 17 Aug 2017 19:55:57 +0100 Subject: [PATCH 2/4] Update Australian format --- data/address-formats.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/address-formats.json b/data/address-formats.json index 0d0477d10..52247bfbd 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -60,6 +60,13 @@ ["province", "postcode"] ] }, + { + "countryCodes": ["au"], + "format": [ + ["housenumber", "street", "unit"], + ["city", "province", "postcode"] + ] + }, { "countryCodes": ["us"], "format": [ From de6b4fb6a20b2a3438b4159192e2b54682fab2e5 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Thu, 17 Aug 2017 20:45:35 +0100 Subject: [PATCH 3/4] Expand unit field to more locations --- data/address-formats.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/address-formats.json b/data/address-formats.json index 52247bfbd..0cec460c5 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -2,7 +2,7 @@ "dataAddressFormats": [ { "format": [ - ["housenumber", "street"], + ["housenumber", "street", "unit"], ["city", "postcode"] ] }, @@ -10,7 +10,7 @@ "countryCodes": ["gb"], "format": [ ["housename"], - ["housenumber", "street"], + ["housenumber", "street", "unit"], ["city", "postcode"] ] }, @@ -18,7 +18,7 @@ "countryCodes": ["ie"], "format": [ ["housename"], - ["housenumber", "street"], + ["housenumber", "street", "unit"], ["city"], ["postcode"] ] @@ -31,21 +31,21 @@ "pt", "se", "si", "sk", "sm", "va" ], "format": [ - ["street", "housenumber"], + ["unit","street", "housenumber"], ["postcode", "city"] ] }, { "countryCodes": ["fr", "lu", "mo"], "format": [ - ["housenumber", "street"], + ["unit","housenumber", "street"], ["postcode", "city"] ] }, { "countryCodes": ["br"], "format": [ - ["street"], + ["street","unit"], ["housenumber", "suburb"], ["city", "postcode"] ] @@ -53,7 +53,7 @@ { "countryCodes": ["vn"], "format": [ - ["housenumber", "street"], + ["housenumber", "street","unit"], ["subdistrict"], ["district"], ["city"], @@ -77,7 +77,7 @@ { "countryCodes": ["ca"], "format": [ - ["housenumber", "street"], + ["housenumber", "street","unit"], ["city", "province", "postcode"] ] }, @@ -86,7 +86,7 @@ "format": [ ["postcode", "city", "district"], ["place", "street"], - ["housenumber", "floor"] + ["housenumber", "floor","unit"] ] }, { @@ -114,7 +114,7 @@ "countryCodes": ["tr"], "format": [ ["neighbourhood"], - ["street", "housenumber"], + ["street", "housenumber", "unit"], ["postcode", "district", "city"] ] }, @@ -122,14 +122,14 @@ "countryCodes": ["ua"], "format": [ ["housenumber", "postcode"], - ["street"] + ["street", "unit"] ] }, { "countryCodes": ["cn"], "format": [ ["postcode", "province"], - ["city"], + ["city", "unit"], ["district"], ["street", "housenumber"] ] From 62e61475677e2c183a9671a5843494e15240cc66 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Fri, 18 Aug 2017 02:01:32 +0100 Subject: [PATCH 4/4] Remove au/ca duplicate --- data/address-formats.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/address-formats.json b/data/address-formats.json index 0cec460c5..ea64be59e 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -61,7 +61,7 @@ ] }, { - "countryCodes": ["au"], + "countryCodes": ["au","ca"], "format": [ ["housenumber", "street", "unit"], ["city", "province", "postcode"] @@ -74,13 +74,6 @@ ["city", "state", "postcode"] ] }, - { - "countryCodes": ["ca"], - "format": [ - ["housenumber", "street","unit"], - ["city", "province", "postcode"] - ] - }, { "countryCodes": ["tw"], "format": [