From 40537f2a570cb21fc343804b3171fe90f5a6591d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Wed, 25 Jun 2014 17:04:59 -0400
Subject: [PATCH] Add street lamp preset (fixes #2271)

---
 data/presets.yaml                             |  5 +++++
 data/presets/fields.json                      |  5 +++++
 data/presets/fields/lamp_type.json            |  5 +++++
 data/presets/presets.json                     | 21 +++++++++++++++++++
 data/presets/presets/highway/street_lamp.json | 21 +++++++++++++++++++
 dist/locales/en.json                          |  7 +++++++
 6 files changed, 64 insertions(+)
 create mode 100644 data/presets/fields/lamp_type.json
 create mode 100644 data/presets/presets/highway/street_lamp.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 907bfe302..714cc94d7 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -217,6 +217,8 @@ en:
           wlan: Wifi
           wired: Wired
           terminal: Terminal
+      lamp_type: 
+        label: Type
       landuse: 
         label: Type
       lanes: 
@@ -1098,6 +1100,9 @@ en:
       highway/stop: 
         name: Stop Sign
         terms: "<translate with synonyms or related terms for 'Stop Sign', separated by commas>"
+      highway/street_lamp: 
+        name: Street Lamp
+        terms: "<translate with synonyms or related terms for 'Street Lamp', 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 cf10c7ea2..3ceebe93f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -501,6 +501,11 @@
             }
         }
     },
+    "lamp_type": {
+        "key": "lamp_type",
+        "type": "combo",
+        "label": "Type"
+    },
     "landuse": {
         "key": "landuse",
         "type": "typeCombo",
diff --git a/data/presets/fields/lamp_type.json b/data/presets/fields/lamp_type.json
new file mode 100644
index 000000000..c7adadf30
--- /dev/null
+++ b/data/presets/fields/lamp_type.json
@@ -0,0 +1,5 @@
+{
+    "key": "lamp_type",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index eda3b52a2..a1e91e4d5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4256,6 +4256,27 @@
         ],
         "name": "Stop Sign"
     },
+    "highway/street_lamp": {
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "highway": "street_lamp"
+        },
+        "fields": [
+            "lamp_type",
+            "ref"
+        ],
+        "terms": [
+            "streetlight",
+            "street light",
+            "lamp",
+            "light",
+            "gaslight"
+        ],
+        "name": "Street Lamp"
+    },
     "highway/tertiary": {
         "icon": "highway-tertiary",
         "fields": [
diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json
new file mode 100644
index 000000000..6a0729471
--- /dev/null
+++ b/data/presets/presets/highway/street_lamp.json
@@ -0,0 +1,21 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "highway": "street_lamp"
+    },
+    "fields": [
+        "lamp_type",
+        "ref"
+    ],
+    "terms": [
+        "streetlight",
+        "street light",
+        "lamp",
+        "light",
+        "gaslight"
+    ],
+    "name": "Street Lamp"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b366fa752..92bc651b1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -722,6 +722,9 @@
                     "terminal": "Terminal"
                 }
             },
+            "lamp_type": {
+                "label": "Type"
+            },
             "landuse": {
                 "label": "Type"
             },
@@ -1916,6 +1919,10 @@
                 "name": "Stop Sign",
                 "terms": "stop sign"
             },
+            "highway/street_lamp": {
+                "name": "Street Lamp",
+                "terms": "streetlight,street light,lamp,light,gaslight"
+            },
             "highway/tertiary": {
                 "name": "Tertiary Road",
                 "terms": ""