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

Add generic "Recycling" preset and field recycling_type=container/center

Browse Source 
(closes #5363)
This commit is contained in:
Bryan Housel
2018-10-02 17:43:49 -04:00
parent 1ffca3ce85
commit d55fe9f5df
8 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+16 -3
View File
@@ -1267,6 +1267,16 @@ en:
recycling_accepts:
# 'recycling:=*'
label: Accepts
recycling_type:
# recycling_type=*
label: Type
options:
# recycling_type=centre
centre: Center
# recycling_type=container
container: Container
# recycling_type field placeholder
placeholder: 'Container, Center'
ref:
# ref=*
label: Reference Code
@@ -2451,14 +2461,17 @@ en:
terms: '<translate with synonyms or related terms for ''Ranger Station'', separated by commas>'
amenity/recycling:
# amenity=recycling
name: Recycling Container
# 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
name: Recycling
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/recycling_container:
# 'amenity=recycling, recycling_type=container'
name: Recycling Container
# 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
amenity/register_office:
# amenity=register_office
name: Register Office
data/presets/fields.json
+1
View File
@@ -220,6 +220,7 @@
"railway/signal/direction": {"key": "railway:signal:direction", "type": "combo", "label": "Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
"rating": {"key": "rating", "type": "combo", "label": "Power Rating", "snake_case": false},
"recycling_accepts": {"key": "recycling:", "type": "multiCombo", "label": "Accepts"},
"recycling_type": {"key": "recycling_type", "type": "combo", "label": "Type", "placeholder": "Container, Center", "strings": {"options": {"container": "Container", "centre": "Center"}}},
"ref_aeroway_gate": {"key": "ref", "type": "text", "label": "Gate Number"},
"ref_golf_hole": {"key": "ref", "type": "text", "label": "Hole Number", "placeholder": "1-18"},
"ref_highway_junction": {"key": "ref", "type": "text", "label": "Junction Number"},
data/presets/fields/recycling_type.json
+12
View File
@@ -0,0 +1,12 @@
{
"key": "recycling_type",
"type": "combo",
"label": "Type",
"placeholder": "Container, Center",
"strings": {
"options": {
"container": "Container",
"centre": "Center"
}
}
}
data/presets/presets.json
+2 -1
View File
@@ -39,6 +39,7 @@
"amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false},
"amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "ferry_terminal"}, "name": "Ferry Station / Terminal", "searchable": false},
"amenity/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nursing_home"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home", "searchable": false},
"amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false},
"amenity/register_office": {"icon": "maki-town-hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false},
"amenity/scrapyard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "scrapyard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "name": "Scrap Yard", "searchable": false},
"amenity/swimming_pool": {"icon": "maki-swimming", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false},
@@ -125,7 +126,7 @@
"amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "operator", "capacity", "website"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
"amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
"amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "address", "building", "opening_hours", "recycling_accepts"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
"amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "addTags": {"amenity": "recycling", "recycling_type": "container"}, "removeTags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
"amenity/recycling_container": {"icon": "maki-recycling", "fields": ["recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
"amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
"amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "water_point"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
"amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
data/presets/presets/amenity/_recycling.json
+27
View File
@@ -0,0 +1,27 @@
{
"icon": "maki-recycling",
"fields": [
"recycling_type",
"recycling_accepts",
"collection_times"
],
"geometry": [
"point",
"area"
],
"terms": [
"bin",
"can",
"bottle",
"glass",
"garbage",
"rubbish",
"scrap",
"trash"
],
"tags": {
"amenity": "recycling"
},
"name": "Recycling",
"searchable": false
}
data/presets/presets/amenity/recycling.json → data/presets/presets/amenity/recycling_container.json
-7
View File
@@ -19,13 +19,6 @@
"trash"
],
"tags": {
"amenity": "recycling"
},
"addTags": {
"amenity": "recycling",
"recycling_type": "container"
},
"removeTags": {
"amenity": "recycling",
"recycling_type": "container"
},
data/taginfo.json
+11 -4
View File
@@ -248,6 +248,13 @@
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"
},
{
"key": "amenity",
"value": "recycling",
"description": "Recycling",
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/recycling-15.svg?sanitize=true"
},
{
"key": "amenity",
"value": "register_office",
@@ -843,14 +850,14 @@
{
"key": "recycling_type",
"value": "centre",
"description": "Recycling Center",
"description": "Recycling Center, Type",
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/recycling-15.svg?sanitize=true"
},
{
"key": "amenity",
"value": "recycling",
"description": "Recycling Container",
"key": "recycling_type",
"value": "container",
"description": "Recycling Container, Type",
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/recycling-15.svg?sanitize=true"
},
dist/locales/en.json
Vendored
+13 -1
View File
@@ -2521,6 +2521,14 @@
"recycling_accepts": {
"label": "Accepts"
},
"recycling_type": {
"label": "Type",
"placeholder": "Container, Center",
"options": {
"container": "Container",
"centre": "Center"
}
},
"ref_aeroway_gate": {
"label": "Gate Number"
},
@@ -3226,6 +3234,10 @@
"name": "Nursing Home",
"terms": ""
},
"amenity/recycling": {
"name": "Recycling",
"terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
},
"amenity/register_office": {
"name": "Register Office",
"terms": ""
@@ -3570,7 +3582,7 @@
"name": "Recycling Center",
"terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
},
"amenity/recycling": {
"amenity/recycling_container": {
"name": "Recycling Container",
"terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
},