From 5a6e566fe2033a31c5945969247629c7f9b6c258 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 1 Jan 2022 02:56:06 +0100 Subject: [PATCH] Added recycling types --- assets/layers/recycling/batteries.svg | 15 + assets/layers/recycling/beverage_cartons.svg | 20 + assets/layers/recycling/cans.svg | 41 ++ assets/layers/recycling/clothes.svg | 18 + assets/layers/recycling/cooking_oil.svg | 32 ++ assets/layers/recycling/engine_oil.svg | 19 + assets/layers/recycling/garden_waste.svg | 22 + assets/layers/recycling/glass.svg | 25 ++ assets/layers/recycling/glass_bottles.svg | 18 + assets/layers/recycling/license_info.json | 176 +++++++- assets/layers/recycling/newspaper.svg | 13 + assets/layers/recycling/paper.svg | 33 ++ assets/layers/recycling/plastic.svg | 78 ++++ assets/layers/recycling/plastic_bottles.svg | 21 + assets/layers/recycling/plastic_packaging.svg | 55 +++ assets/layers/recycling/recycling.json | 376 +++++++++++++++++- assets/layers/recycling/scrap_metal.svg | 19 + assets/layers/recycling/shoes.svg | 24 ++ .../recycling/small_electrical_appliances.svg | 44 ++ 19 files changed, 1044 insertions(+), 5 deletions(-) create mode 100644 assets/layers/recycling/batteries.svg create mode 100644 assets/layers/recycling/beverage_cartons.svg create mode 100644 assets/layers/recycling/cans.svg create mode 100644 assets/layers/recycling/clothes.svg create mode 100644 assets/layers/recycling/cooking_oil.svg create mode 100644 assets/layers/recycling/engine_oil.svg create mode 100644 assets/layers/recycling/garden_waste.svg create mode 100644 assets/layers/recycling/glass.svg create mode 100644 assets/layers/recycling/glass_bottles.svg create mode 100644 assets/layers/recycling/newspaper.svg create mode 100644 assets/layers/recycling/paper.svg create mode 100644 assets/layers/recycling/plastic.svg create mode 100644 assets/layers/recycling/plastic_bottles.svg create mode 100644 assets/layers/recycling/plastic_packaging.svg create mode 100644 assets/layers/recycling/scrap_metal.svg create mode 100644 assets/layers/recycling/shoes.svg create mode 100644 assets/layers/recycling/small_electrical_appliances.svg diff --git a/assets/layers/recycling/batteries.svg b/assets/layers/recycling/batteries.svg new file mode 100644 index 000000000..2ba547473 --- /dev/null +++ b/assets/layers/recycling/batteries.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/beverage_cartons.svg b/assets/layers/recycling/beverage_cartons.svg new file mode 100644 index 000000000..05909ef8f --- /dev/null +++ b/assets/layers/recycling/beverage_cartons.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/cans.svg b/assets/layers/recycling/cans.svg new file mode 100644 index 000000000..2aaff3f9a --- /dev/null +++ b/assets/layers/recycling/cans.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/clothes.svg b/assets/layers/recycling/clothes.svg new file mode 100644 index 000000000..f99861248 --- /dev/null +++ b/assets/layers/recycling/clothes.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/cooking_oil.svg b/assets/layers/recycling/cooking_oil.svg new file mode 100644 index 000000000..7a742beab --- /dev/null +++ b/assets/layers/recycling/cooking_oil.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/engine_oil.svg b/assets/layers/recycling/engine_oil.svg new file mode 100644 index 000000000..f92afd355 --- /dev/null +++ b/assets/layers/recycling/engine_oil.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/garden_waste.svg b/assets/layers/recycling/garden_waste.svg new file mode 100644 index 000000000..8788c1147 --- /dev/null +++ b/assets/layers/recycling/garden_waste.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/glass.svg b/assets/layers/recycling/glass.svg new file mode 100644 index 000000000..46488037e --- /dev/null +++ b/assets/layers/recycling/glass.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/glass_bottles.svg b/assets/layers/recycling/glass_bottles.svg new file mode 100644 index 000000000..7d234e991 --- /dev/null +++ b/assets/layers/recycling/glass_bottles.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/license_info.json b/assets/layers/recycling/license_info.json index 035586de7..ec788ff43 100644 --- a/assets/layers/recycling/license_info.json +++ b/assets/layers/recycling/license_info.json @@ -1,12 +1,186 @@ [ + { + "path": "batteries.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/batteries.svg" + ] + }, + { + "path": "beverage_cartons.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/beverage_cartons.svg" + ] + }, + { + "path": "cans.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/cans.svg" + ] + }, + { + "path": "clothes.svg", + "license": "CC-BY-SA", + "authors": [ + "Adrien Pavie", + "modified from EmojiOne 2: U+1F456, U+1F45" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/clothes.svg" + ] + }, + { + "path": "cooking_oil.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/cooking_oil.svg" + ] + }, + { + "path": "engine_oil.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/engine_oil.svg" + ] + }, + { + "path": "garden_waste.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick", + "modified from Twemoji: U+1F33F" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/garden_waste.svg" + ] + }, + { + "path": "glass.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/glass.svg" + ] + }, + { + "path": "glass_bottles.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/glass_bottles.svg" + ] + }, + { + "path": "newspaper.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick", + "modified from EmojiOne 2: U+1F4F0" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/newspaper.svg" + ] + }, + { + "path": "paper.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/paper.svg" + ] + }, + { + "path": "plastic.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic.svg" + ] + }, + { + "path": "plastic_bottles.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_bottles.svg" + ] + }, + { + "path": "plastic_packaging.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_packaging.svg" + ] + }, { "path": "recycling-14.svg", - "license": "CC0-1.0", + "license": "CC0", "authors": [ "Michael Glanznig" ], "sources": [ "https://github.com/gmgeo/osmic/blob/master/amenity/recycling-14.svg" ] + }, + { + "path": "scrap_metal.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/scrap_metal.svg" + ] + }, + { + "path": "shoes.svg", + "license": "CC-BY-SA", + "authors": [ + "Tobias Zwick", + "modified from EmojiOne 2: U+1F45F" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/shoes.svg" + ] + }, + { + "path": "small_electrical_appliances.svg", + "license": "CC-BY-SA", + "authors": [ + "EmojiOne 2: U+1F50C" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/small_electrical_appliances.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/recycling/newspaper.svg b/assets/layers/recycling/newspaper.svg new file mode 100644 index 000000000..19ffa9d54 --- /dev/null +++ b/assets/layers/recycling/newspaper.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/layers/recycling/paper.svg b/assets/layers/recycling/paper.svg new file mode 100644 index 000000000..76cb42217 --- /dev/null +++ b/assets/layers/recycling/paper.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/plastic.svg b/assets/layers/recycling/plastic.svg new file mode 100644 index 000000000..755c2e865 --- /dev/null +++ b/assets/layers/recycling/plastic.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/plastic_bottles.svg b/assets/layers/recycling/plastic_bottles.svg new file mode 100644 index 000000000..669312972 --- /dev/null +++ b/assets/layers/recycling/plastic_bottles.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/plastic_packaging.svg b/assets/layers/recycling/plastic_packaging.svg new file mode 100644 index 000000000..7ae9d650f --- /dev/null +++ b/assets/layers/recycling/plastic_packaging.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 1fc67853a..c5b8edbd8 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -27,27 +27,395 @@ "icon": "./assets/layers/recycling/recycling-14.svg" } ], - "presets": [], + "presets": [ + { + "title": { + "en": "recycling container", + "nl": "recycling container" + }, + "tags": [ + "amenity=recycling", + "recycling_type=container" + ] + }, + { + "title": { + "en": "recycling centre", + "nl": "recycling centre" + }, + "tags": [ + "amenity=recycling", + "recycling_type=centre" + ] + } + ], "tagRenderings": [ { "id": "recycling-type", + "question": { + "en": "What type of recycling is this?", + "nl": "Wat voor soort recycling is dit?" + }, "mappings": [ { - "if": "recycling-type=container", + "if": "recycling_type=container", "then": { "en": "This is a recycling container", "nl": "Dit is een recyclingcontainer" } }, { - "if": "recycling-type=centre", + "if": "recycling_type=centre", "then": { "en": "This is a recycling centre", "nl": "Dit is een recyclingcentrum" } } ] + }, + { + "id": "container-underground", + "question": { + "en": "Is this container underground?", + "nl": "Is deze container ondergrond?" + }, + "condition": "recycling_type=container", + "mappings": [ + { + "if": "location=underground", + "then": { + "en": "This is an underground container", + "nl": "Dit is een ondergrondse container" + } + }, + { + "if": "location=", + "then": { + "en": "This container is not underground", + "nl": "Deze container is niet ondergronds" + } + } + ] + }, + { + "id": "recycling-accepts", + "question": { + "en": "What can be recycled here?", + "nl": "Wat kan hier gerecycled worden?" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "recycling:batteries=yes", + "ifnot": "recycling:batteries=", + "then": { + "en": "
Batteries can be recycled here
", + "nl": "
Batterijen kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:beverage_cartons=yes", + "ifnot": "recycling:beverage_cartons=", + "then": { + "en": "
Beverage cartons can be recycled here
", + "nl": "
Drankpakken kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:cans=yes", + "ifnot": "recycling:cans=", + "then": { + "en": "
Cans can be recycled here
", + "nl": "
Blikken kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:clothes=yes", + "ifnot": "recycling:clothes=", + "then": { + "en": "
Clothes can be recycled here
", + "nl": "
Kleren kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:cooking_oil=yes", + "ifnot": "recycling:cooking_oil=", + "then": { + "en": "
Cooking oil can be recycled here
", + "nl": "
Frituurvet kan hier gerecycled worden
" + } + }, + { + "if": "recycling:engine_oil=yes", + "ifnot": "recycling:engine_oil=", + "then": { + "en": "
Engine oil can be recycled here
", + "nl": "
Motorolie kan hier gerecycled worden
" + } + }, + { + "if": "recycling:green_waste=yes", + "ifnot": "recycling:green_waste=", + "then": { + "en": "
Green waste can be recycled here
", + "nl": "
Groen afval kan hier gerecycled worden
" + } + }, + { + "if": "recycling:glass_bottles=yes", + "ifnot": "recycling:glass_bottles=", + "then": { + "en": "
Glass bottles can be recycled here
", + "nl": "
Glazen flessen kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:glass=yes", + "ifnot": "recycling:glass=", + "then": { + "en": "
Glass can be recycled here
", + "nl": "
Glas kan hier gerecycled worden
" + } + }, + { + "if": "recycling:newspaper=yes", + "ifnot": "recycling:newspaper=", + "then": { + "en": "
Newspapers can be recycled here
", + "nl": "
Kranten kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:paper=yes", + "ifnot": "recycling:paper=", + "then": { + "en": "
Paper can be recycled here
", + "nl": "
Papier kan hier gerecycled worden
" + } + }, + { + "if": "recycling:plastic_bottles=yes", + "ifnot": "recycling:plastic_bottles=", + "then": { + "en": "
Plastic bottles can be recycled here
", + "nl": "
Plastic flessen kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:plastic_packaging=yes", + "ifnot": "recycling:plastic_packaging=", + "then": { + "en": "
Plastic packaging can be recycled here
", + "nl": "
Plastic verpakking kan hier gerecycled worden
" + } + }, + { + "if": "recylcing:plastic=yes", + "ifnot": "recycling:plastic=", + "then": { + "en": "
Plastic can be recycled here
", + "nl": "
Plastic kan hier gerecycled worden
" + } + }, + { + "if": "recycling:scrap_metal=yes", + "ifnot": "recycling:scrap_metal=", + "then": { + "en": "
Scrap metal can be recycled here
", + "nl": "
Oud metaal kan hier gerecycled worden
" + } + }, + { + "if": "recycling:shoes=yes", + "ifnot": "recycling:shoes=", + "then": { + "en": "
Shoes can be recycled here
", + "nl": "
Schoenen kunnen hier gerecycled worden
" + } + }, + { + "if": "recycling:small_electrical_appliances=yes", + "ifnot": "recycling:small_electrical_appliances=", + "then": { + "en": "
Small electrical appliances can be recycled here
", + "nl": "
Kleine elektronische apparaten kunnen hier gerecycled worden
" + } + } + ] + }, + { + "id": "operator", + "render": { + "en": "This recycling facility is operated by {operator}", + "nl": "Deze recyclingfaciliteit wordt beheerd door {operator}" + }, + "question": { + "en": "What company operates this recycling facility?", + "nl": "Wat is de beheerder van deze recyclingfaciliteit?" + }, + "freeform": { + "key": "operator", + "type": "string" + } + }, + { + "id": "opening_hours", + "render": "{opening_hours_table()}", + "question": { + "en": "What are the opening hours of this recycling facility?", + "nl": "Wat zijn de openingstijden van deze recyclingfaciliteit?" + }, + "freeform": { + "key": "opening_hours", + "type": "opening_hours" + }, + "mappings": [ + { + "if": "opening_hours=24/7", + "then": { + "en": "24/7", + "nl": "24/7" + } + } + ] } ], - "filter": [] + "filter": [ + { + "id": "isOpen", + "options": [ + { + "question": { + "en": "Currently open", + "nl": "Op dit moment open" + }, + "osmTags": "_isOpen=yes" + } + ] + }, + { + "id": "recyclingType", + "options": [ + { + "question": { + "en": "All recycling types", + "nl": "Alle recyclingtypes" + } + }, + { + "question": { + "en": "Recycling of batteries", + "nl": "Recycling van batterijen" + }, + "osmTags": "recycling:batteries=yes" + }, + { + "question": { + "en": "Recycling of beverage cartons", + "nl": "Recycling van drankpakken" + }, + "osmTags": "recycling:beverage_cartons=yes" + }, + { + "question": { + "en": "Recycling of cans", + "nl": "Recycling van blikken" + }, + "osmTags": "recycling:cans=yes" + }, + { + "question": { + "en": "Recycling of clothes", + "nl": "Recycling van kleding" + }, + "osmTags": "recycling:clothes=yes" + }, + { + "question": { + "en": "Recycling of cooking oil", + "nl": "Recycling van frituurvet" + }, + "osmTags": "recycling:cooking_oil=yes" + }, + { + "question": { + "en": "Recycling of engine oil", + "nl": "Recycling van motorolie" + }, + "osmTags": "recycling:engine_oil=yes" + }, + { + "question": { + "en": "Recycling of green waste", + "nl": "Recycling van groen afval" + }, + "osmTags": "recycling:green_waste=yes" + }, + { + "question": { + "en": "Recycling of glass bottles", + "nl": "Recycling van glazen flessen" + }, + "osmTags": "recycling:glass_bottles=yes" + }, + { + "question": { + "en": "Recycling of glass", + "nl": "Recycling van glas" + }, + "osmTags": "recycling:glass=yes" + }, + { + "question": { + "en": "Recycling of newspapers", + "nl": "Recycling van kranten" + }, + "osmTags": "recycling:newspaper=yes" + }, + { + "question": { + "en": "Recycling of paper", + "nl": "Recycling van papier" + }, + "osmTags": "recycling:paper=yes" + }, + { + "question": { + "en": "Recycling of plastic bottles", + "nl": "Recycling van plastic flessen" + }, + "osmTags": "recycling:plastic_bottles=yes" + }, + { + "question": { + "en": "Recycling of plastic packaging", + "nl": "Recycling van plastic verpakking" + }, + "osmTags": "recycling:plastic_packaging=yes" + }, + { + "question": { + "en": "Recycling of plastic", + "nl": "Recycling van plastic" + }, + "osmTags": "recycling:plastic=yes" + }, + { + "question": { + "en": "Recycling of scrap metal", + "nl": "Recycling van oud metaal" + }, + "osmTags": "recycling:scrap_metal=yes" + }, + { + "question": { + "en": "Recycling of small electrical appliances", + "nl": "Recycling van kleine elektrische apparaten" + }, + "osmTags": "recycling:small_electrical_appliances=yes" + } + + ] + } + ] } \ No newline at end of file diff --git a/assets/layers/recycling/scrap_metal.svg b/assets/layers/recycling/scrap_metal.svg new file mode 100644 index 000000000..9ff4dfeeb --- /dev/null +++ b/assets/layers/recycling/scrap_metal.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/shoes.svg b/assets/layers/recycling/shoes.svg new file mode 100644 index 000000000..0a5bd834e --- /dev/null +++ b/assets/layers/recycling/shoes.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/small_electrical_appliances.svg b/assets/layers/recycling/small_electrical_appliances.svg new file mode 100644 index 000000000..b5529c91f --- /dev/null +++ b/assets/layers/recycling/small_electrical_appliances.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +