From df3865c96f19f18615b0840fe3a64c7f804da5e7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 15 Jan 2020 10:29:56 -0500 Subject: [PATCH] Add presets for `coal`, `gas`, `nuclear`, and `hydro` values of `plant:source` Update terms for Wind Farm preset (re: 3340d05502593927be86b5092e22e01ea3629ebb) Add `plant:source` and `plant:method` fields --- CHANGELOG.md | 2 +- data/presets.yaml | 32 +++++++++++++-- data/presets/fields.json | 4 +- data/presets/fields/plant/method.json | 5 +++ .../fields/plant/output/electricity.json | 5 ++- data/presets/fields/plant/source.json | 5 +++ data/presets/presets.json | 20 ++++++---- data/presets/presets/power/generator.json | 9 +++-- .../power/generator/method/photovoltaic.json | 16 ++++---- .../presets/power/generator/source/hydro.json | 23 +++++------ .../power/generator/source/nuclear.json | 21 +++++----- .../presets/power/generator/source/wind.json | 19 +++++---- data/presets/presets/power/plant.json | 2 + .../presets/power/plant/source/coal.json | 39 ++++++++++++++++++ .../presets/power/plant/source/gas.json | 40 +++++++++++++++++++ .../presets/power/plant/source/hydro.json | 34 ++++++++++++++++ .../presets/power/plant/source/nuclear.json | 34 ++++++++++++++++ .../photovoltaic.json => source/solar.json} | 6 +-- .../presets/power/plant/source/wind.json | 17 +++++--- data/taginfo.json | 8 +++- dist/locales/en.json | 26 +++++++++++- 21 files changed, 297 insertions(+), 70 deletions(-) create mode 100644 data/presets/fields/plant/method.json create mode 100644 data/presets/fields/plant/source.json create mode 100644 data/presets/presets/power/plant/source/coal.json create mode 100644 data/presets/presets/power/plant/source/gas.json create mode 100644 data/presets/presets/power/plant/source/hydro.json create mode 100644 data/presets/presets/power/plant/source/nuclear.json rename data/presets/presets/power/plant/{method/photovoltaic.json => source/solar.json} (90%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4403cc22..ea979e18f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -104,7 +104,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Add Secondhand Clothing Store preset ([#7164]) * Add Public Prosecutor's Office preset ([#7225]) * Add Speed Limit Enforcement preset ([#7234]) -* Add presets: Emergency Exit, Geyser, Used Car Dealership, Wedding Clothes Store, Backcountry Camping Area, Group Camping Area, History Museum, Wind Farm, Solar Farm +* Add presets: Emergency Exit, Geyser, Used Car Dealership, Wedding Clothes Store, Backcountry Camping Area, Group Camping Area, History Museum, Wind Farm, Solar Farm, Nuclear Power Plant, Hydroelectric Power Station, Coal-Fired Power Plant, Gas-Fired Power Plant * Rename "Anime Shop" to "Anime / Manga Shop" ([#7223]) * Simplify the names of various Piste presets * Update Arts & Crafts Store icon ([#7228]) diff --git a/data/presets.yaml b/data/presets.yaml index 1dcdf56a3..44517653e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1762,11 +1762,17 @@ en: plant: # plant=* label: Plant + plant/method: + # 'plant:method=*' + label: Generation Method plant/output/electricity: # 'plant:output:electricity=*' label: Power Output # plant/output/electricity field placeholder placeholder: '500 MW, 1000 MW, 2000 MW...' + plant/source: + # 'plant:source=*' + label: Energy Source playground: # playground=* label: Type @@ -7014,15 +7020,35 @@ en: name: Power Station Grounds # 'terms: coal,gas,generat*,hydro,nuclear,power,station' terms: '' - power/plant/method/photovoltaic: - # 'power=plant, plant:method=photovoltaic' + power/plant/source/coal: + # 'power=plant, plant:source=coal' + name: Coal-Fired Power Plant + # 'terms: carbon,combustion,fossil fuel,coalfired,power station' + terms: '' + power/plant/source/gas: + # 'power=plant, plant:source=gas' + name: Gas-Fired Power Plant + # 'terms: carbon,combustion,fossil fuel,gasfired,power station,natural gas' + terms: '' + power/plant/source/hydro: + # 'power=plant, plant:source=hydro' + name: Hydroelectric Power Station + # 'terms: dam,power plant,run-of-the-river,tidal,water turbine' + terms: '' + power/plant/source/nuclear: + # 'power=plant, plant:source=nuclear' + name: Nuclear Power Plant + # 'terms: atomic,fission,power station,nuclear reactor' + terms: '' + power/plant/source/solar: + # 'power=plant, plant:source=solar' name: Solar Farm # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' terms: '' power/plant/source/wind: # 'power=plant, plant:source=wind' name: Wind Farm - # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' + # 'terms: offshore wind,wind park,wind power plant,wind power station,wind turbines,windmills' terms: '' power/pole: # power=pole diff --git a/data/presets/fields.json b/data/presets/fields.json index be05b565e..863bcfdf6 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -300,7 +300,9 @@ "piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}}, "place": {"key": "place", "type": "typeCombo", "label": "Type"}, "plant": {"key": "plant", "type": "combo", "label": "Plant"}, - "plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."}, + "plant/method": {"key": "plant:method", "type": "combo", "label": "Generation Method"}, + "plant/output/electricity": {"key": "plant:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW...", "snake_case": false}, + "plant/source": {"key": "plant:source", "type": "combo", "label": "Energy Source"}, "playground": {"key": "playground", "type": "combo", "label": "Type"}, "playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"}, "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]}, diff --git a/data/presets/fields/plant/method.json b/data/presets/fields/plant/method.json new file mode 100644 index 000000000..fd91bc1f1 --- /dev/null +++ b/data/presets/fields/plant/method.json @@ -0,0 +1,5 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "Generation Method" +} diff --git a/data/presets/fields/plant/output/electricity.json b/data/presets/fields/plant/output/electricity.json index 3bbf35c73..8e903cf86 100644 --- a/data/presets/fields/plant/output/electricity.json +++ b/data/presets/fields/plant/output/electricity.json @@ -1,6 +1,7 @@ { "key": "plant:output:electricity", - "type": "text", + "type": "typeCombo", "label": "Power Output", - "placeholder": "500 MW, 1000 MW, 2000 MW..." + "placeholder": "500 MW, 1000 MW, 2000 MW...", + "snake_case": false } diff --git a/data/presets/fields/plant/source.json b/data/presets/fields/plant/source.json new file mode 100644 index 000000000..63d3a713d --- /dev/null +++ b/data/presets/fields/plant/source.json @@ -0,0 +1,5 @@ +{ + "key": "plant:source", + "type": "combo", + "label": "Energy Source" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 2192b20e6..daf638af8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -929,16 +929,20 @@ "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"}, "power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["area", "point"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false}, "power/cable/underground": {"icon": "temaki-cable", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"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": ["level", "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": ["area", "point", "vertex"], "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": "*"}, "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"}, "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/generator": {"icon": "temaki-power", "fields": ["ref", "operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["colour", "height", "level", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"}, + "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["ref", "operator", "generator/output/electricity"], "moreFields": ["{power/generator}"], "geometry": ["area", "point", "vertex"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "*"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "terms": ["photovoltaic module", "PV module", "sunlight"], "name": "Solar Panel"}, + "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["ref", "operator", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["{power/generator}"], "geometry": ["point", "vertex", "area"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "name": "Water Turbine"}, + "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["ref", "operator", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["{power/generator}"], "geometry": ["point", "vertex", "area"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "name": "Nuclear Reactor"}, + "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["ref", "operator", "generator/type", "generator/output/electricity"], "moreFields": ["{power/generator}"], "geometry": ["point", "vertex", "area"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "terms": ["generator", "turbine", "windmill", "wind"], "name": "Wind Turbine"}, "power/line": {"icon": "temaki-power_tower", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high voltage line", "high tension 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"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"}, - "power/plant/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:method": "photovoltaic"}, "addTags": {"power": "plant", "plant:method": "photovoltaic", "plant:source": "solar", "plant:output:electricity": "*"}, "removeTags": {"power": "plant", "plant:method": "photovoltaic", "plant:source": "solar", "plant:output:electricity": "*", "landuse": "industrial"}, "reference": {"key": "plant:method", "value": "photovoltaic"}, "terms": ["photovoltaic power station", "solar panels", "solar park", "utility-scale solar"], "name": "Solar Farm"}, - "power/plant/source/wind": {"icon": "temaki-wind_turbine", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "wind"}, "addTags": {"power": "plant", "plant:source": "wind", "plant:output:electricity": "*"}, "removeTags": {"power": "plant", "plant:method": "*", "plant:source": "wind", "plant:output:electricity": "*", "landuse": "industrial"}, "reference": {"key": "plant:source", "value": "wind"}, "terms": ["photovoltaic power station", "solar panels", "solar park", "utility-scale solar"], "name": "Wind Farm"}, + "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/source", "plant/method", "plant/output/electricity", "start_date"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"}, + "power/plant/source/coal": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "coal"}, "addTags": {"power": "plant", "landuse": "industrial", "plant:source": "coal", "plant:method": "combustion", "plant:output:electricity": "*"}, "reference": {"key": "plant:source", "value": "coal"}, "terms": ["carbon", "combustion", "fossil fuel", "coalfired", "power station"], "name": "Coal-Fired Power Plant"}, + "power/plant/source/gas": {"icon": "temaki-gas", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "gas"}, "addTags": {"power": "plant", "landuse": "industrial", "plant:source": "gas", "plant:method": "combustion", "plant:output:electricity": "*"}, "reference": {"key": "plant:source", "value": "gas"}, "terms": ["carbon", "combustion", "fossil fuel", "gasfired", "power station", "natural gas"], "name": "Gas-Fired Power Plant"}, + "power/plant/source/hydro": {"icon": "maki-dam", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "hydro"}, "addTags": {"power": "plant", "landuse": "industrial", "plant:source": "hydro", "plant:output:electricity": "*"}, "reference": {"key": "plant:source", "value": "hydro"}, "terms": ["dam", "power plant", "run-of-the-river", "tidal", "water turbine"], "name": "Hydroelectric Power Station"}, + "power/plant/source/nuclear": {"icon": "temaki-radiation", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "nuclear"}, "addTags": {"power": "plant", "landuse": "industrial", "plant:source": "nuclear", "plant:method": "fission", "plant:output:electricity": "*"}, "reference": {"key": "plant:source", "value": "nuclear"}, "terms": ["atomic", "fission", "power station", "nuclear reactor"], "name": "Nuclear Power Plant"}, + "power/plant/source/solar": {"icon": "fas-solar-panel", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "solar"}, "addTags": {"power": "plant", "plant:source": "solar", "plant:method": "photovoltaic", "plant:output:electricity": "*"}, "removeTags": {"power": "plant", "plant:method": "*", "plant:source": "solar", "plant:output:electricity": "*", "landuse": "industrial"}, "reference": {"key": "plant:method", "value": "photovoltaic"}, "terms": ["photovoltaic power station", "solar panels", "solar park", "utility-scale solar"], "name": "Solar Farm"}, + "power/plant/source/wind": {"icon": "temaki-wind_turbine", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "wind"}, "addTags": {"power": "plant", "plant:source": "wind", "plant:method": "wind_turbine", "plant:output:electricity": "*"}, "removeTags": {"power": "plant", "plant:method": "*", "plant:source": "wind", "plant:output:electricity": "*", "landuse": "industrial"}, "reference": {"key": "plant:source", "value": "wind"}, "terms": ["offshore wind", "wind park", "wind power plant", "wind power station", "wind turbines", "windmills"], "name": "Wind Farm"}, "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "moreFields": ["gnis/feature_id"], "geometry": ["area", "point"], "tags": {"power": "substation"}, "name": "Substation"}, "power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"}, diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json index 84cac5b68..7e293d982 100644 --- a/data/presets/presets/power/generator.json +++ b/data/presets/presets/power/generator.json @@ -1,16 +1,19 @@ { "icon": "temaki-power", "fields": [ + "ref", "operator", "generator/source", "generator/method", "generator/type", - "generator/output/electricity", - "ref" + "generator/output/electricity" ], "moreFields": [ + "colour", + "height", "level", - "manufacturer" + "manufacturer", + "material" ], "geometry": [ "point", diff --git a/data/presets/presets/power/generator/method/photovoltaic.json b/data/presets/presets/power/generator/method/photovoltaic.json index 17dc641d4..3130f552f 100644 --- a/data/presets/presets/power/generator/method/photovoltaic.json +++ b/data/presets/presets/power/generator/method/photovoltaic.json @@ -1,23 +1,18 @@ { "icon": "fas-solar-panel", "fields": [ + "ref", "operator", - "generator/output/electricity", - "ref" + "generator/output/electricity" ], "moreFields": [ - "manufacturer" + "{power/generator}" ], "geometry": [ "area", "point", "vertex" ], - "terms": [ - "photovoltaic module", - "PV module", - "sunlight" - ], "tags": { "power": "generator", "generator:method": "photovoltaic" @@ -33,5 +28,10 @@ "key": "generator:method", "value": "photovoltaic" }, + "terms": [ + "photovoltaic module", + "PV module", + "sunlight" + ], "name": "Solar Panel" } diff --git a/data/presets/presets/power/generator/source/hydro.json b/data/presets/presets/power/generator/source/hydro.json index 5d628afa0..399da5339 100644 --- a/data/presets/presets/power/generator/source/hydro.json +++ b/data/presets/presets/power/generator/source/hydro.json @@ -1,29 +1,20 @@ { "icon": "temaki-power", "fields": [ + "ref", "operator", "generator/method", "generator/type", - "generator/output/electricity", - "ref" + "generator/output/electricity" ], "moreFields": [ - "height", - "manufacturer" + "{power/generator}" ], "geometry": [ "point", "vertex", "area" ], - "terms": [ - "dam", - "generator", - "francis turbine", - "hydroelectricity", - "kaplan turbine", - "pelton turbine" - ], "tags": { "power": "generator", "generator:source": "hydro" @@ -37,5 +28,13 @@ "key": "generator:source", "value": "hydro" }, + "terms": [ + "dam", + "generator", + "francis turbine", + "hydroelectricity", + "kaplan turbine", + "pelton turbine" + ], "name": "Water Turbine" } diff --git a/data/presets/presets/power/generator/source/nuclear.json b/data/presets/presets/power/generator/source/nuclear.json index 7fdfaa5c9..f68257352 100644 --- a/data/presets/presets/power/generator/source/nuclear.json +++ b/data/presets/presets/power/generator/source/nuclear.json @@ -1,28 +1,20 @@ { "icon": "temaki-radiation", "fields": [ + "ref", "operator", - "generator/source", "generator/method", "generator/type", - "generator/output/electricity", - "ref" + "generator/output/electricity" ], "moreFields": [ - "manufacturer" + "{power/generator}" ], "geometry": [ "point", "vertex", "area" ], - "terms": [ - "fission", - "generator", - "nuclear", - "nuke", - "reactor" - ], "tags": { "power": "generator", "generator:source": "nuclear", @@ -32,5 +24,12 @@ "key": "generator:source", "value": "nuclear" }, + "terms": [ + "fission", + "generator", + "nuclear", + "nuke", + "reactor" + ], "name": "Nuclear Reactor" } diff --git a/data/presets/presets/power/generator/source/wind.json b/data/presets/presets/power/generator/source/wind.json index e76d0c037..19fe5fc11 100644 --- a/data/presets/presets/power/generator/source/wind.json +++ b/data/presets/presets/power/generator/source/wind.json @@ -1,26 +1,19 @@ { "icon": "temaki-wind_turbine", "fields": [ + "ref", "operator", "generator/type", - "generator/output/electricity", - "height", - "ref" + "generator/output/electricity" ], "moreFields": [ - "manufacturer" + "{power/generator}" ], "geometry": [ "point", "vertex", "area" ], - "terms": [ - "generator", - "turbine", - "windmill", - "wind" - ], "tags": { "power": "generator", "generator:source": "wind", @@ -30,5 +23,11 @@ "key": "generator:source", "value": "wind" }, + "terms": [ + "generator", + "turbine", + "windmill", + "wind" + ], "name": "Wind Turbine" } diff --git a/data/presets/presets/power/plant.json b/data/presets/presets/power/plant.json index 2085852a2..8557426c0 100644 --- a/data/presets/presets/power/plant.json +++ b/data/presets/presets/power/plant.json @@ -4,6 +4,8 @@ "name", "operator", "address", + "plant/source", + "plant/method", "plant/output/electricity", "start_date" ], diff --git a/data/presets/presets/power/plant/source/coal.json b/data/presets/presets/power/plant/source/coal.json new file mode 100644 index 000000000..bbfd55ede --- /dev/null +++ b/data/presets/presets/power/plant/source/coal.json @@ -0,0 +1,39 @@ +{ + "icon": "maki-industry", + "fields": [ + "name", + "operator", + "address", + "plant/output/electricity", + "start_date" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "coal" + }, + "addTags": { + "power": "plant", + "landuse": "industrial", + "plant:source": "coal", + "plant:method": "combustion", + "plant:output:electricity": "*" + }, + "reference": { + "key": "plant:source", + "value": "coal" + }, + "terms": [ + "carbon", + "combustion", + "fossil fuel", + "coalfired", + "power station" + ], + "name": "Coal-Fired Power Plant" +} diff --git a/data/presets/presets/power/plant/source/gas.json b/data/presets/presets/power/plant/source/gas.json new file mode 100644 index 000000000..cbe8a9616 --- /dev/null +++ b/data/presets/presets/power/plant/source/gas.json @@ -0,0 +1,40 @@ +{ + "icon": "temaki-gas", + "fields": [ + "name", + "operator", + "address", + "plant/output/electricity", + "start_date" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "gas" + }, + "addTags": { + "power": "plant", + "landuse": "industrial", + "plant:source": "gas", + "plant:method": "combustion", + "plant:output:electricity": "*" + }, + "reference": { + "key": "plant:source", + "value": "gas" + }, + "terms": [ + "carbon", + "combustion", + "fossil fuel", + "gasfired", + "power station", + "natural gas" + ], + "name": "Gas-Fired Power Plant" +} diff --git a/data/presets/presets/power/plant/source/hydro.json b/data/presets/presets/power/plant/source/hydro.json new file mode 100644 index 000000000..593378d70 --- /dev/null +++ b/data/presets/presets/power/plant/source/hydro.json @@ -0,0 +1,34 @@ +{ + "icon": "maki-dam", + "fields": [ + "{power/plant}" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "hydro" + }, + "addTags": { + "power": "plant", + "landuse": "industrial", + "plant:source": "hydro", + "plant:output:electricity": "*" + }, + "reference": { + "key": "plant:source", + "value": "hydro" + }, + "terms": [ + "dam", + "power plant", + "run-of-the-river", + "tidal", + "water turbine" + ], + "name": "Hydroelectric Power Station" +} diff --git a/data/presets/presets/power/plant/source/nuclear.json b/data/presets/presets/power/plant/source/nuclear.json new file mode 100644 index 000000000..5d91e194b --- /dev/null +++ b/data/presets/presets/power/plant/source/nuclear.json @@ -0,0 +1,34 @@ +{ + "icon": "temaki-radiation", + "fields": [ + "{power/plant}" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "nuclear" + }, + "addTags": { + "power": "plant", + "landuse": "industrial", + "plant:source": "nuclear", + "plant:method": "fission", + "plant:output:electricity": "*" + }, + "reference": { + "key": "plant:source", + "value": "nuclear" + }, + "terms": [ + "atomic", + "fission", + "power station", + "nuclear reactor" + ], + "name": "Nuclear Power Plant" +} diff --git a/data/presets/presets/power/plant/method/photovoltaic.json b/data/presets/presets/power/plant/source/solar.json similarity index 90% rename from data/presets/presets/power/plant/method/photovoltaic.json rename to data/presets/presets/power/plant/source/solar.json index 8b18f377c..26efb8e5b 100644 --- a/data/presets/presets/power/plant/method/photovoltaic.json +++ b/data/presets/presets/power/plant/source/solar.json @@ -11,17 +11,17 @@ ], "tags": { "power": "plant", - "plant:method": "photovoltaic" + "plant:source": "solar" }, "addTags": { "power": "plant", - "plant:method": "photovoltaic", "plant:source": "solar", + "plant:method": "photovoltaic", "plant:output:electricity": "*" }, "removeTags": { "power": "plant", - "plant:method": "photovoltaic", + "plant:method": "*", "plant:source": "solar", "plant:output:electricity": "*", "landuse": "industrial" diff --git a/data/presets/presets/power/plant/source/wind.json b/data/presets/presets/power/plant/source/wind.json index e1aa164ed..86076bef6 100644 --- a/data/presets/presets/power/plant/source/wind.json +++ b/data/presets/presets/power/plant/source/wind.json @@ -1,7 +1,11 @@ { "icon": "temaki-wind_turbine", "fields": [ - "{power/plant}" + "name", + "operator", + "address", + "plant/output/electricity", + "start_date" ], "moreFields": [ "{power/plant}" @@ -16,6 +20,7 @@ "addTags": { "power": "plant", "plant:source": "wind", + "plant:method": "wind_turbine", "plant:output:electricity": "*" }, "removeTags": { @@ -30,10 +35,12 @@ "value": "wind" }, "terms": [ - "photovoltaic power station", - "solar panels", - "solar park", - "utility-scale solar" + "offshore wind", + "wind park", + "wind power plant", + "wind power station", + "wind turbines", + "windmills" ], "name": "Wind Farm" } diff --git a/data/taginfo.json b/data/taginfo.json index 19dc2ddff..b151a2d64 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -910,7 +910,11 @@ {"key": "power", "value": "line", "description": "🄿 Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power_tower.svg"}, {"key": "power", "value": "minor_line", "description": "🄿 Minor Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/power-line.svg"}, {"key": "power", "value": "plant", "description": "🄿 Power Station Grounds", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, - {"key": "plant:method", "value": "photovoltaic", "description": "🄿 Solar Farm", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-solar-panel.svg"}, + {"key": "plant:source", "value": "coal", "description": "🄿 Coal-Fired Power Plant", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, + {"key": "plant:source", "value": "gas", "description": "🄿 Gas-Fired Power Plant", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gas.svg"}, + {"key": "plant:source", "value": "hydro", "description": "🄿 Hydroelectric Power Station", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"}, + {"key": "plant:source", "value": "nuclear", "description": "🄿 Nuclear Power Plant", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/radiation.svg"}, + {"key": "plant:source", "value": "solar", "description": "🄿 Solar Farm", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-solar-panel.svg"}, {"key": "plant:source", "value": "wind", "description": "🄿 Wind Farm", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wind_turbine.svg"}, {"key": "power", "value": "pole", "description": "🄿 Power Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/utility_pole.svg"}, {"key": "power", "value": "substation", "description": "🄿 Substation", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"}, @@ -1675,7 +1679,9 @@ {"key": "piste:type", "value": "playground", "description": "🄵 Type"}, {"key": "piste:type", "value": "connection", "description": "🄵 Type"}, {"key": "plant", "description": "🄵 Plant"}, + {"key": "plant:method", "description": "🄵 Generation Method"}, {"key": "plant:output:electricity", "description": "🄵 Power Output"}, + {"key": "plant:source", "description": "🄵 Energy Source"}, {"key": "playground:theme", "description": "🄵 Theme"}, {"key": "population", "description": "🄵 Population"}, {"key": "post:block_number", "description": "🄵 Delivery Address"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 060d10f37..b3b74a3b9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4052,10 +4052,16 @@ "plant": { "label": "Plant" }, + "plant/method": { + "label": "Generation Method" + }, "plant/output/electricity": { "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..." }, + "plant/source": { + "label": "Energy Source" + }, "playground": { "label": "Type" }, @@ -8553,13 +8559,29 @@ "name": "Power Station Grounds", "terms": "coal,gas,generat*,hydro,nuclear,power,station" }, - "power/plant/method/photovoltaic": { + "power/plant/source/coal": { + "name": "Coal-Fired Power Plant", + "terms": "carbon,combustion,fossil fuel,coalfired,power station" + }, + "power/plant/source/gas": { + "name": "Gas-Fired Power Plant", + "terms": "carbon,combustion,fossil fuel,gasfired,power station,natural gas" + }, + "power/plant/source/hydro": { + "name": "Hydroelectric Power Station", + "terms": "dam,power plant,run-of-the-river,tidal,water turbine" + }, + "power/plant/source/nuclear": { + "name": "Nuclear Power Plant", + "terms": "atomic,fission,power station,nuclear reactor" + }, + "power/plant/source/solar": { "name": "Solar Farm", "terms": "photovoltaic power station,solar panels,solar park,utility-scale solar" }, "power/plant/source/wind": { "name": "Wind Farm", - "terms": "photovoltaic power station,solar panels,solar park,utility-scale solar" + "terms": "offshore wind,wind park,wind power plant,wind power station,wind turbines,windmills" }, "power/pole": { "name": "Power Pole",