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

Restore recycling_type, improve all the waste/recycling presets

Browse Source 
(closes #2689)
This commit is contained in:
Bryan Housel
2016-10-31 21:07:21 -04:00
parent 8cd2d7097c
commit ba15c7d299
12 changed files with 156 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
data/presets.yaml
View File

@@ -848,6 +848,14 @@ 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
@@ -1553,8 +1561,13 @@ en:
amenity/recycling:
# amenity=recycling
name: Recycling
# 'terms: can,bottle,garbage,scrap,trash'
# 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
terms: '<translate with synonyms or related terms for ''Recycling'', separated by commas>'
amenity/recycling_centre:
# 'amenity=recycling, recycling_type=centre'
name: Recycling Center
# 'terms: bottle,can,dump,glass,garbage,rubbish,scrap,trash'
terms: '<translate with synonyms or related terms for ''Recycling Center'', separated by commas>'
amenity/register_office:
# amenity=register_office
name: Register Office
@@ -1691,17 +1704,17 @@ en:
amenity/waste_basket:
# amenity=waste_basket
name: Waste Basket
# 'terms: bin,rubbish,litter,trash,garbage'
# 'terms: bin,garbage,rubbish,litter,trash'
terms: '<translate with synonyms or related terms for ''Waste Basket'', separated by commas>'
amenity/waste_disposal:
# amenity=waste_disposal
name: Garbage Dumpster
# 'terms: rubbish,litter,trash'
# 'terms: garbage,rubbish,litter,trash'
terms: '<translate with synonyms or related terms for ''Garbage Dumpster'', separated by commas>'
amenity/waste_transfer_station:
# amenity=waste_transfer_station
name: Waste Transfer Station
# 'terms: dump,garbage,recycling,scrap,trash'
# 'terms: dump,garbage,recycling,rubbish,scrap,trash'
terms: '<translate with synonyms or related terms for ''Waste Transfer Station'', separated by commas>'
amenity/water_point:
# amenity=water_point

12
data/presets/fields.json
View File

@@ -1114,6 +1114,18 @@
"type": "multiCombo",
"label": "Accepts"
},
"recycling_type": {
"key": "recycling_type",
"default": "container",
"type": "combo",
"label": "Recycling Type",
"strings": {
"options": {
"container": "Container",
"centre": "Recycling Center"
}
}
},
"ref": {
"key": "ref",
"type": "text",

12
data/presets/fields/recycling_type.json Normal file
View File

@@ -0,0 +1,12 @@
{
"key": "recycling_type",
"default": "container",
"type": "combo",
"label": "Recycling Type",
"strings": {
"options": {
"container": "Container",
"centre": "Recycling Center"
}
}
}

53
data/presets/presets.json
View File

@@ -1637,8 +1637,8 @@
"icon": "museum",
"fields": [
"operator",
"building_area",
"address",
"building_area",
"opening_hours"
],
"geometry": [
@@ -1813,11 +1813,12 @@
},
"name": "Ranger Station"
},
"amenity/recycling": {
"amenity/recycling_centre": {
"icon": "waste-basket",
"fields": [
"operator",
"address",
"opening_hours",
"recycling_accepts"
],
"geometry": [
@@ -1825,9 +1826,39 @@
"area"
],
"terms": [
"bottle",
"can",
"dump",
"glass",
"garbage",
"rubbish",
"scrap",
"trash"
],
"tags": {
"amenity": "recycling",
"recycling_type": "centre"
},
"name": "Recycling Center"
},
"amenity/recycling": {
"icon": "waste-basket",
"fields": [
"recycling_type",
"recycling_accepts",
"collection_times"
],
"geometry": [
"point",
"area"
],
"terms": [
"bin",
"can",
"bottle",
"glass",
"garbage",
"rubbish",
"scrap",
"trash"
],
@@ -2405,32 +2436,41 @@
},
"amenity/waste_basket": {
"icon": "waste-basket",
"fields": [
"collection_times"
],
"geometry": [
"point",
"vertex"
"vertex",
"area"
],
"tags": {
"amenity": "waste_basket"
},
"terms": [
"bin",
"garbage",
"rubbish",
"litter",
"trash",
"garbage"
"trash"
],
"name": "Waste Basket"
},
"amenity/waste_disposal": {
"icon": "waste-basket",
"fields": [
"collection_times"
],
"geometry": [
"point",
"vertex"
"vertex",
"area"
],
"tags": {
"amenity": "waste_disposal"
},
"terms": [
"garbage",
"rubbish",
"litter",
"trash"
@@ -2452,6 +2492,7 @@
"dump",
"garbage",
"recycling",
"rubbish",
"scrap",
"trash"
],

2
data/presets/presets/amenity/planetarium.json
View File

@@ -2,8 +2,8 @@
"icon": "museum",
"fields": [
"operator",
"building_area",
"address",
"building_area",
"opening_hours"
],
"geometry": [

9
data/presets/presets/amenity/recycling.json
View File

@@ -1,18 +1,21 @@
{
"icon": "waste-basket",
"fields": [
"operator",
"address",
"recycling_accepts"
"recycling_type",
"recycling_accepts",
"collection_times"
],
"geometry": [
"point",
"area"
],
"terms": [
"bin",
"can",
"bottle",
"glass",
"garbage",
"rubbish",
"scrap",
"trash"
],

28
data/presets/presets/amenity/recycling_centre.json Normal file
View File

@@ -0,0 +1,28 @@
{
"icon": "waste-basket",
"fields": [
"operator",
"address",
"opening_hours",
"recycling_accepts"
],
"geometry": [
"point",
"area"
],
"terms": [
"bottle",
"can",
"dump",
"glass",
"garbage",
"rubbish",
"scrap",
"trash"
],
"tags": {
"amenity": "recycling",
"recycling_type": "centre"
},
"name": "Recycling Center"
}

10
data/presets/presets/amenity/waste_basket.json
View File

@@ -1,18 +1,22 @@
{
"icon": "waste-basket",
"fields": [
"collection_times"
],
"geometry": [
"point",
"vertex"
"vertex",
"area"
],
"tags": {
"amenity": "waste_basket"
},
"terms": [
"bin",
"garbage",
"rubbish",
"litter",
"trash",
"garbage"
"trash"
],
"name": "Waste Basket"
}

7
data/presets/presets/amenity/waste_disposal.json
View File

@@ -1,13 +1,18 @@
{
"icon": "waste-basket",
"fields": [
"collection_times"
],
"geometry": [
"point",
"vertex"
"vertex",
"area"
],
"tags": {
"amenity": "waste_disposal"
},
"terms": [
"garbage",
"rubbish",
"litter",
"trash"

1
data/presets/presets/amenity/waste_transfer_station.json
View File

@@ -13,6 +13,7 @@
"dump",
"garbage",
"recycling",
"rubbish",
"scrap",
"trash"
],

4
data/taginfo.json
View File

@@ -383,6 +383,10 @@
"key": "amenity",
"value": "ranger_station"
},
{
"key": "recycling_type",
"value": "centre"
},
{
"key": "amenity",
"value": "recycling"

19
dist/locales/en.json vendored
View File

@@ -1346,6 +1346,13 @@
"recycling_accepts": {
"label": "Accepts"
},
"recycling_type": {
"label": "Recycling Type",
"options": {
"container": "Container",
"centre": "Recycling Center"
}
},
"ref": {
"label": "Reference"
},
@@ -1979,9 +1986,13 @@
"name": "Ranger Station",
"terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
},
"amenity/recycling_centre": {
"name": "Recycling Center",
"terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
},
"amenity/recycling": {
"name": "Recycling",
"terms": "can,bottle,garbage,scrap,trash"
"terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
},
"amenity/restaurant": {
"name": "Restaurant",
@@ -2089,15 +2100,15 @@
},
"amenity/waste_basket": {
"name": "Waste Basket",
"terms": "bin,rubbish,litter,trash,garbage"
"terms": "bin,garbage,rubbish,litter,trash"
},
"amenity/waste_disposal": {
"name": "Garbage Dumpster",
"terms": "rubbish,litter,trash"
"terms": "garbage,rubbish,litter,trash"
},
"amenity/waste_transfer_station": {
"name": "Waste Transfer Station",
"terms": "dump,garbage,recycling,scrap,trash"
"terms": "dump,garbage,recycling,rubbish,scrap,trash"
},
"amenity/water_point": {
"name": "RV Drinking Water",