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

Fix issue where upgrading "office=administrative" could also remove "building=yes" (close #6466)

Browse Source
This commit is contained in:
Quincy Morgan
2019-05-31 09:55:23 -04:00
parent 14c0809426
commit a53a87db1e
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/deprecated.json
+4
View File
@@ -527,6 +527,10 @@
"old": {"nosquare": "*"},
"replace": {"nonsquare": "$1"}
},
{
"old": {"office": "administrative"},
"replace": {"office": "government"}
},
{
"old": {"office": "real_estate"},
"replace": {"office": "estate_agent"}
data/presets/presets.json
+1 -1
View File
@@ -773,7 +773,7 @@
"natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
"noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
"office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
"office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "searchable": false, "name": "Administrative Office", "replacement": "office/government"},
"office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "searchable": false, "name": "Administrative Office"},
"office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
"office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "terms": [], "name": "Travel Agency", "searchable": false},
"office/accountant": {"icon": "temaki-accounting", "geometry": ["point", "area"], "tags": {"office": "accountant"}, "terms": [], "name": "Accountant Office"},
data/presets/presets/office/_administrative.json
+1 -2
View File
@@ -9,6 +9,5 @@
},
"terms": [],
"searchable": false,
"name": "Administrative Office",
"replacement": "office/government"
"name": "Administrative Office"
}
data/taginfo.json
+1 -1
View File
@@ -743,7 +743,7 @@
{"key": "natural", "value": "wood", "description": "🄿 Wood", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-alt1-15.svg?sanitize=true"},
{"key": "noexit", "value": "yes", "description": "🄿 No Exit", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "office", "description": "🄿 Office, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
{"key": "office", "value": "administrative", "description": "🄿 Administrative Office (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
{"key": "office", "value": "administrative", "description": "🄿 Administrative Office (unsearchable), 🄳 ➜ office=government", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
{"key": "office", "value": "physician", "description": "🄿 Physician (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
{"key": "office", "value": "travel_agent", "description": "🄿 Travel Agency (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
{"key": "office", "value": "accountant", "description": "🄿 Accountant Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/accounting.svg?sanitize=true"},