CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-06 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4235 from openstreetmap/unit_add

Browse Source 
Adding unit field to USA
This commit is contained in:
Bryan Housel
2017-08-17 21:09:50 -04:00
committed by GitHub
parent 5ffa8f535e 62e6147567
commit 17f4e7007f
6 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
data/address-formats.json
View File

@@ -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"],
@@ -61,17 +61,17 @@
]
},
{
"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"]
]
},
{
@@ -79,7 +79,7 @@
"format": [
["postcode", "city", "district"],
["place", "street"],
["housenumber", "floor"]
["housenumber", "floor","unit"]
]
},
{
@@ -107,7 +107,7 @@
"countryCodes": ["tr"],
"format": [
["neighbourhood"],
["street", "housenumber"],
["street", "housenumber", "unit"],
["postcode", "district", "city"]
]
},
@@ -115,14 +115,14 @@
"countryCodes": ["ua"],
"format": [
["housenumber", "postcode"],
["street"]
["street", "unit"]
]
},
{
"countryCodes": ["cn"],
"format": [
["postcode", "province"],
["city"],
["city", "unit"],
["district"],
["street", "housenumber"]
]

4
data/presets.yaml
View File

@@ -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
@@ -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

6
data/presets/fields.json
View File

@@ -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"
}
}
},

6
data/presets/fields/address.json
View File

@@ -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"
}
}
}

8
data/presets/presets.json
View File

@@ -9694,7 +9694,13 @@
"tags": {
"natural": "wetland"
},
"terms": [],
"terms": [
"bog",
"marsh",
"reedbed",
"swamp",
"tidalflat"
],
"name": "Wetland"
},
"natural/wood": {

5
dist/locales/en.json vendored
View File

@@ -1161,7 +1161,8 @@
"subdistrict": "Subdistrict",
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward"
"suburb!jp": "Ward",
"unit": "Unit"
}
},
"admin_level": {
@@ -4218,7 +4219,7 @@
},
"natural/wetland": {
"name": "Wetland",
"terms": ""
"terms": "bog,marsh,reedbed,swamp,tidalflat"
},
"natural/wood": {
"name": "Wood",