Refine power=generator preset (fixes #1675)

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);
 

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>"

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",

data/presets/fields/generator/method.json

@@ -0,0 +1,5 @@
+{
+    "key": "generator:method",
+    "type": "combo",
+    "label": "Method"
+}

data/presets/fields/generator/source.json

@@ -0,0 +1,5 @@
+{
+    "key": "generator:source",
+    "type": "combo",
+    "label": "Source"
+}

data/presets/fields/generator/type.json

@@ -0,0 +1,5 @@
+{
+    "key": "generator:type",
+    "type": "combo",
+    "label": "Type"
+}

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": [

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"
+    ]
 }

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": {