Skip to content

Commit

Permalink
Merge pull request #4235 from openstreetmap/unit_add
Browse files Browse the repository at this point in the history 
Adding unit field to USA
  • Loading branch information
@bhousel
bhousel authored Aug 18, 2017
2 parents 5ffa8f5 + 62e6147 commit 17f4e70
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 25 deletions.
34 changes: 17 additions & 17 deletions data/address-formats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"dataAddressFormats": [
{
"format": [
["housenumber", "street"],
["housenumber", "street", "unit"],
["city", "postcode"]
]
},
{
"countryCodes": ["gb"],
"format": [
["housename"],
["housenumber", "street"],
["housenumber", "street", "unit"],
["city", "postcode"]
]
},
{
"countryCodes": ["ie"],
"format": [
["housename"],
["housenumber", "street"],
["housenumber", "street", "unit"],
["city"],
["postcode"]
]
Expand All @@ -31,55 +31,55 @@
"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"]
]
},
{
"countryCodes": ["vn"],
"format": [
["housenumber", "street"],
["housenumber", "street","unit"],
["subdistrict"],
["district"],
["city"],
["province", "postcode"]
]
},
{
"countryCodes": ["us"],
"countryCodes": ["au","ca"],
"format": [
["housenumber", "street"],
["city", "state", "postcode"]
["housenumber", "street", "unit"],
["city", "province", "postcode"]
]
},
{
"countryCodes": ["ca"],
"countryCodes": ["us"],
"format": [
["housenumber", "street"],
["city", "province", "postcode"]
["housenumber", "street", "unit"],
["city", "state", "postcode"]
]
},
{
"countryCodes": ["tw"],
"format": [
["postcode", "city", "district"],
["place", "street"],
["housenumber", "floor"]
["housenumber", "floor","unit"]
]
},
{
Expand Down Expand Up @@ -107,22 +107,22 @@
"countryCodes": ["tr"],
"format": [
["neighbourhood"],
["street", "housenumber"],
["street", "housenumber", "unit"],
["postcode", "district", "city"]
]
},
{
"countryCodes": ["ua"],
"format": [
["housenumber", "postcode"],
["street"]
["street", "unit"]
]
},
{
"countryCodes": ["cn"],
"format": [
["postcode", "province"],
["city"],
["city", "unit"],
["district"],
["street", "housenumber"]
]
Expand Down
4 changes: 3 additions & 1 deletion data/presets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -117,6 +117,7 @@ en:
subdistrict!vn: Ward/Commune/Townlet
suburb: Suburb
suburb!jp: Ward
unit: Unit
admin_level:
# admin_level=*
label: Admin Level
Expand Down Expand Up @@ -3566,6 +3567,7 @@ en:
natural/wetland:
# natural=wetland
name: Wetland
# 'terms: bog,marsh,reedbed,swamp,tidalflat'
terms: '<translate with synonyms or related terms for ''Wetland'', separated by commas>'
natural/wood:
# natural=wood
Expand Down
6 changes: 4 additions & 2 deletions data/presets/fields.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@
"addr:state",
"addr:street",
"addr:subdistrict",
"addr:suburb"
"addr:suburb",
"addr:unit"
],
"reference": {
"key": "addr"
Expand Down Expand Up @@ -138,7 +139,8 @@
"subdistrict": "Subdistrict",
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward"
"suburb!jp": "Ward",
"unit": "Unit"
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions data/presets/fields/address.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"addr:state",
"addr:street",
"addr:subdistrict",
"addr:suburb"
"addr:suburb",
"addr:unit"
],
"reference": {"key": "addr"},
"icon": "address",
Expand Down Expand Up @@ -58,7 +59,8 @@
"subdistrict": "Subdistrict",
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward"
"suburb!jp": "Ward",
"unit": "Unit"
}
}
}
8 changes: 7 additions & 1 deletion data/presets/presets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9694,7 +9694,13 @@
"tags": {
"natural": "wetland"
},
"terms": [],
"terms": [
"bog",
"marsh",
"reedbed",
"swamp",
"tidalflat"
],
"name": "Wetland"
},
"natural/wood": {
Expand Down
5 changes: 3 additions & 2 deletions dist/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,8 @@
"subdistrict": "Subdistrict",
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward"
"suburb!jp": "Ward",
"unit": "Unit"
}
},
"admin_level": {
Expand Down Expand Up @@ -4218,7 +4219,7 @@
},
"natural/wetland": {
"name": "Wetland",
"terms": ""
"terms": "bog,marsh,reedbed,swamp,tidalflat"
},
"natural/wood": {
"name": "Wood",
Expand Down

0 comments on commit 17f4e70

Please sign in to comment.