From 4dad690a01134ad2154fcc59a8bf2bf676c606ca Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 13 Aug 2013 13:06:13 -0700
Subject: [PATCH] Refine power=generator preset (fixes #1675)

---
 build.js                                  |  4 ++--
 data/presets.yaml                         | 10 ++++++++--
 data/presets/fields.json                  | 15 +++++++++++++++
 data/presets/fields/generator/method.json |  5 +++++
 data/presets/fields/generator/source.json |  5 +++++
 data/presets/fields/generator/type.json   |  5 +++++
 data/presets/presets.json                 |  7 ++++++-
 data/presets/presets/power/generator.json |  7 ++++++-
 dist/locales/en.json                      | 11 ++++++++++-
 9 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 data/presets/fields/generator/method.json
 create mode 100644 data/presets/fields/generator/source.json
 create mode 100644 data/presets/fields/generator/type.json

diff --git a/build.js b/build.js
index bb59609c2..49e3925f5 100644
--- a/build.js
+++ b/build.js
@@ -63,9 +63,9 @@ function generateCategories() {
 
 function generateFields() {
     var fields = {};
-    glob.sync(__dirname + '/data/presets/fields/*.json').forEach(function(file) {
+    glob.sync(__dirname + '/data/presets/fields/**/*.json').forEach(function(file) {
         var field = read(file),
-            id = path.basename(file, '.json');
+            id = file.match(/presets\/fields\/([^.]*)\.json/)[1];
 
         validate(file, field, fieldSchema);
 
diff --git a/data/presets.yaml b/data/presets.yaml
index c86678dc7..fff8dbe5e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -113,6 +113,12 @@ en:
         label: Fee
       fixme: 
         label: Fix Me
+      generator/method: 
+        label: Method
+      generator/source: 
+        label: Source
+      generator/type: 
+        label: Type
       highway: 
         label: Type
       historic: 
@@ -875,8 +881,8 @@ en:
         name: Power
         terms: "<translate with synonyms or related terms for 'Power', separated by commas>"
       power/generator: 
-        name: Power Plant
-        terms: "<translate with synonyms or related terms for 'Power Plant', separated by commas>"
+        name: Power Generator
+        terms: "<translate with synonyms or related terms for 'Power Generator', separated by commas>"
       power/line: 
         name: Power Line
         terms: "<translate with synonyms or related terms for 'Power Line', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 8da3f9464..c5c1916e4 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -248,6 +248,21 @@
         "type": "textarea",
         "label": "Fix Me"
     },
+    "generator/method": {
+        "key": "generator:method",
+        "type": "combo",
+        "label": "Method"
+    },
+    "generator/source": {
+        "key": "generator:source",
+        "type": "combo",
+        "label": "Source"
+    },
+    "generator/type": {
+        "key": "generator:type",
+        "type": "combo",
+        "label": "Type"
+    },
     "highway": {
         "key": "highway",
         "type": "combo",
diff --git a/data/presets/fields/generator/method.json b/data/presets/fields/generator/method.json
new file mode 100644
index 000000000..c8cf2d47e
--- /dev/null
+++ b/data/presets/fields/generator/method.json
@@ -0,0 +1,5 @@
+{
+    "key": "generator:method",
+    "type": "combo",
+    "label": "Method"
+}
\ No newline at end of file
diff --git a/data/presets/fields/generator/source.json b/data/presets/fields/generator/source.json
new file mode 100644
index 000000000..76a197d03
--- /dev/null
+++ b/data/presets/fields/generator/source.json
@@ -0,0 +1,5 @@
+{
+    "key": "generator:source",
+    "type": "combo",
+    "label": "Source"
+}
\ No newline at end of file
diff --git a/data/presets/fields/generator/type.json b/data/presets/fields/generator/type.json
new file mode 100644
index 000000000..7a6a096a4
--- /dev/null
+++ b/data/presets/fields/generator/type.json
@@ -0,0 +1,5 @@
+{
+    "key": "generator:type",
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index cc0bca890..aaf252e38 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3284,6 +3284,7 @@
         "name": "Power"
     },
     "power/generator": {
+        "name": "Power Generator",
         "geometry": [
             "point",
             "vertex",
@@ -3292,7 +3293,11 @@
         "tags": {
             "power": "generator"
         },
-        "name": "Power Plant"
+        "fields": [
+            "generator/source",
+            "generator/method",
+            "generator/type"
+        ]
     },
     "power/line": {
         "geometry": [
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index 0700b3cc2..8d48dc57b 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -1,4 +1,5 @@
 {
+    "name": "Power Generator",
     "geometry": [
         "point",
         "vertex",
@@ -7,5 +8,9 @@
     "tags": {
         "power": "generator"
     },
-    "name": "Power Plant"
+    "fields": [
+        "generator/source",
+        "generator/method",
+        "generator/type"
+    ]
 }
\ No newline at end of file
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a32b1e622..44bbb5a4c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -517,6 +517,15 @@
             "fixme": {
                 "label": "Fix Me"
             },
+            "generator/method": {
+                "label": "Method"
+            },
+            "generator/source": {
+                "label": "Source"
+            },
+            "generator/type": {
+                "label": "Type"
+            },
             "highway": {
                 "label": "Type"
             },
@@ -1546,7 +1555,7 @@
                 "terms": ""
             },
             "power/generator": {
-                "name": "Power Plant",
+                "name": "Power Generator",
                 "terms": ""
             },
             "power/line": {