From e48740674d6a2a15292b046f1ff6af3befe4f442 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 20 Aug 2019 10:09:10 -0500 Subject: [PATCH] Add E-Waste Container preset (close #6777) --- data/presets.yaml | 5 +++ data/presets/presets.json | 1 + .../recycling/container/electrical_items.json | 31 +++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 +++ 5 files changed, 42 insertions(+) create mode 100644 data/presets/presets/amenity/recycling/container/electrical_items.json diff --git a/data/presets.yaml b/data/presets.yaml index 83be5e930..62c32e721 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3234,6 +3234,11 @@ en: amenity/recycling: # amenity=recycling name: Recycling + amenity/recycling/container/electrical_items: + # 'amenity=recycling, recycling_type=container, recycling:electrical_items=yes' + name: E-Waste Container + # 'terms: computers,electronic waste,electronics recycling,ewaste bin,phones,tablets' + terms: '' amenity/recycling/container/green_waste: # 'amenity=recycling, recycling_type=container, recycling:green_waste=yes' name: Green Waste Container diff --git a/data/presets/presets.json b/data/presets/presets.json index 13178512f..0aa5e85e2 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -180,6 +180,7 @@ "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "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", "operator/type", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "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_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "manufacturer", "material"], "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/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"}, "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"}, "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "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/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"}, diff --git a/data/presets/presets/amenity/recycling/container/electrical_items.json b/data/presets/presets/amenity/recycling/container/electrical_items.json new file mode 100644 index 000000000..9cfd70ff2 --- /dev/null +++ b/data/presets/presets/amenity/recycling/container/electrical_items.json @@ -0,0 +1,31 @@ +{ + "icon": "maki-recycling", + "fields": [ + "{amenity/recycling_container}" + ], + "moreFields": [ + "{amenity/recycling_container}" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "computers", + "electronic waste", + "electronics recycling", + "ewaste bin", + "phones", + "tablets" + ], + "tags": { + "amenity": "recycling", + "recycling_type": "container", + "recycling:electrical_items": "yes" + }, + "reference": { + "key": "recycling:electrical_items", + "value": "yes" + }, + "name": "E-Waste Container" +} diff --git a/data/taginfo.json b/data/taginfo.json index 8b9bd719d..7f6b04be3 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -180,6 +180,7 @@ {"key": "amenity", "value": "ranger_station", "description": "🄿 Ranger Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ranger-station-15.svg"}, {"key": "recycling_type", "value": "centre", "description": "🄿 Recycling Center, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, {"key": "recycling_type", "value": "container", "description": "🄿 Recycling Container, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, + {"key": "recycling:electrical_items", "value": "yes", "description": "🄿 E-Waste Container", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, {"key": "recycling:green_waste", "value": "yes", "description": "🄿 Green Waste Container", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, {"key": "amenity", "value": "restaurant", "description": "🄿 Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"key": "cuisine", "value": "american", "description": "🄿 American Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index a1b1433f1..113788810 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5532,6 +5532,10 @@ "name": "Recycling Container", "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash" }, + "amenity/recycling/container/electrical_items": { + "name": "E-Waste Container", + "terms": "computers,electronic waste,electronics recycling,ewaste bin,phones,tablets" + }, "amenity/recycling/container/green_waste": { "name": "Green Waste Container", "terms": "biodegradable,biological,compost,decomposable,garbage bin,garden waste,organic,rubbish,food scrap"