CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-13 04:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openstreetmap/iD

Browse Source
This commit is contained in:
Wille Marcel
2016-07-22 14:18:06 -03:00
parent 5a86ee532a 6dad13b4b1
commit 49c5607f1d
7 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/address-formats.json
+4
View File
@@ -33,5 +33,9 @@
{
"countryCodes": ["ca"],
"format": [["housenumber", "street"], ["city", "province", "postcode"]]
},
{
"countryCodes": ["tw"],
"format": [["postcode", "city", "district"], ["place", "street"], ["housenumber", "floor"]]
}
]
data/presets.yaml
+2 -1
View File
@@ -80,13 +80,14 @@ en:
# access=*
label: Access
address:
# 'addr:housename=*, addr:housenumber=*, addr:conscriptionnumber=*, addr:street=*, addr:city=*, addr:postcode=*, addr:place=*, addr:hamlet=*, addr:suburb=*, addr:subdistrict=*, addr:district=*, addr:province=*, addr:state=*, addr:country=*'
# 'addr:city=*, addr:conscriptionnumber=*, addr:country=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:place=*, addr:postcode=*, addr:province=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*'
label: Address
placeholders:
city: City
conscriptionnumber: '123'
country: Country
district: District
floor: Floor
hamlet: Hamlet
housename: Housename
housenumber: '123'
data/presets/fields.json
+20 -18
View File
@@ -79,20 +79,21 @@
"address": {
"type": "address",
"keys": [
"addr:city",
"addr:conscriptionnumber",
"addr:country",
"addr:district",
"addr:floor",
"addr:hamlet",
"addr:housename",
"addr:housenumber",
"addr:conscriptionnumber",
"addr:street",
"addr:city",
"addr:postcode",
"addr:place",
"addr:hamlet",
"addr:suburb",
"addr:subdistrict",
"addr:district",
"addr:postcode",
"addr:province",
"addr:state",
"addr:country"
"addr:street",
"addr:subdistrict",
"addr:suburb"
],
"reference": {
"key": "addr"
@@ -102,20 +103,21 @@
"label": "Address",
"strings": {
"placeholders": {
"city": "City",
"conscriptionnumber": "123",
"country": "Country",
"district": "District",
"floor": "Floor",
"hamlet": "Hamlet",
"housename": "Housename",
"housenumber": "123",
"conscriptionnumber": "123",
"street": "Street",
"city": "City",
"postcode": "Postcode",
"place": "Place",
"hamlet": "Hamlet",
"suburb": "Suburb",
"subdistrict": "Subdistrict",
"district": "District",
"postcode": "Postcode",
"province": "Province",
"state": "State",
"country": "Country"
"street": "Street",
"subdistrict": "Subdistrict",
"suburb": "Suburb"
}
}
},
data/presets/fields/address.json
+20 -18
View File
@@ -1,20 +1,21 @@
{
"type": "address",
"keys": [
"addr:city",
"addr:conscriptionnumber",
"addr:country",
"addr:district",
"addr:floor",
"addr:hamlet",
"addr:housename",
"addr:housenumber",
"addr:conscriptionnumber",
"addr:street",
"addr:city",
"addr:postcode",
"addr:place",
"addr:hamlet",
"addr:suburb",
"addr:subdistrict",
"addr:district",
"addr:postcode",
"addr:province",
"addr:state",
"addr:country"
"addr:street",
"addr:subdistrict",
"addr:suburb"
],
"reference": {"key": "addr"},
"icon": "address",
@@ -22,20 +23,21 @@
"label": "Address",
"strings": {
"placeholders": {
"city": "City",
"conscriptionnumber": "123",
"country": "Country",
"district": "District",
"floor": "Floor",
"hamlet": "Hamlet",
"housename": "Housename",
"housenumber": "123",
"conscriptionnumber": "123",
"street": "Street",
"city": "City",
"postcode": "Postcode",
"place": "Place",
"hamlet": "Hamlet",
"suburb": "Suburb",
"subdistrict": "Subdistrict",
"district": "District",
"postcode": "Postcode",
"province": "Province",
"state": "State",
"country": "Country"
"street": "Street",
"subdistrict": "Subdistrict",
"suburb": "Suburb"
}
}
}
dist/locales/en.json
Vendored
+10 -9
View File
@@ -699,20 +699,21 @@
"address": {
"label": "Address",
"placeholders": {
"city": "City",
"conscriptionnumber": "123",
"country": "Country",
"district": "District",
"floor": "Floor",
"hamlet": "Hamlet",
"housename": "Housename",
"housenumber": "123",
"conscriptionnumber": "123",
"street": "Street",
"city": "City",
"postcode": "Postcode",
"place": "Place",
"hamlet": "Hamlet",
"suburb": "Suburb",
"subdistrict": "Subdistrict",
"district": "District",
"postcode": "Postcode",
"province": "Province",
"state": "State",
"country": "Country"
"street": "Street",
"subdistrict": "Subdistrict",
"suburb": "Suburb"
}
},
"admin_level": {
modules/core/connection.js
+1 -1
View File
@@ -280,7 +280,7 @@ export function Connection(useHttps) {
method: 'PUT',
path: '/api/0.6/changeset/create',
options: { header: { 'Content-Type': 'text/xml' } },
content: JXON.stringify(connection.changesetJXON(connection.changesetTags(comment, imageryUsed)))
content: JXON.stringify(connection.changesetJXON(connection.changesetTags(version, comment, imageryUsed)))
}, function(err, changeset_id) {
if (err) return callback(err);
oauth.xhr({
package.json
+1 -1
View File
@@ -48,7 +48,7 @@
"phantomjs-prebuilt": "2.1.7",
"request": "~2.73.0",
"rollup": "0.34.1",
"rollup-plugin-commonjs": "3.3.0",
"rollup-plugin-commonjs": "3.3.1",
"rollup-plugin-node-resolve": "1.7.1",
"sinon": "1.17.4",
"sinon-chai": "2.8.0",