From e5b57cf57825ff53d07f682828559e3cc7ebfb49 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 21 Jul 2017 23:42:36 -0400 Subject: [PATCH] Add wind generator preset, output:electricity field for generators, plants --- data/presets.yaml | 15 +++++++ data/presets/fields.json | 12 ++++++ .../fields/generator/output/electricity.json | 6 +++ .../fields/plant/output/electricity.json | 6 +++ data/presets/presets.json | 40 ++++++++++++++++++- data/presets/presets/power/generator.json | 3 +- .../presets/power/generator/source_wind.json | 32 +++++++++++++++ data/presets/presets/power/plant.json | 5 ++- data/taginfo.json | 4 ++ dist/locales/en.json | 12 ++++++ 10 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 data/presets/fields/generator/output/electricity.json create mode 100644 data/presets/fields/plant/output/electricity.json create mode 100644 data/presets/presets/power/generator/source_wind.json diff --git a/data/presets.yaml b/data/presets.yaml index 26bb28ea6..f1f0a5c8a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -529,6 +529,11 @@ en: generator/method: # 'generator:method=*' label: Method + generator/output/electricity: + # 'generator:output:electricity=*' + label: Power Output + # generator/output/electricity field placeholder + placeholder: '50 MW, 100 MW, 200 MW...' generator/source: # 'generator:source=*' label: Source @@ -981,6 +986,11 @@ en: plant: # plant=* label: Plant + plant/output/electricity: + # 'plant:output:electricity=*' + label: Power Output + # plant/output/electricity field placeholder + placeholder: '500 MW, 1000 MW, 2000 MW...' population: # population=* label: Population @@ -3635,6 +3645,11 @@ en: name: Power Generator # 'terms: hydro,solar,turbine,wind' terms: '' + power/generator/source_wind: + # 'power=generator, generator:source=wind, generator:method=wind_turbine' + name: Wind Generator + # 'terms: generator,turbine,windmill,wind' + terms: '' power/line: # power=line name: Power Line diff --git a/data/presets/fields.json b/data/presets/fields.json index f0d29d2fa..c0bb8450d 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -732,6 +732,12 @@ "type": "combo", "label": "Method" }, + "generator/output/electricity": { + "key": "generator:output:electricity", + "type": "text", + "label": "Power Output", + "placeholder": "50 MW, 100 MW, 200 MW..." + }, "generator/source": { "key": "generator:source", "type": "combo", @@ -1302,6 +1308,12 @@ "type": "combo", "label": "Plant" }, + "plant/output/electricity": { + "key": "plant:output:electricity", + "type": "text", + "label": "Power Output", + "placeholder": "500 MW, 1000 MW, 2000 MW..." + }, "population": { "key": "population", "type": "text", diff --git a/data/presets/fields/generator/output/electricity.json b/data/presets/fields/generator/output/electricity.json new file mode 100644 index 000000000..50bc4cfd2 --- /dev/null +++ b/data/presets/fields/generator/output/electricity.json @@ -0,0 +1,6 @@ +{ + "key": "generator:output:electricity", + "type": "text", + "label": "Power Output", + "placeholder": "50 MW, 100 MW, 200 MW..." +} diff --git a/data/presets/fields/plant/output/electricity.json b/data/presets/fields/plant/output/electricity.json new file mode 100644 index 000000000..3bbf35c73 --- /dev/null +++ b/data/presets/fields/plant/output/electricity.json @@ -0,0 +1,6 @@ +{ + "key": "plant:output:electricity", + "type": "text", + "label": "Power Output", + "placeholder": "500 MW, 1000 MW, 2000 MW..." +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 1d3035c26..062c51a45 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -9890,7 +9890,8 @@ "operator", "generator/source", "generator/method", - "generator/type" + "generator/type", + "generator/output/electricity" ], "geometry": [ "point", @@ -9908,6 +9909,38 @@ }, "name": "Power Generator" }, + "power/generator/source_wind": { + "icon": "poi-wind-generator", + "fields": [ + "operator", + "generator/source", + "generator/method", + "generator/type", + "generator/output/electricity", + "height" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "generator", + "turbine", + "windmill", + "wind" + ], + "tags": { + "power": "generator", + "generator:source": "wind", + "generator:method": "wind_turbine" + }, + "reference": { + "key": "generator:source", + "value": "wind" + }, + "name": "Wind Generator" + }, "power/line": { "icon": "power-line", "geometry": [ @@ -9931,7 +9964,10 @@ "power/plant": { "icon": "industry", "fields": [ - "operator" + "operator", + "address", + "plant/output/electricity", + "start_date" ], "geometry": [ "area" diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json index 431808568..1ff06547e 100644 --- a/data/presets/presets/power/generator.json +++ b/data/presets/presets/power/generator.json @@ -4,7 +4,8 @@ "operator", "generator/source", "generator/method", - "generator/type" + "generator/type", + "generator/output/electricity" ], "geometry": [ "point", diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source_wind.json new file mode 100644 index 000000000..6200bcdc5 --- /dev/null +++ b/data/presets/presets/power/generator/source_wind.json @@ -0,0 +1,32 @@ +{ + "icon": "poi-wind-generator", + "fields": [ + "operator", + "generator/source", + "generator/method", + "generator/type", + "generator/output/electricity", + "height" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "generator", + "turbine", + "windmill", + "wind" + ], + "tags": { + "power": "generator", + "generator:source": "wind", + "generator:method": "wind_turbine" + }, + "reference": { + "key": "generator:source", + "value": "wind" + }, + "name": "Wind Generator" +} diff --git a/data/presets/presets/power/plant.json b/data/presets/presets/power/plant.json index 8a9d417b4..aa6794d94 100644 --- a/data/presets/presets/power/plant.json +++ b/data/presets/presets/power/plant.json @@ -1,7 +1,10 @@ { "icon": "industry", "fields": [ - "operator" + "operator", + "address", + "plant/output/electricity", + "start_date" ], "geometry": [ "area" diff --git a/data/taginfo.json b/data/taginfo.json index a9ee28869..4565d5045 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2057,6 +2057,10 @@ "key": "power", "value": "generator" }, + { + "key": "generator:method", + "value": "wind_turbine" + }, { "key": "power", "value": "line" diff --git a/dist/locales/en.json b/dist/locales/en.json index 871602240..3b2e434d7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1530,6 +1530,10 @@ "generator/method": { "label": "Method" }, + "generator/output/electricity": { + "label": "Power Output", + "placeholder": "50 MW, 100 MW, 200 MW..." + }, "generator/source": { "label": "Source" }, @@ -1894,6 +1898,10 @@ "plant": { "label": "Plant" }, + "plant/output/electricity": { + "label": "Power Output", + "placeholder": "500 MW, 1000 MW, 2000 MW..." + }, "population": { "label": "Population" }, @@ -4298,6 +4306,10 @@ "name": "Power Generator", "terms": "hydro,solar,turbine,wind" }, + "power/generator/source_wind": { + "name": "Wind Generator", + "terms": "generator,turbine,windmill,wind" + }, "power/line": { "name": "Power Line", "terms": ""