Merge remote-tracking branch 'origin/master'

walk_amenities.yaml

@@ -14,7 +14,7 @@ query:
     node[information];
     node[tourism~"^(viewpoint)$"];
     node[man_made~"^(cairn)$"];
-    nwr[amenity~"^(bench|shelter)$"];
+    nwr[amenity~"^(bench|shelter|waste_basket|drinking_water)$"];
     node[leisure~"^(picnic_table)$"];
     way[highway~'^(footway|steps)$'][conveying];
     )
@@ -23,7 +23,7 @@ feature:
     {% if tags.information %}
       {% set key = 'information' %}
       {% set value = tags.information %}
-    {% elseif tags.amenity in [ 'bench', 'shelter' ] %}
+    {% elseif tags.amenity in [ 'bench', 'shelter', 'waste_basket', 'drinking_water' ] %}
       {% set key = 'amenity' %}
       {% set value = tags.amenity %}
     {% elseif tags.leisure in [ 'picnic_table' ] %}
@@ -91,6 +91,12 @@ const:
   amenity=shelter:
     priority: 1
     sign: <img data-src='maki:shelter'>
+  amenity=waste_basket:
+    priority: 2
+    sign: 🗑
+  amenity=drinking_water:
+    priority: 3
+    sign: <img data-src='maki:drinking-water'>
   highway=steps conveying:
     sign: /
     query: way[highway=steps][conveying]

walk_amenities_qa.yaml

@@ -14,7 +14,7 @@ query:
     node[information];
     node[tourism~"^(viewpoint)$"];
     node[man_made~"^(cairn)$"];
-    nwr[amenity~"^(bench|shelter)$"];
+    nwr[amenity~"^(bench|shelter|waste_basket|drinking_water)$"];
     node[leisure~"^(picnic_table)$"];
     way[highway~'^(footway|steps)$'][conveying];
     )
@@ -23,7 +23,7 @@ feature:
     {% if tags.information %}
       {% set key = 'information' %}
       {% set value = tags.information %}
-    {% elseif tags.amenity in [ 'bench', 'shelter' ] %}
+    {% elseif tags.amenity in [ 'bench', 'shelter', 'waste_basket', 'drinking_water' ] %}
       {% set key = 'amenity' %}
       {% set value = tags.amenity %}
     {% elseif tags.leisure in [ 'picnic_table' ] %}
@@ -98,7 +98,7 @@ filter:
 const:
   highway=crossing:
     priority: 10
-    sign: <i class='fa fa-bars' aria-hidden='true'></i>
+    sign: <img data-src='temaki:pedestrian_crosswalk'>
     require:
     - crossing
     optional:
@@ -107,7 +107,7 @@ const:
     - lit
   highway=elevator:
     priority: 2
-    sign: <i class='fa fa-caret-square-o-up' aria-hidden='true'></i>
+    sign: <img data-src='maki:elevator'>
     require:
     - level
     - wheelchair
@@ -205,6 +205,24 @@ const:
     - picnic_table
     - access
     - lockable
+  amenity=waste_basket:
+    priority: 2
+    sign: 🗑
+    require:
+    - waste
+    optional:
+    - drive_through
+  amenity=drinking_water:
+    priority: 3
+    sign: <img data-src='maki:drinking-water'>
+    require:
+    optional:
+    - man_made
+    - fountain
+    - dog
+    - pump
+    - fee
+    - bottle
   highway=steps conveying:
     sign: /
     query: nwr[highway=steps][conveying]