From fc76e2c8c658b81a14fa996e99b910431276ee14 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sat, 6 Oct 2018 09:41:39 -0700 Subject: [PATCH] Adds the Solar Panel preset 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 --- data/presets.yaml | 9 +++- data/presets/fields.json | 2 +- .../fields/generator/output/electricity.json | 2 +- data/presets/presets.json | 7 +-- .../power/generator/method/photovoltaic.json | 43 +++++++++++++++++++ .../nuclear.json} | 0 .../{source_wind.json => source/wind.json} | 0 data/presets/presets/power/tower.json | 1 + data/taginfo.json | 7 +++ dist/locales/en.json | 8 +++- svg/fontawesome/fas-solar-panel.svg | 1 + 11 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 data/presets/presets/power/generator/method/photovoltaic.json rename data/presets/presets/power/generator/{source_nuclear.json => source/nuclear.json} (100%) rename data/presets/presets/power/generator/{source_wind.json => source/wind.json} (100%) create mode 100644 svg/fontawesome/fas-solar-panel.svg diff --git a/data/presets.yaml b/data/presets.yaml index c975f7959..a22496d31 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5027,12 +5027,17 @@ en: name: Power Generator # 'terms: hydro,solar,turbine,wind' terms: '' - 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: '' + power/generator/source/nuclear: # 'power=generator, generator:source=nuclear, generator:method=fission' name: Nuclear Reactor # 'terms: fission,generator,nuclear,nuke,reactor' terms: '' - 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' diff --git a/data/presets/fields.json b/data/presets/fields.json index b0ec1b069..0addd4de0 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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"}, diff --git a/data/presets/fields/generator/output/electricity.json b/data/presets/fields/generator/output/electricity.json index 50bc4cfd2..ae078a86e 100644 --- a/data/presets/fields/generator/output/electricity.json +++ b/data/presets/fields/generator/output/electricity.json @@ -1,6 +1,6 @@ { "key": "generator:output:electricity", - "type": "text", + "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW..." } diff --git a/data/presets/presets.json b/data/presets/presets.json index 4d1f7eb42..decbea42b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -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"}, diff --git a/data/presets/presets/power/generator/method/photovoltaic.json b/data/presets/presets/power/generator/method/photovoltaic.json new file mode 100644 index 000000000..eaecdb820 --- /dev/null +++ b/data/presets/presets/power/generator/method/photovoltaic.json @@ -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" +} diff --git a/data/presets/presets/power/generator/source_nuclear.json b/data/presets/presets/power/generator/source/nuclear.json similarity index 100% rename from data/presets/presets/power/generator/source_nuclear.json rename to data/presets/presets/power/generator/source/nuclear.json diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source/wind.json similarity index 100% rename from data/presets/presets/power/generator/source_wind.json rename to data/presets/presets/power/generator/source/wind.json diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json index 77c5277fe..eddacdbfd 100644 --- a/data/presets/presets/power/tower.json +++ b/data/presets/presets/power/tower.json @@ -4,6 +4,7 @@ "ref" ], "geometry": [ + "point", "vertex" ], "terms": [ diff --git a/data/taginfo.json b/data/taginfo.json index 244690dee..337b438d4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -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", diff --git a/dist/locales/en.json b/dist/locales/en.json index cac517781..34ef50c3a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -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" }, diff --git a/svg/fontawesome/fas-solar-panel.svg b/svg/fontawesome/fas-solar-panel.svg new file mode 100644 index 000000000..6c637615d --- /dev/null +++ b/svg/fontawesome/fas-solar-panel.svg @@ -0,0 +1 @@ + \ No newline at end of file