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

Adds the Solar Panel preset

Browse Source 
Changes the Power Output field type from "text" to "typeCombo"
Renames the source_nuclear and source_wind presets to source/nuclear and source/wind
Adds point geometry to the power/tower preset
This commit is contained in:
Quincy Morgan
2018-10-06 09:41:39 -07:00
parent d55fe9f5df
commit fc76e2c8c6
11 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+7 -2
View File
@@ -5027,12 +5027,17 @@ 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_nuclear:
power/generator/method/photovoltaic:
# 'power=generator, generator:source=solar, generator:method=photovoltaic, generator:type=solar_photovoltaic_panel'
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/nuclear:
# 'power=generator, generator:source=nuclear, generator:method=fission'
name: Nuclear Reactor
# '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/source/wind:
# 'power=generator, generator:source=wind, generator:method=wind_turbine'
name: Wind Turbine
# 'terms: generator,turbine,windmill,wind'
data/presets/fields.json
+1 -1
View File
@@ -113,7 +113,7 @@
"gauge": {"key": "gauge", "type": "combo", "label": "Gauge"},
"gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}},
"generator/method": {"key": "generator:method", "type": "combo", "label": "Method"},
"generator/output/electricity": {"key": "generator:output:electricity", "type": "text", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW..."},
"generator/output/electricity": {"key": "generator:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW..."},
"generator/source": {"key": "generator:source", "type": "combo", "label": "Source"},
"generator/type": {"key": "generator:type", "type": "combo", "label": "Type"},
"government": {"key": "government", "type": "typeCombo", "label": "Type"},
data/presets/fields/generator/output/electricity.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"key": "generator:output:electricity",
"type": "text",
"type": "typeCombo",
"label": "Power Output",
"placeholder": "50 MW, 100 MW, 200 MW..."
}
data/presets/presets.json
+4 -3
View File
@@ -691,15 +691,16 @@
"point": {"fields": ["name"], "geometry": ["point"], "tags": {}, "name": "Point", "matchScore": 0.1},
"power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false},
"power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
"power/generator/source_nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "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/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "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/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel"}, "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/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "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/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "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"},
"power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
"power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "removeTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
"power/pole": {"fields": ["ref"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
"power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
"power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"},
"power/tower": {"fields": ["design", "ref"], "geometry": ["vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
"power/tower": {"fields": ["design", "ref"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
"power/transformer": {"icon": "temaki-power", "fields": ["transformer", "operator", "location", "rating", "devices", "phases", "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
"public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"},
"public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},
data/presets/presets/power/generator/method/photovoltaic.json
+43
View File
@@ -0,0 +1,43 @@
{
"icon": "fas-solar-panel",
"fields": [
"operator",
"generator/output/electricity",
"ref"
],
"geometry": [
"point",
"vertex",
"area"
],
"terms": [
"photovoltaic module",
"PV module",
"sunlight"
],
"tags": {
"power": "generator",
"generator:source": "solar",
"generator:method": "photovoltaic",
"generator:type": "solar_photovoltaic_panel"
},
"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"
}
data/presets/presets/power/generator/source_nuclear.json → data/presets/presets/power/generator/source/nuclear.json
View File
data/presets/presets/power/generator/source_wind.json → data/presets/presets/power/generator/source/wind.json
View File
data/presets/presets/power/tower.json
+1
View File
@@ -4,6 +4,7 @@
"ref"
],
"geometry": [
"point",
"vertex"
],
"terms": [
data/taginfo.json
+7
View File
@@ -4627,6 +4627,13 @@
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"
},
{
"key": "generator:type",
"value": "solar_photovoltaic_panel",
"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:method",
"value": "fission",
dist/locales/en.json
Vendored
+6 -2
View File
@@ -5842,11 +5842,15 @@
"name": "Power Generator",
"terms": "hydro,solar,turbine,wind"
},
"power/generator/source_nuclear": {
"power/generator/method/photovoltaic": {
"name": "Solar Panel",
"terms": "photovoltaic module,PV module,sunlight"
},
"power/generator/source/nuclear": {
"name": "Nuclear Reactor",
"terms": "fission,generator,nuclear,nuke,reactor"
},
"power/generator/source_wind": {
"power/generator/source/wind": {
"name": "Wind Turbine",
"terms": "generator,turbine,windmill,wind"
},
svg/fontawesome/fas-solar-panel.svg
+1
View File
@@ -0,0 +1 @@
<svg aria-hidden="true" data-prefix="fas" data-icon="solar-panel" class="svg-inline--fa fa-solar-panel fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M431.98 448.01l-47.97.05V416h-128v32.21l-47.98.05c-8.82.01-15.97 7.16-15.98 15.99l-.05 31.73c-.01 8.85 7.17 16.03 16.02 16.02l223.96-.26c8.82-.01 15.97-7.16 15.98-15.98l.04-31.73c.01-8.85-7.17-16.03-16.02-16.02zM585.2 26.74C582.58 11.31 568.99 0 553.06 0H86.93C71 0 57.41 11.31 54.79 26.74-3.32 369.16.04 348.08.03 352c-.03 17.32 14.29 32 32.6 32h574.74c18.23 0 32.51-14.56 32.59-31.79.02-4.08 3.35 16.95-54.76-325.47zM259.83 64h120.33l9.77 96H250.06l9.77-96zm-75.17 256H71.09L90.1 208h105.97l-11.41 112zm16.29-160H98.24l16.29-96h96.19l-9.77 96zm32.82 160l11.4-112h149.65l11.4 112H233.77zm195.5-256h96.19l16.29 96H439.04l-9.77-96zm26.06 256l-11.4-112H549.9l19.01 112H455.33z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 898 B