Use new maki icons

data/locales/en.js

@@ -771,6 +771,10 @@ locale.en = {
                 "name": "University",
                 "terms": ""
             },
+            "amenity/waste_basket": {
+                "name": "Waste Basket",
+                "terms": "rubbish bin,litter bin,trash can,garbage can"
+            },
             "barrier": {
                 "name": "Barrier",
                 "terms": ""
@@ -859,6 +863,10 @@ locale.en = {
                 "name": "House",
                 "terms": ""
             },
+            "emergency/phone": {
+                "name": "Emergency Phone",
+                "terms": ""
+            },
             "entrance": {
                 "name": "Entrance",
                 "terms": ""

data/presets.yaml

@@ -326,6 +326,9 @@ en:
       amenity/university: 
         name: University
         terms: ""
+      amenity/waste_basket: 
+        name: Waste Basket
+        terms: "rubbish bin,litter bin,trash can,garbage can"
       barrier: 
         name: Barrier
         terms: ""
@@ -392,6 +395,9 @@ en:
       building/house: 
         name: House
         terms: ""
+      emergency/phone: 
+        name: Emergency Phone
+        terms: ""
       entrance: 
         name: Entrance
         terms: ""

data/presets/presets.json

@@ -769,6 +769,7 @@
         "name": "Swimming Pool"
     },
     "amenity/telephone": {
+        "icon": "telephone",
         "geometry": [
             "point",
             "vertex"
@@ -858,6 +859,23 @@
         "terms": [],
         "name": "University"
     },
+    "amenity/waste_basket": {
+        "icon": "waste-basket",
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "amenity": "waste_basket"
+        },
+        "terms": [
+            "rubbish bin",
+            "litter bin",
+            "trash can",
+            "garbage can"
+        ],
+        "name": "Waste Basket"
+    },
     "barrier": {
         "geometry": [
             "point",
@@ -1123,6 +1141,20 @@
         },
         "name": "House"
     },
+    "emergency/phone": {
+        "icon": "emergency-telephone",
+        "fields": [
+            "operator"
+        ],
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "emergency": "phone"
+        },
+        "name": "Emergency Phone"
+    },
     "entrance": {
         "geometry": [
             "vertex"

data/presets/presets/amenity/telephone.json

@@ -1,4 +1,5 @@
 {
+    "icon": "telephone",
     "geometry": [
         "point",
         "vertex"

data/presets/presets/amenity/waste_basket.json

@@ -0,0 +1,17 @@
+{
+    "icon": "waste-basket",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket"
+    },
+    "terms": [
+        "rubbish bin",
+        "litter bin",
+        "trash can",
+        "garbage can"
+    ],
+    "name": "Waste Basket"
+}

data/presets/presets/emergency/phone.json

@@ -0,0 +1,14 @@
+{
+    "icon": "emergency-telephone",
+    "fields": [
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "emergency": "phone"
+    },
+    "name": "Emergency Phone"
+}