From cb21eb4b48c91010c0f50357974c29ccd676e841 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 22 Sep 2013 10:09:56 -0500
Subject: [PATCH] Add stop sign preset and backrest field

---
 data/presets.yaml                       |  5 +++++
 data/presets/fields.json                |  5 +++++
 data/presets/fields/backrest.json       |  5 +++++
 data/presets/presets.json               | 15 +++++++++++++++
 data/presets/presets/amenity/bench.json |  5 ++++-
 data/presets/presets/highway/stop.json  | 12 ++++++++++++
 dist/locales/en.json                    |  7 +++++++
 7 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/backrest.json
 create mode 100644 data/presets/presets/highway/stop.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 67039d551..27fce5861 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -64,6 +64,8 @@ en:
         label: Type
       atm: 
         label: ATM
+      backrest: 
+        label: Backrest
       barrier: 
         label: Type
       bicycle_parking: 
@@ -623,6 +625,9 @@ en:
       highway/steps: 
         name: Steps
         terms: "<translate with synonyms or related terms for 'Steps', separated by commas>"
+      highway/stop: 
+        name: Stop Sign
+        terms: "<translate with synonyms or related terms for 'Stop Sign', separated by commas>"
       highway/tertiary: 
         name: Tertiary Road
         terms: "<translate with synonyms or related terms for 'Tertiary Road', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ea2d226fc..21bd802e1 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -109,6 +109,11 @@
         "type": "check",
         "label": "ATM"
     },
+    "backrest": {
+        "key": "backrest",
+        "type": "check",
+        "label": "Backrest"
+    },
     "barrier": {
         "key": "barrier",
         "type": "combo",
diff --git a/data/presets/fields/backrest.json b/data/presets/fields/backrest.json
new file mode 100644
index 000000000..c9ee67272
--- /dev/null
+++ b/data/presets/fields/backrest.json
@@ -0,0 +1,5 @@
+{
+    "key": "backrest",
+    "type": "check",
+    "label": "Backrest"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0199325e4..e58ad92a2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -269,6 +269,9 @@
         "tags": {
             "amenity": "bench"
         },
+        "fields": [
+            "backrest"
+        ],
         "name": "Bench"
     },
     "amenity/bicycle_parking": {
@@ -2128,6 +2131,18 @@
         ],
         "name": "Steps"
     },
+    "highway/stop": {
+        "geometry": [
+            "vertex"
+        ],
+        "tags": {
+            "highway": "stop"
+        },
+        "terms": [
+            "stop sign"
+        ],
+        "name": "Stop Sign"
+    },
     "highway/tertiary": {
         "icon": "highway-tertiary",
         "fields": [
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index 937c30e80..cc012c748 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -7,5 +7,8 @@
     "tags": {
         "amenity": "bench"
     },
+    "fields": [
+        "backrest"
+    ],
     "name": "Bench"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/stop.json b/data/presets/presets/highway/stop.json
new file mode 100644
index 000000000..705ac1c32
--- /dev/null
+++ b/data/presets/presets/highway/stop.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "stop"
+    },
+    "terms": [
+        "stop sign"
+    ],
+    "name": "Stop Sign"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 10151bcdb..c81984940 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -469,6 +469,9 @@
             "atm": {
                 "label": "ATM"
             },
+            "backrest": {
+                "label": "Backrest"
+            },
             "barrier": {
                 "label": "Type"
             },
@@ -1237,6 +1240,10 @@
                 "name": "Steps",
                 "terms": "stairs,staircase"
             },
+            "highway/stop": {
+                "name": "Stop Sign",
+                "terms": "stop sign"
+            },
             "highway/tertiary": {
                 "name": "Tertiary Road",
                 "terms": ""