Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml (revision 6044)
+++ data/defaultpresets.xml (working copy)
@@ -54,7 +54,7 @@
                   database values, order and number must be equal to values
   short_descriptions: comma separated list of texts to be displayed below each
                       display_value. (Only if it is not possible to describe
-                      the entry in 2-3 words.) Instead of comma separeted list
+                      the entry in 2-3 words.) Instead of comma separated list
   instead using values, display_values and short_descriptions, the following form is also supported:
     <list_entry value="" display_value="" short_description="" icon="" icon_size=""/>
         icon: location of icon
@@ -4833,7 +4833,29 @@
         </item>
     </group> <!-- Man Made -->
     <group name="Power" icon="presets/power.png">
-        <item name="Power Generator" icon="presets/power.png" type="node,closedway">
+        <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant" />
+            <label text="Edit Power Plant" />
+            <key key="power" value="plant" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference" />
+            <text key="start_date" text="Start date" />
+            <optional>
+                <label text="Output forms of energy (please add this information to the generators if possible)" />
+                <space />
+                <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
+                <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
+            </optional>
+        </item>
+        <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
@@ -4843,8 +4865,30 @@
             <label text="Edit Power Generator" />
             <key key="power" value="generator" />
             <text key="name" text="Name" />
-            <combo key="generator:source" text="Source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
-            <combo key="generator:method" text="Method" values="anaerobic_digestion,combustion,dam,fission,fusion,gasification,photovoltaic,pumped-storage,pumping,pyrolysis,run-of-the-river,thermal" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference" />
+            <text key="start_date" text="Start date" />
+            <multiselect key="generator:source" text="Source" delimiter=";">   <!--    <list_entry value="" display_value="" short_description="" icon="" icon_size=""/> -->
+                <list_entry value="biofuel" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
+                <list_entry value="biogas" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
+                <list_entry value="biomass" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
+                <list_entry value="coal" icon="http://wiki.openstreetmap.org/w/images/4/4b/Bahnpirat-power_source-coal.svg" />
+                <list_entry value="diesel" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
+                <list_entry value="gas" icon="http://wiki.openstreetmap.org/w/images/e/e6/Bahnpirat-power_source-gas.svg" />
+                <list_entry value="gasoline" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
+                <list_entry value="geothermal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+                <list_entry value="hydro" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+                <list_entry value="nuclear" icon="http://wiki.openstreetmap.org/w/images/3/3e/2020_stBN_powergensource_nuclear.svg" />
+                <list_entry value="oil" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
+                <list_entry value="osmotic" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+                <list_entry value="solar" icon="http://wiki.openstreetmap.org/w/images/2/22/2020_stBN_powergensource_sun.svg" />
+                <list_entry value="tidal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+                <list_entry value="waste" icon="http://wiki.openstreetmap.org/w/images/2/2f/Bahnpirat-power_source-waste.svg" />
+                <list_entry value="wave" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+                <list_entry value="wind" icon="http://wiki.openstreetmap.org/w/images/0/03/2020_stBN_powergensource_wind.svg" />
+            </multiselect>
+            <multiselect key="generator:method" text="Method" values="barrage;combustion;fission;fusion;gasification;photovoltaic;pyrolysis;run-of-the-river;stream;thermal;water-pumped-storage;water-storage" />
+            <combo key="generator:type" text="Generator Type" values="cold-fusion,combined_cycle,francis_turbine,gas_turbine,heat_pump,horizontal_axis,kaplan_turbine,pelton_turbine,reciprocating_engine,solar_photovoltaic_panel,solar_thermal_collector,steam_generator,steam_turbine,stellarator,tokamak,vertical_axis,BWR-1,BWR-2,BWR-3,BWR-4,BWR-5,BWR-6,CANDU,CPR-1000,EPR,ICF,PWR,RBMK-1000,RBMK-1500,VVER" display_values="cold-fusion,combined_cycle,francis_turbine,gas_turbine,heat_pump,horizontal_axis,kaplan_turbine,pelton_turbine,reciprocating_engine,solar_photovoltaic_panel,solar_thermal_collector,steam_generator,steam_turbine,stellarator,tokamak,vertical_axis,Boiling Water Reactor 1 (BWR-1),Boiling Water Reactor 2 (BWR-2),Boiling Water Reactor 3 (BWR-3),Boiling Water Reactor 4 (BWR-4),Boiling Water Reactor 5 (BWR-5),Boiling Water Reactor 6 (BWR-6),CANada Deuterium Uranium reactor (CANDU),China Pressurized Reactor (CPR-1000),European Pressurized Reactor (EPR),Inertial Confinement Fusion (ICF),Pressurized water reactor (PWR),Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000),Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500),Vodo-Vodyanoi Energetichesky Reactor (VVER)" />
             <space />
             <label text="Output forms of energy" />
             <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
@@ -4855,16 +4899,15 @@
             <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
             <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
             <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:battery_charging" text="battery charging" values="yes,2 W,3 kW,5 MW,7 GW" />
+            <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
         </item>
+        <!-- deprecated should be removed autumn 2013 -->
         <item name="Power Station" icon="presets/power.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=station"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=station"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=station"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=station"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=station" />
             <label text="Edit Power Station" />
             <key key="power" value="station" />
             <text key="name" text="Name" />
@@ -4876,11 +4919,14 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
             <label text="Edit Power Sub Station" />
             <key key="power" value="sub_station" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Line reference" />
+            <multiselect key="voltage" text="Voltage in Volts (V)" values="400000;380000;220000;110000;20000;high;medium;low" /> <!-- Recheck values -->
+            <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
         </item>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
@@ -4890,6 +4936,7 @@
             <key key="power" value="cable_distribution_cabinet" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference" />
+            <multiselect key="voltage" text="Voltage in Volts (V)" values="110000;20000;medium;low" /> <!-- Recheck values -->
         </item>
         <separator/>
         <item name="Power Tower" icon="presets/power_tower.png" type="node">
@@ -4903,7 +4950,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
             <label text="Edit Power Tower" />
             <key key="power" value="tower" />
+            <text key="operator" text="Operator" />
             <text key="ref" text="Tower reference" />
+            <text key="height" text="Height in meter (m)" />
+            <combo key="material" text="Material" values="stone,metal,steel,wood,plastic" />
         </item>
         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
@@ -4915,17 +4965,26 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
             <label text="Edit Power Pole" />
             <key key="power" value="pole" />
+            <text key="operator" text="Operator" />
             <text key="ref" text="Pole reference" />
+            <text key="height" text="Height in meter (m)" />
+            <combo key="material" text="Material" values="stone,metal,steel,wood,plastic" />
         </item>
         <item name="Power Line" icon="presets/power.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
             <label text="Edit Power Line" />
             <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" match="keyvalue" />
             <text key="operator" text="Operator" />
             <text key="ref" text="Line reference" />
             <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-            <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" />
+            <combo key="voltage" text="Voltage in Volts (V)" values="400000,380000,220000,110000,20000,high,medium,low" /> <!-- Recheck values -->
+            <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
             <text key="cables" text="Amount of Cables" />
             <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
         </item>
@@ -5824,7 +5883,7 @@
             <key key="natural" value="tree" />
             <text key="name" text="Name" />
             <text key="type" text="Type" />
-            <text key="height" text="Height" />
+            <text key="height" text="Height in meter (m)" />
             <text key="name:botanical" text="Botanical Name" />
         </item>
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">