Merge branch 'master' of https://github.com/henningvs/iD into henningvs-master

data/presets/presets/amenity/vending_machine/cigarettes.json

@@ -0,0 +1,17 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "cigarette"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "cigarettes"
+    },
+    "name": "Cigarette Vending Machine"
+}

data/presets/presets/amenity/vending_machine/condoms.json

@@ -0,0 +1,17 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "condom"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "condoms"
+    },
+    "name": "Condom Vending Machine"
+}

data/presets/presets/amenity/vending_machine/drinks.json

@@ -7,12 +7,11 @@
         "point"
     ],
     "terms": [
-        "snack",
-        "soda",
-        "ticket"
+        "drink"
     ],
     "tags": {
-        "amenity": "vending_machine"
+        "amenity": "vending_machine",
+        "vending": "drinks"
     },
-    "name": "Vending Machine"
+    "name": "Drinks Vending Machine"
 }

data/presets/presets/amenity/vending_machine/excrement_bags.json

@@ -0,0 +1,18 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "excrement bags",
+        "animal"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "excrement_bags"
+    },
+    "name": "Excrement Bag Vending Machine"
+}

data/presets/presets/amenity/vending_machine/news_papers.json

@@ -0,0 +1,17 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "newspaper"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "news_papers"
+    },
+    "name": "Newspaper Vending Machine"
+}

data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json

@@ -0,0 +1,19 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "parcel",
+        "mail",
+        "pickup"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "parcel_pickup;parcel_mail_in"
+    },
+    "name": "Parcel Pickup/Parcel Dropoff"
+}

data/presets/presets/amenity/vending_machine/parking_tickets.json

@@ -0,0 +1,18 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "parking",
+        "ticket"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "parking_tickets"
+    },
+    "name": "Parking Ticket Vending Machine"
+}

data/presets/presets/amenity/vending_machine/sweets.json

@@ -0,0 +1,18 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "sweet",
+        "soda"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "sweets"
+    },
+    "name": "Sweets Vending Machine"
+}