From 4656776d248a418804026d01b60b9739cf167e74 Mon Sep 17 00:00:00 2001
From: Henning von See <henning@vonsee.de>
Date: Wed, 25 Nov 2015 16:41:33 +0100
Subject: [PATCH 1/2] New presets for the different types of vending machines

---
 .../amenity/vending_machine/cigarettes.json   | 17 +++++++++++++++++
 .../amenity/vending_machine/condoms.json      | 17 +++++++++++++++++
 .../drinks.json}                              |  9 ++++-----
 .../vending_machine/excrement_bags.json       | 18 ++++++++++++++++++
 .../amenity/vending_machine/news_papers.json  | 17 +++++++++++++++++
 .../parcel_pickup_dropoff.json                | 19 +++++++++++++++++++
 .../vending_machine/parking_tickets.json      | 18 ++++++++++++++++++
 .../amenity/vending_machine/sweets.json       | 18 ++++++++++++++++++
 8 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 data/presets/presets/amenity/vending_machine/cigarettes.json
 create mode 100644 data/presets/presets/amenity/vending_machine/condoms.json
 rename data/presets/presets/amenity/{vending_machine.json => vending_machine/drinks.json} (55%)
 create mode 100644 data/presets/presets/amenity/vending_machine/excrement_bags.json
 create mode 100644 data/presets/presets/amenity/vending_machine/news_papers.json
 create mode 100644 data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
 create mode 100644 data/presets/presets/amenity/vending_machine/parking_tickets.json
 create mode 100644 data/presets/presets/amenity/vending_machine/sweets.json

diff --git a/data/presets/presets/amenity/vending_machine/cigarettes.json b/data/presets/presets/amenity/vending_machine/cigarettes.json
new file mode 100644
index 000000000..0e9c4c286
--- /dev/null
+++ b/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"
+}
diff --git a/data/presets/presets/amenity/vending_machine/condoms.json b/data/presets/presets/amenity/vending_machine/condoms.json
new file mode 100644
index 000000000..045877360
--- /dev/null
+++ b/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"
+}
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine/drinks.json
similarity index 55%
rename from data/presets/presets/amenity/vending_machine.json
rename to data/presets/presets/amenity/vending_machine/drinks.json
index 299b06710..9473f08f9 100644
--- a/data/presets/presets/amenity/vending_machine.json
+++ b/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"
 }
diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json
new file mode 100644
index 000000000..6ffcbe63c
--- /dev/null
+++ b/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"
+}
diff --git a/data/presets/presets/amenity/vending_machine/news_papers.json b/data/presets/presets/amenity/vending_machine/news_papers.json
new file mode 100644
index 000000000..39f09a65f
--- /dev/null
+++ b/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"
+}
diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
new file mode 100644
index 000000000..7f204fd94
--- /dev/null
+++ b/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"
+}
diff --git a/data/presets/presets/amenity/vending_machine/parking_tickets.json b/data/presets/presets/amenity/vending_machine/parking_tickets.json
new file mode 100644
index 000000000..3c7192dee
--- /dev/null
+++ b/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"
+}
diff --git a/data/presets/presets/amenity/vending_machine/sweets.json b/data/presets/presets/amenity/vending_machine/sweets.json
new file mode 100644
index 000000000..600289fb1
--- /dev/null
+++ b/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"
+}

From ef87883c0abbc68c7a9448fbf8f9fa466b59a1f4 Mon Sep 17 00:00:00 2001
From: Henning von See <henning@vonsee.de>
Date: Wed, 25 Nov 2015 17:47:34 +0100
Subject: [PATCH 2/2] Corrected JSON

---
 .../presets/amenity/vending_machine/parcel_pickup_dropoff.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
index 7f204fd94..52da866d9 100644
--- a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
+++ b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
@@ -9,7 +9,7 @@
     "terms": [
         "parcel",
         "mail",
-        "pickup
+        "pickup"
     ],
     "tags": {
         "amenity": "vending_machine",