diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index c5b8edbd8..f25a0dce0 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -74,10 +74,10 @@
]
},
{
- "id": "container-underground",
+ "id": "container-location",
"question": {
- "en": "Is this container underground?",
- "nl": "Is deze container ondergrond?"
+ "en": "Where is this container located?",
+ "nl": "Waar bevindt deze container zich?"
},
"condition": "recycling_type=container",
"mappings": [
@@ -88,11 +88,18 @@
"nl": "Dit is een ondergrondse container"
}
},
+ {
+ "if": "location=indoor",
+ "then": {
+ "en": "This container is located indoors",
+ "nl": "Deze container bevindt binnen"
+ }
+ },
{
"if": "location=",
"then": {
- "en": "This container is not underground",
- "nl": "Deze container is niet ondergronds"
+ "en": "This container is located outdoors",
+ "nl": "Deze container is buiten"
}
}
]
@@ -414,7 +421,6 @@
},
"osmTags": "recycling:small_electrical_appliances=yes"
}
-
]
}
]
diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index 0e3ea89ed..26be51a28 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -208,7 +208,7 @@
"nl": "Vuilnisbak voor injectienaalden en andere scherpe voorwerpen",
"de": "Mülleimer für Nadeln und andere scharfe Gegenstände"
},
- "osmTags": "waste=sharps"
+ "osmTags": "waste=sharps"
}
]
},
diff --git a/assets/layers/waste_disposal/license_info.json b/assets/layers/waste_disposal/license_info.json
new file mode 100644
index 000000000..aeeec767e
--- /dev/null
+++ b/assets/layers/waste_disposal/license_info.json
@@ -0,0 +1,12 @@
+[
+ {
+ "path": "waste_disposal.svg",
+ "license": "CC0",
+ "authors": [
+ "kocio-pl"
+ ],
+ "sources": [
+ "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/waste_disposal.svg"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
new file mode 100644
index 000000000..5bf4faf8b
--- /dev/null
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -0,0 +1,88 @@
+{
+ "id": "waste_disposal",
+ "name": {
+ "en": "Waste Disposal Bins"
+ },
+ "description": {
+ "en": "Waste Disposal Bin, medium to large bin for disposal of (household) waste"
+ },
+ "source": {
+ "osmTags": "amenity=waste_disposal"
+ },
+ "minZoom": 12,
+ "title": {
+ "render": {
+ "en": "Waste Disposal"
+ }
+ },
+ "mapRendering": [
+ {
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "icon": "./assets/layers/waste_disposal/waste_disposal.svg"
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "Waste Disposal Bin"
+ },
+ "tags": [
+ "amenity=waste_disposal"
+ ],
+ "description": {
+ "en": "Medium to large bin for disposal of (household) waste"
+ }
+ }
+ ],
+ "tagRenderings": [
+ {
+ "id": "access",
+ "render": {
+ "en": "Access: {access}"
+ },
+ "question": {
+ "en": "Who can use this waste disposal bin?"
+ },
+ "freeform": {
+ "key": "access",
+ "type": "string"
+ },
+ "mappings": [
+ {
+ "if": "access=yes",
+ "then": {
+ "en": "This bin can be used by anyone"
+ }
+ },
+ {
+ "if": "access=no",
+ "then": {
+ "en": "This bin is private"
+ }
+ },
+ {
+ "if": "access=residents",
+ "then": {
+ "en": "This bin is only for residents"
+ }
+ }
+ ]
+ }
+ ],
+ "filter": [
+ {
+ "id": "public-access",
+ "options": [
+ {
+ "question": {
+ "en": "Only public access"
+ },
+ "osmTags": "access=yes"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/assets/layers/waste_disposal/waste_disposal.svg b/assets/layers/waste_disposal/waste_disposal.svg
new file mode 100644
index 000000000..db755349c
--- /dev/null
+++ b/assets/layers/waste_disposal/waste_disposal.svg
@@ -0,0 +1,31 @@
+
+
diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json
index 74f481338..0ae398543 100644
--- a/assets/themes/waste/waste.json
+++ b/assets/themes/waste/waste.json
@@ -27,6 +27,9 @@
},
{
"builtin": "recycling"
+ },
+ {
+ "builtin": "waste_disposal"
}
]
}
\ No newline at end of file
diff --git a/langs/layers/de.json b/langs/layers/de.json
index dc35e9bcb..7155c02c7 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -3092,6 +3092,37 @@
},
"waste_basket": {
"description": "Dies ist ein öffentlicher Abfalleimer, in den Sie Ihren Müll entsorgen können.",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Alle Typen"
+ },
+ "1": {
+ "question": "Mülleimer für Zigaretten"
+ },
+ "2": {
+ "question": "Mülleimer für Drogen"
+ },
+ "3": {
+ "question": "Mülleimer für Hundekot"
+ },
+ "4": {
+ "question": "Mülleimer für allgemeinen Müll"
+ },
+ "5": {
+ "question": "Mülleimer für Nadeln und andere scharfe Gegenstände"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "Abfalleimer mit Spender für (Hunde-)Kotbeutel"
+ }
+ }
+ }
+ },
"mapRendering": {
"0": {
"iconSize": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 59d75cc71..c9a347aa7 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3620,6 +3620,180 @@
"render": "Bookcase"
}
},
+ "recycling": {
+ "description": "A layer with recycling containers and centres",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Currently open"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "All recycling types"
+ },
+ "1": {
+ "question": "Recycling of batteries"
+ },
+ "2": {
+ "question": "Recycling of beverage cartons"
+ },
+ "3": {
+ "question": "Recycling of cans"
+ },
+ "4": {
+ "question": "Recycling of clothes"
+ },
+ "5": {
+ "question": "Recycling of cooking oil"
+ },
+ "6": {
+ "question": "Recycling of engine oil"
+ },
+ "7": {
+ "question": "Recycling of green waste"
+ },
+ "8": {
+ "question": "Recycling of glass bottles"
+ },
+ "9": {
+ "question": "Recycling of glass"
+ },
+ "10": {
+ "question": "Recycling of newspapers"
+ },
+ "11": {
+ "question": "Recycling of paper"
+ },
+ "12": {
+ "question": "Recycling of plastic bottles"
+ },
+ "13": {
+ "question": "Recycling of plastic packaging"
+ },
+ "14": {
+ "question": "Recycling of plastic"
+ },
+ "15": {
+ "question": "Recycling of scrap metal"
+ },
+ "16": {
+ "question": "Recycling of small electrical appliances"
+ }
+ }
+ }
+ },
+ "name": "Recycling",
+ "presets": {
+ "0": {
+ "title": "recycling container"
+ },
+ "1": {
+ "title": "recycling centre"
+ }
+ },
+ "tagRenderings": {
+ "container-location": {
+ "mappings": {
+ "0": {
+ "then": "This is an underground container"
+ },
+ "1": {
+ "then": "This container is located indoors"
+ },
+ "2": {
+ "then": "This container is located outdoors"
+ }
+ },
+ "question": "Where is this container located?"
+ },
+ "opening_hours": {
+ "mappings": {
+ "0": {
+ "then": "24/7"
+ }
+ },
+ "question": "What are the opening hours of this recycling facility?"
+ },
+ "operator": {
+ "question": "What company operates this recycling facility?",
+ "render": "This recycling facility is operated by {operator}"
+ },
+ "recycling-accepts": {
+ "mappings": {
+ "0": {
+ "then": "
Batteries can be recycled here
"
+ },
+ "1": {
+ "then": " Beverage cartons can be recycled here
"
+ },
+ "2": {
+ "then": " Cans can be recycled here
"
+ },
+ "3": {
+ "then": " Clothes can be recycled here
"
+ },
+ "4": {
+ "then": " Cooking oil can be recycled here
"
+ },
+ "5": {
+ "then": " Engine oil can be recycled here
"
+ },
+ "6": {
+ "then": " Green waste can be recycled here
"
+ },
+ "7": {
+ "then": " Glass bottles can be recycled here
"
+ },
+ "8": {
+ "then": " Glass can be recycled here
"
+ },
+ "9": {
+ "then": " Newspapers can be recycled here
"
+ },
+ "10": {
+ "then": " Paper can be recycled here
"
+ },
+ "11": {
+ "then": " Plastic bottles can be recycled here
"
+ },
+ "12": {
+ "then": " Plastic packaging can be recycled here
"
+ },
+ "13": {
+ "then": " Plastic can be recycled here
"
+ },
+ "14": {
+ "then": " Scrap metal can be recycled here
"
+ },
+ "15": {
+ "then": " Shoes can be recycled here
"
+ },
+ "16": {
+ "then": " Small electrical appliances can be recycled here
"
+ }
+ },
+ "question": "What can be recycled here?"
+ },
+ "recycling-type": {
+ "mappings": {
+ "0": {
+ "then": "This is a recycling container"
+ },
+ "1": {
+ "then": "This is a recycling centre"
+ }
+ },
+ "question": "What type of recycling is this?"
+ }
+ },
+ "title": {
+ "render": "Recycling facility"
+ }
+ },
"shops": {
"description": "A shop",
"name": "Shop",
@@ -4462,6 +4636,37 @@
},
"waste_basket": {
"description": "This is a public waste basket, thrash can, where you can throw away your thrash.",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "All types"
+ },
+ "1": {
+ "question": "Waste basket for cigarettes"
+ },
+ "2": {
+ "question": "Waste basket for drugs"
+ },
+ "3": {
+ "question": "Waste basket for dog excrement"
+ },
+ "4": {
+ "question": "Waste basket for trash"
+ },
+ "5": {
+ "question": "Waste basket for sharps"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "Waste basket with dispenser for (dog) excrement bags"
+ }
+ }
+ }
+ },
"mapRendering": {
"0": {
"iconSize": {
@@ -4522,6 +4727,45 @@
"render": "Waste Basket"
}
},
+ "waste_disposal": {
+ "description": "Waste Disposal Bin, medium to large bin for disposal of (household) waste",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Only public access"
+ }
+ }
+ }
+ },
+ "name": "Waste Disposal Bins",
+ "presets": {
+ "0": {
+ "description": "Medium to large bin for disposal of (household) waste",
+ "title": "Waste Disposal Bin"
+ }
+ },
+ "tagRenderings": {
+ "access": {
+ "mappings": {
+ "0": {
+ "then": "This bin can be used by anyone"
+ },
+ "1": {
+ "then": "This bin is private"
+ },
+ "2": {
+ "then": "This bin is only for residents"
+ }
+ },
+ "question": "Who can use this waste disposal bin?",
+ "render": "Access: {access}"
+ }
+ },
+ "title": {
+ "render": "Waste Disposal"
+ }
+ },
"watermill": {
"name": "Watermill"
}
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 03a8e7a83..50ea195a9 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3606,6 +3606,180 @@
"render": "Boekenruilkast"
}
},
+ "recycling": {
+ "description": "Een laag met recyclagingcontainers en -centrums",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Op dit moment open"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "Alle recyclingtypes"
+ },
+ "1": {
+ "question": "Recycling van batterijen"
+ },
+ "2": {
+ "question": "Recycling van drankpakken"
+ },
+ "3": {
+ "question": "Recycling van blikken"
+ },
+ "4": {
+ "question": "Recycling van kleding"
+ },
+ "5": {
+ "question": "Recycling van frituurvet"
+ },
+ "6": {
+ "question": "Recycling van motorolie"
+ },
+ "7": {
+ "question": "Recycling van groen afval"
+ },
+ "8": {
+ "question": "Recycling van glazen flessen"
+ },
+ "9": {
+ "question": "Recycling van glas"
+ },
+ "10": {
+ "question": "Recycling van kranten"
+ },
+ "11": {
+ "question": "Recycling van papier"
+ },
+ "12": {
+ "question": "Recycling van plastic flessen"
+ },
+ "13": {
+ "question": "Recycling van plastic verpakking"
+ },
+ "14": {
+ "question": "Recycling van plastic"
+ },
+ "15": {
+ "question": "Recycling van oud metaal"
+ },
+ "16": {
+ "question": "Recycling van kleine elektrische apparaten"
+ }
+ }
+ }
+ },
+ "name": "Recycling",
+ "presets": {
+ "0": {
+ "title": "recycling container"
+ },
+ "1": {
+ "title": "recycling centre"
+ }
+ },
+ "tagRenderings": {
+ "container-location": {
+ "mappings": {
+ "0": {
+ "then": "Dit is een ondergrondse container"
+ },
+ "1": {
+ "then": "Deze container bevindt binnen"
+ },
+ "2": {
+ "then": "Deze container is buiten"
+ }
+ },
+ "question": "Waar bevindt deze container zich?"
+ },
+ "opening_hours": {
+ "mappings": {
+ "0": {
+ "then": "24/7"
+ }
+ },
+ "question": "Wat zijn de openingstijden van deze recyclingfaciliteit?"
+ },
+ "operator": {
+ "question": "Wat is de beheerder van deze recyclingfaciliteit?",
+ "render": "Deze recyclingfaciliteit wordt beheerd door {operator}"
+ },
+ "recycling-accepts": {
+ "mappings": {
+ "0": {
+ "then": " Batterijen kunnen hier gerecycled worden
"
+ },
+ "1": {
+ "then": " Drankpakken kunnen hier gerecycled worden
"
+ },
+ "2": {
+ "then": " Blikken kunnen hier gerecycled worden
"
+ },
+ "3": {
+ "then": " Kleren kunnen hier gerecycled worden
"
+ },
+ "4": {
+ "then": " Frituurvet kan hier gerecycled worden
"
+ },
+ "5": {
+ "then": " Motorolie kan hier gerecycled worden
"
+ },
+ "6": {
+ "then": " Groen afval kan hier gerecycled worden
"
+ },
+ "7": {
+ "then": " Glazen flessen kunnen hier gerecycled worden
"
+ },
+ "8": {
+ "then": " Glas kan hier gerecycled worden
"
+ },
+ "9": {
+ "then": " Kranten kunnen hier gerecycled worden
"
+ },
+ "10": {
+ "then": " Papier kan hier gerecycled worden
"
+ },
+ "11": {
+ "then": " Plastic flessen kunnen hier gerecycled worden
"
+ },
+ "12": {
+ "then": " Plastic verpakking kan hier gerecycled worden
"
+ },
+ "13": {
+ "then": " Plastic kan hier gerecycled worden
"
+ },
+ "14": {
+ "then": " Oud metaal kan hier gerecycled worden
"
+ },
+ "15": {
+ "then": " Schoenen kunnen hier gerecycled worden
"
+ },
+ "16": {
+ "then": " Kleine elektronische apparaten kunnen hier gerecycled worden
"
+ }
+ },
+ "question": "Wat kan hier gerecycled worden?"
+ },
+ "recycling-type": {
+ "mappings": {
+ "0": {
+ "then": "Dit is een recyclingcontainer"
+ },
+ "1": {
+ "then": "Dit is een recyclingcentrum"
+ }
+ },
+ "question": "Wat voor soort recycling is dit?"
+ }
+ },
+ "title": {
+ "render": "Recyclingfaciliteit"
+ }
+ },
"shops": {
"description": "Een winkel",
"name": "Winkel",
@@ -4512,6 +4686,37 @@
},
"waste_basket": {
"description": "Dit is een publieke vuilnisbak waar je je afval kan weggooien.",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Alle soorten"
+ },
+ "1": {
+ "question": "Vuilnisbak voor sigarettenpeuken"
+ },
+ "2": {
+ "question": "Vuilnisbak voor (vervallen) medicatie en drugs"
+ },
+ "3": {
+ "question": "Vuilnisbak voor hondenuitwerpselen"
+ },
+ "4": {
+ "question": "Vuilnisbak voor zwerfvuil"
+ },
+ "5": {
+ "question": "Vuilnisbak voor injectienaalden en andere scherpe voorwerpen"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "0": {
+ "question": "Vuilnisbak met verdeler voor hondenpoepzakjes"
+ }
+ }
+ }
+ },
"mapRendering": {
"0": {
"iconSize": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index cd69694b4..54d9eadd7 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1264,6 +1264,10 @@
},
"title": "UK Addresses"
},
+ "waste": {
+ "description": "Map showing waste baskets and recycling facilities.",
+ "title": "Waste"
+ },
"waste_basket": {
"description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself",
"shortDescription": "A map with waste baskets",
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 78f9277d0..5a12cc039 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1057,6 +1057,10 @@
}
}
},
+ "waste": {
+ "description": "Kaart met afvalbakken en recyclingfaciliteiten.",
+ "title": "Afval"
+ },
"waste_basket": {
"description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
"shortDescription": "Een kaart met vuilnisbakken",