From 89aaad188531e7fa5617c4ffa9623f5451c00948 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Wed, 9 Nov 2022 12:32:09 +0100
Subject: [PATCH] add fields for diameter & height of wind turbines, closes
 #241

and also match features without `generator:method=wind_turbine` set, and suggest to add it
---
 data/fields/height/hub.json                   |  6 ++++++
 data/fields/rotor/diameter.json               |  6 ++++++
 data/presets/power/generator/source/wind.json |  8 +++++++-
 interim/source_strings.yaml                   | 10 +++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 data/fields/height/hub.json
 create mode 100644 data/fields/rotor/diameter.json

diff --git a/data/fields/height/hub.json b/data/fields/height/hub.json
new file mode 100644
index 000000000..936919560
--- /dev/null
+++ b/data/fields/height/hub.json
@@ -0,0 +1,6 @@
+{
+    "key": "height:hub",
+    "minValue": 0,
+    "type": "number",
+    "label": "Height of Hub (Meters)"
+}
diff --git a/data/fields/rotor/diameter.json b/data/fields/rotor/diameter.json
new file mode 100644
index 000000000..e74da6a50
--- /dev/null
+++ b/data/fields/rotor/diameter.json
@@ -0,0 +1,6 @@
+{
+    "key": "rotor:diameter",
+    "minValue": 0,
+    "type": "number",
+    "label": "Rotor Diameter (Meters)"
+}
diff --git a/data/presets/power/generator/source/wind.json b/data/presets/power/generator/source/wind.json
index 19fe5fc11..8dc5411a2 100644
--- a/data/presets/power/generator/source/wind.json
+++ b/data/presets/power/generator/source/wind.json
@@ -7,7 +7,9 @@
         "generator/output/electricity"
     ],
     "moreFields": [
-        "{power/generator}"
+        "{power/generator}",
+        "height/hub",
+        "rotor/diameter"
     ],
     "geometry": [
         "point",
@@ -15,6 +17,10 @@
         "area"
     ],
     "tags": {
+        "power": "generator",
+        "generator:source": "wind"
+    },
+    "addTags": {
         "power": "generator",
         "generator:source": "wind",
         "generator:method": "wind_turbine"
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index c9c824cac..b37930fb4 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1789,6 +1789,10 @@ en:
         # height=*
         label: Height (Meters)
         terms: '[translate with synonyms or related terms for ''Height (Meters)'', separated by commas]'
+      height/hub:
+        # height:hub=*
+        label: Height of Hub (Meters)
+        terms: '[translate with synonyms or related terms for ''Height of Hub (Meters)'', separated by commas]'
       height_building:
         # height=*
         label: Building Height (Meters)
@@ -3130,6 +3134,10 @@ en:
       rooms:
         # rooms=*
         label: Rooms
+      rotor/diameter:
+        # rotor:diameter=*
+        label: Rotor Diameter (Meters)
+        terms: '[translate with synonyms or related terms for ''Rotor Diameter (Meters)'', separated by commas]'
       roundtrip:
         # roundtrip=*
         label: Forms Loop
@@ -9320,7 +9328,7 @@ en:
         # 'terms: fission,generator,nuclear,nuke,reactor'
         terms: <translate with synonyms or related terms for 'Nuclear Reactor', separated by commas>
       power/generator/source/wind:
-        # power=generator + generator:source=wind + generator:method=wind_turbine | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # power=generator + generator:source=wind | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Wind Turbine
         # 'terms: generator,turbine,windmill,wind'
         terms: <translate with synonyms or related terms for 'Wind Turbine', separated by commas>