Skip to content

Commit

Permalink
Add Water Turbine preset
Browse files Browse the repository at this point in the history
  • Loading branch information
quincylvania committed Apr 16, 2019
1 parent fa1ec8f commit 5a4283b
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 0 deletions.
5 changes: 5 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5860,6 +5860,11 @@ en:
name: Solar Panel
# 'terms: photovoltaic module,PV module,sunlight'
terms: '<translate with synonyms or related terms for ''Solar Panel'', separated by commas>'
power/generator/source/hydro:
# 'power=generator, generator:source=hydro'
name: Water Turbine
# 'terms: dam,generator,francis turbine,hydroelectricity,kaplan turbine,pelton turbine'
terms: '<translate with synonyms or related terms for ''Water Turbine'', separated by commas>'
power/generator/source/nuclear:
# 'power=generator, generator:source=nuclear, generator:method=fission'
name: Nuclear Reactor
Expand Down
1 change: 1 addition & 0 deletions data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,7 @@
"power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "removeTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
"power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
"power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
"power/generator/source/hydro": {"icon": "temaki-power", "fields": ["operator", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["height", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "name": "Water Turbine"},
"power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
"power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "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 Turbine"},
"power/line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "line"}, "name": "Power Line"},
Expand Down
46 changes: 46 additions & 0 deletions data/presets/presets/power/generator/source/hydro.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"icon": "temaki-power",
"fields": [
"operator",
"generator/method",
"generator/type",
"generator/output/electricity",
"ref"
],
"moreFields": [
"height",
"manufacturer"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"dam",
"generator",
"francis turbine",
"hydroelectricity",
"kaplan turbine",
"pelton turbine"
],
"tags": {
"power": "generator",
"generator:source": "hydro"
},
"addTags": {
"power": "generator",
"generator:source": "hydro",
"generator:output:electricity": "yes"
},
"removeTags": {
"power": "generator",
"generator:source": "hydro",
"generator:output:electricity": "yes"
},
"reference": {
"key": "generator:source",
"value": "hydro"
},
"name": "Water Turbine"
}
1 change: 1 addition & 0 deletions data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@
{"key": "power", "value": "sub_station", "description": "🄿 Substation (unsearchable), 🄳 ➜ power=substation", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
{"key": "power", "value": "generator", "description": "🄿 Power Generator", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
{"key": "generator:method", "value": "photovoltaic", "description": "🄿 Solar Panel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-solar-panel.svg?sanitize=true"},
{"key": "generator:source", "value": "hydro", "description": "🄿 Water Turbine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
{"key": "generator:method", "value": "fission", "description": "🄿 Nuclear Reactor", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/radiation.svg?sanitize=true"},
{"key": "generator:method", "value": "wind_turbine", "description": "🄿 Wind Turbine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wind_turbine.svg?sanitize=true"},
{"key": "power", "value": "line", "description": "🄿 Power Line", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true"},
Expand Down
4 changes: 4 additions & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -7286,6 +7286,10 @@
"name": "Solar Panel",
"terms": "photovoltaic module,PV module,sunlight"
},
"power/generator/source/hydro": {
"name": "Water Turbine",
"terms": "dam,generator,francis turbine,hydroelectricity,kaplan turbine,pelton turbine"
},
"power/generator/source/nuclear": {
"name": "Nuclear Reactor",
"terms": "fission,generator,nuclear,nuke,reactor"
Expand Down

0 comments on commit 5a4283b

Please sign in to comment.