From 391a32f0f4fc612ad9b5d19c77c19e3a8415175f Mon Sep 17 00:00:00 2001
From: tyr <tyr.asd@gmail.com>
Date: Mon, 9 Sep 2013 10:50:15 +0200
Subject: [PATCH] add preset for amenity=vending_machine

---
 data/presets.yaml                                 |  5 +++++
 data/presets/fields.json                          |  5 +++++
 data/presets/fields/vending.json                  |  5 +++++
 data/presets/presets.json                         | 13 +++++++++++++
 data/presets/presets/amenity/vending_machine.json | 13 +++++++++++++
 dist/locales/en.json                              |  7 +++++++
 6 files changed, 48 insertions(+)
 create mode 100644 data/presets/fields/vending.json
 create mode 100644 data/presets/presets/amenity/vending_machine.json

diff --git a/data/presets.yaml b/data/presets.yaml
index e1cc00fb2..11b233f7e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -248,6 +248,8 @@ en:
         label: Type
       trail_visibility: 
         label: Trail Visibility
+      vending: 
+        label: Type of Goods
       water: 
         label: Type
       waterway: 
@@ -438,6 +440,9 @@ en:
       amenity/university: 
         name: University
         terms: "<translate with synonyms or related terms for 'University', separated by commas>"
+      amenity/vending_machine: 
+        name: Vending Machine
+        terms: "<translate with synonyms or related terms for 'Vending Machine', separated by commas>"
       amenity/waste_basket: 
         name: Waste Basket
         terms: "<translate with synonyms or related terms for 'Waste Basket', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 8814a44fa..ea2d226fc 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -613,6 +613,11 @@
         "type": "combo",
         "label": "Trail Visibility"
     },
+    "vending": {
+        "key": "vending",
+        "type": "combo",
+        "label": "Type of Goods"
+    },
     "water": {
         "key": "water",
         "type": "combo",
diff --git a/data/presets/fields/vending.json b/data/presets/fields/vending.json
new file mode 100644
index 000000000..c4c47bcf8
--- /dev/null
+++ b/data/presets/fields/vending.json
@@ -0,0 +1,5 @@
+{
+    "key": "vending",
+    "type": "combo",
+    "label": "Type of Goods"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8c5ce21f7..19da24ab5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1188,6 +1188,19 @@
         ],
         "name": "University"
     },
+    "amenity/vending_machine": {
+        "fields": [
+            "vending",
+            "operator"
+        ],
+        "geometry": [
+            "point"
+        ],
+        "tags": {
+            "amenity": "vending_machine"
+        },
+        "name": "Vending Machine"
+    },
     "amenity/waste_basket": {
         "icon": "waste-basket",
         "geometry": [
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json
new file mode 100644
index 000000000..2a0098527
--- /dev/null
+++ b/data/presets/presets/amenity/vending_machine.json
@@ -0,0 +1,13 @@
+{
+    "fields": [
+        "vending",
+        "operator"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "amenity": "vending_machine"
+    },
+    "name": "Vending Machine"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 26bc545de..8eaba8648 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -726,6 +726,9 @@
             "trail_visibility": {
                 "label": "Trail Visibility"
             },
+            "vending": {
+                "label": "Type of Goods"
+            },
             "water": {
                 "label": "Type"
             },
@@ -982,6 +985,10 @@
                 "name": "University",
                 "terms": "college"
             },
+            "amenity/vending_machine": {
+                "name": "Vending Machine",
+                "terms": ""
+            },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
                 "terms": "rubbish bin,litter bin,trash can,garbage can"