Browse Source

waste: improvements; include man_made=incinerator and power=generator (waste)

pedestrian
parent
commit
81ac01d552
  1. 49
      waste.json

49
waste.json

@ -18,58 +18,66 @@
"13": [ "13": [
"(", "(",
"node[landuse=landfill];", "node[landuse=landfill];",
"node[man_made=wastewater_plant];",
"node[man_made~\"^(wastewater_plant|incinerator)$\"];",
"node[amenity=recycling][recycling_type=centre];", "node[amenity=recycling][recycling_type=centre];",
"way[landuse=landfill];", "way[landuse=landfill];",
"way[man_made=wastewater_plant];",
"way[man_made~\"^(wastewater_plant|incinerator)$\"];",
"way[amenity=recycling][recycling_type=centre];", "way[amenity=recycling][recycling_type=centre];",
"relation[landuse=landfill];", "relation[landuse=landfill];",
"relation[man_made=wastewater_plant];",
"relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
"relation[amenity=recycling][recycling_type=centre];", "relation[amenity=recycling][recycling_type=centre];",
"nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
")" ")"
], ],
"15": [ "15": [
"(", "(",
"node[landuse=landfill];", "node[landuse=landfill];",
"node[man_made=wastewater_plant];",
"node[man_made~\"^(wastewater_plant|incinerator)$\"];",
"node[amenity=recycling];", "node[amenity=recycling];",
"way[landuse=landfill];", "way[landuse=landfill];",
"way[man_made=wastewater_plant];",
"way[man_made~\"^(wastewater_plant|incinerator)$\"];",
"way[amenity=recycling];", "way[amenity=recycling];",
"relation[landuse=landfill];", "relation[landuse=landfill];",
"relation[man_made=wastewater_plant];",
"relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
"relation[amenity=recycling];", "relation[amenity=recycling];",
"nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
")" ")"
], ],
"18": [ "18": [
"(", "(",
"node[landuse=landfill];", "node[landuse=landfill];",
"node[man_made=wastewater_plant];",
"node[man_made~\"^(wastewater_plant|incinerator)$\"];",
"node[amenity~\"^(recycling|waste_basket)$\"];", "node[amenity~\"^(recycling|waste_basket)$\"];",
"way[landuse=landfill];", "way[landuse=landfill];",
"way[man_made=wastewater_plant];",
"way[man_made~\"^(wastewater_plant|incinerator)$\"];",
"way[amenity=recycling];", "way[amenity=recycling];",
"relation[landuse=landfill];", "relation[landuse=landfill];",
"relation[man_made=wastewater_plant];",
"relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
"relation[amenity=recycling];", "relation[amenity=recycling];",
"nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
")" ")"
] ]
}, },
"feature": { "feature": {
"pre": [ "pre": [
"{% set add = '' %}",
"{% if tags.landuse == 'landfill' %}", "{% if tags.landuse == 'landfill' %}",
" {% set key = 'landuse' %}", " {% set key = 'landuse' %}",
" {% set value = tags.landuse %}", " {% set value = tags.landuse %}",
"{% elseif tags.man_made == 'wastewater_plant' %}",
"{% elseif tags.man_made in [ 'incinerator', 'wastewater_plant' ] %}",
" {% set key = 'man_made' %}", " {% set key = 'man_made' %}",
" {% set value = tags.man_made %}", " {% set value = tags.man_made %}",
"{% elseif tags.amenity == 'recycling' or tags.amenity == 'waste_basket' %}", "{% elseif tags.amenity == 'recycling' or tags.amenity == 'waste_basket' %}",
" {% set key = 'amenity' %}", " {% set key = 'amenity' %}",
" {% set value = tags.amenity %}", " {% set value = tags.amenity %}",
"{% elseif tags.power == 'generator' %}",
" {% set key = 'power' %}",
" {% set value = tags.power %}",
" {% set add = '(' ~ tagTransList('generator:source', attribute(tags, 'generator:source')) ~ ')' %}",
"{% endif %}", "{% endif %}",
"{% set kv = key ~ '=' ~ value %}" "{% set kv = key ~ '=' ~ value %}"
], ],
"description": "{{ tagTrans(key, value) }}",
"description": "{{ tagTrans(key, value) }} {{ add }}",
"body": [ "body": [
"{% if tags.recycling_type %}", "{% if tags.recycling_type %}",
"{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}", "{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}",
@ -89,7 +97,7 @@
" {% set value = kv|split('=')[1] %}", " {% set value = kv|split('=')[1] %}",
" <tr>", " <tr>",
" <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>", " <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
" <td>{{ tagTrans('leisure', value) }}</td>",
" <td>{{ tagTrans(key, value) }}{% if data.add %} ({{ trans(data.add) }}){% endif %}</td>",
" </tr>", " </tr>",
" {% endif %}", " {% endif %}",
"{% endfor %}", "{% endfor %}",
@ -102,11 +110,24 @@
"const": { "const": {
"amenity=recycling": { "amenity=recycling": {
"minZoom": 13, "minZoom": 13,
"sign": "<img src='maki:recycling'>"
"sign": "<img data-src='maki:recycling'>"
},
"man_made=wastewater_plant": {
"minZoom": 13,
"sign": "<i class='fas fa-water'></i>"
},
"man_made=incinerator": {
"minZoom": 13,
"sign": "<i class='fas fa-burn'></i>"
},
"power=generator": {
"minZoom": 13,
"sign": "<i class='fas fa-bolt'></i>",
"add": "tag:generator:source=waste"
}, },
"amenity=waste_basket": { "amenity=waste_basket": {
"minZoom": 18, "minZoom": 18,
"sign": "<img src='maki:waste-basket'>"
"sign": "<img data-src='maki:waste-basket'>"
} }
} }
} }
Loading…
Cancel
Save