From 9301b0750934c48f3ab668b838c39efe38214bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Wed, 13 Feb 2019 13:40:05 +0100
Subject: [PATCH] waste: include amenity=waste_disposal and
amenity=waste_transfer_station
---
waste.json | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/waste.json b/waste.json
index 7b48a8639..a91c4aae9 100644
--- a/waste.json
+++ b/waste.json
@@ -26,6 +26,7 @@
"relation[landuse=landfill];",
"relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
"relation[amenity=recycling][recycling_type=centre];",
+ "nwr[amenity=waste_transfer_station];",
"nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
")"
],
@@ -33,13 +34,13 @@
"(",
"node[landuse=landfill];",
"node[man_made~\"^(wastewater_plant|incinerator)$\"];",
- "node[amenity=recycling];",
+ "node[amenity~\"^(recycling|waste_disposal|waste_transfer_station)$\"];",
"way[landuse=landfill];",
"way[man_made~\"^(wastewater_plant|incinerator)$\"];",
- "way[amenity=recycling];",
+ "way[amenity~\"^(recycling|waste_disposal|waste_transfer_station)$\"];",
"relation[landuse=landfill];",
"relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
- "relation[amenity=recycling];",
+ "relation[amenity~\"^(recycling|waste_disposal|waste_transfer_station)$\"];",
"nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
")"
],
@@ -47,13 +48,13 @@
"(",
"node[landuse=landfill];",
"node[man_made~\"^(wastewater_plant|incinerator)$\"];",
- "node[amenity~\"^(recycling|waste_basket)$\"];",
+ "node[amenity~\"^(recycling|waste_basket|waste_disposal|waste_transfer_station)$\"];",
"way[landuse=landfill];",
"way[man_made~\"^(wastewater_plant|incinerator)$\"];",
- "way[amenity=recycling];",
+ "way[amenity~\"^(recycling|waste_basket|waste_disposal|waste_transfer_station)$\"];",
"relation[landuse=landfill];",
"relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
- "relation[amenity=recycling];",
+ "relation[amenity~\"^(recycling|waste_basket|waste_disposal|waste_transfer_station)$\"];",
"nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
")"
]
@@ -67,7 +68,7 @@
"{% elseif tags.man_made in [ 'incinerator', 'wastewater_plant' ] %}",
" {% set key = 'man_made' %}",
" {% set value = tags.man_made %}",
- "{% elseif tags.amenity == 'recycling' or tags.amenity == 'waste_basket' %}",
+ "{% elseif tags.amenity in [ 'recycling', 'waste_basket', 'waste_disposal', 'waste_transfer_station' ] %}",
" {% set key = 'amenity' %}",
" {% set value = tags.amenity %}",
"{% elseif tags.power == 'generator' %}",
@@ -125,6 +126,10 @@
"sign": "<i class='fas fa-bolt'></i>",
"add": "tag:generator:source=waste"
},
+ "amenity=waste_disposal": {
+ "minZoom": 15,
+ "sign": "<img data-src='maki:waste-basket'>"
+ },
"amenity=waste_basket": {
"minZoom": 18,
"sign": "<img data-src='maki:waste-basket'>"