CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add wind generator preset, output:electricity field for generators, plants

Browse Source
This commit is contained in:
Bryan Housel
2017-07-21 23:42:36 -04:00
parent d0b8b2b11b
commit e5b57cf578
10 changed files with 131 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
data/presets.yaml
View File

@@ -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: '<translate with synonyms or related terms for ''Power Generator'', separated by commas>'
power/generator/source_wind:
# 'power=generator, generator:source=wind, generator:method=wind_turbine'
name: Wind Generator
# 'terms: generator,turbine,windmill,wind'
terms: '<translate with synonyms or related terms for ''Wind Generator'', separated by commas>'
power/line:
# power=line
name: Power Line

12
data/presets/fields.json
View File

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

6
data/presets/fields/generator/output/electricity.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "generator:output:electricity",
"type": "text",
"label": "Power Output",
"placeholder": "50 MW, 100 MW, 200 MW..."
}

6
data/presets/fields/plant/output/electricity.json Normal file
View File

@@ -0,0 +1,6 @@
{
"key": "plant:output:electricity",
"type": "text",
"label": "Power Output",
"placeholder": "500 MW, 1000 MW, 2000 MW..."
}

40
data/presets/presets.json
View File

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

3
data/presets/presets/power/generator.json
View File

@@ -4,7 +4,8 @@
"operator",
"generator/source",
"generator/method",
"generator/type"
"generator/type",
"generator/output/electricity"
],
"geometry": [
"point",

32
data/presets/presets/power/generator/source_wind.json Normal file
View File

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

5
data/presets/presets/power/plant.json
View File

@@ -1,7 +1,10 @@
{
"icon": "industry",
"fields": [
"operator"
"operator",
"address",
"plant/output/electricity",
"start_date"
],
"geometry": [
"area"

4
data/taginfo.json
View File

@@ -2057,6 +2057,10 @@
"key": "power",
"value": "generator"
},
{
"key": "generator:method",
"value": "wind_turbine"
},
{
"key": "power",
"value": "line"

12
dist/locales/en.json vendored
View File

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