Add icon for amenity=bench and amenity=waste_basket

* Add icon for amenity=bench from z18 (resolves #194)
* Add icon for amenity=waste_basket from z19 (resolves #418)

amenity-points.mss

@@ -762,6 +762,18 @@
       }
     }
   }
+
+  [amenity = 'bench'][zoom >= 19]::amenity {
+    marker-file: url('symbols/bench.16.svg');
+    marker-fill: #744a08;
+    marker-placement: interior;
+  }
+
+  [amenity = 'waste_basket'][zoom >= 19]::amenity {
+    marker-file: url('symbols/waste_basket.10.svg');
+    marker-fill: #744a08;
+    marker-placement: interior;
+  }
 }
 
 /* Note that .text is also used in water.mss */

project.mml

@@ -1999,7 +1999,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    amenity,\n    railway,\n    highway,\n    barrier,\n    access\n  FROM planet_osm_point\n  WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')\n     OR highway IN ('mini_roundabout')\n     OR railway = 'level_crossing'\n     OR amenity IN ('parking', 'bicycle_parking')\n  ) AS amenity_low_priority",
+        "table": "(SELECT\n    way,\n    amenity,\n    railway,\n    highway,\n    barrier,\n    access,\n    CASE WHEN amenity='waste_basket' THEN 2 ELSE 1 END AS prio\n  FROM planet_osm_point p\n  WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')\n     OR highway IN ('mini_roundabout')\n     OR railway = 'level_crossing'\n     OR amenity IN ('parking', 'bicycle_parking', 'bench', 'waste_basket')\n  ORDER BY prio\n  ) AS amenity_low_priority",
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",

project.yaml

@@ -2108,12 +2108,14 @@ Layer:
             railway,
             highway,
             barrier,
-            access
-          FROM planet_osm_point
+            access,
+            CASE WHEN amenity='waste_basket' THEN 2 ELSE 1 END AS prio
+          FROM planet_osm_point p
           WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')
              OR highway IN ('mini_roundabout')
              OR railway = 'level_crossing'
-             OR amenity IN ('parking', 'bicycle_parking')
+             OR amenity IN ('parking', 'bicycle_parking', 'bench', 'waste_basket')
+          ORDER BY prio
           ) AS amenity_low_priority
     properties:
       minzoom: 14