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

Recycling Center / Recycling Container preset cleanups

Browse Source 
(closes #4569)
This commit is contained in:
Bryan Housel
2017-12-05 13:37:13 -05:00
parent b29cc88f36
commit 83f135f2ba
7 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+2 -10
View File
@@ -1114,14 +1114,6 @@ en:
recycling_accepts:
# 'recycling:=*'
label: Accepts
recycling_type:
# recycling_type=*
label: Recycling Type
options:
# recycling_type=centre
centre: Recycling Center
# recycling_type=container
container: Container
ref:
# ref=*
label: Reference Code
@@ -2103,9 +2095,9 @@ en:
terms: '<translate with synonyms or related terms for ''Ranger Station'', separated by commas>'
amenity/recycling:
# amenity=recycling
name: Recycling
name: Recycling Container
# 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
terms: '<translate with synonyms or related terms for ''Recycling'', separated by commas>'
terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
amenity/recycling_centre:
# 'amenity=recycling, recycling_type=centre'
name: Recycling Center
data/presets/fields.json
-12
View File
@@ -1489,18 +1489,6 @@
"type": "multiCombo",
"label": "Accepts"
},
"recycling_type": {
"key": "recycling_type",
"default": "container",
"type": "combo",
"label": "Recycling Type",
"strings": {
"options": {
"container": "Container",
"centre": "Recycling Center"
}
}
},
"ref_aeroway_gate": {
"key": "ref",
"type": "text",
data/presets/fields/recycling_type.json
-12
View File
@@ -1,12 +0,0 @@
{
"key": "recycling_type",
"default": "container",
"type": "combo",
"label": "Recycling Type",
"strings": {
"options": {
"container": "Container",
"centre": "Recycling Center"
}
}
}
data/presets/presets.json
+19 -3
View File
@@ -2541,11 +2541,12 @@
"name": "Ranger Station"
},
"amenity/recycling_centre": {
"icon": "waste-basket",
"icon": "recycling",
"fields": [
"name",
"operator",
"address",
"building",
"opening_hours",
"recycling_accepts"
],
@@ -2567,12 +2568,15 @@
"amenity": "recycling",
"recycling_type": "centre"
},
"reference": {
"key": "recycling_type",
"value": "*"
},
"name": "Recycling Center"
},
"amenity/recycling": {
"icon": "recycling",
"fields": [
"recycling_type",
"recycling_accepts",
"collection_times"
],
@@ -2593,7 +2597,19 @@
"tags": {
"amenity": "recycling"
},
"name": "Recycling"
"addTags": {
"amenity": "recycling",
"recycling_type": "container"
},
"removeTags": {
"amenity": "recycling",
"recycling_type": "container"
},
"reference": {
"key": "amenity",
"value": "recycling"
},
"name": "Recycling Container"
},
"amenity/restaurant": {
"icon": "restaurant",
data/presets/presets/amenity/recycling.json
+13 -2
View File
@@ -1,7 +1,6 @@
{
"icon": "recycling",
"fields": [
"recycling_type",
"recycling_accepts",
"collection_times"
],
@@ -22,5 +21,17 @@
"tags": {
"amenity": "recycling"
},
"name": "Recycling"
"addTags": {
"amenity": "recycling",
"recycling_type": "container"
},
"removeTags": {
"amenity": "recycling",
"recycling_type": "container"
},
"reference": {
"key": "amenity",
"value": "recycling"
},
"name": "Recycling Container"
}
data/presets/presets/amenity/recycling_centre.json
+6 -1
View File
@@ -1,9 +1,10 @@
{
"icon": "waste-basket",
"icon": "recycling",
"fields": [
"name",
"operator",
"address",
"building",
"opening_hours",
"recycling_accepts"
],
@@ -25,5 +26,9 @@
"amenity": "recycling",
"recycling_type": "centre"
},
"reference": {
"key": "recycling_type",
"value": "*"
},
"name": "Recycling Center"
}
dist/locales/en.json
Vendored
+1 -8
View File
@@ -2184,13 +2184,6 @@
"recycling_accepts": {
"label": "Accepts"
},
"recycling_type": {
"label": "Recycling Type",
"options": {
"container": "Container",
"centre": "Recycling Center"
}
},
"ref_aeroway_gate": {
"label": "Gate Number"
},
@@ -3073,7 +3066,7 @@
"terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
},
"amenity/recycling": {
"name": "Recycling",
"name": "Recycling Container",
"terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
},
"amenity/restaurant": {