Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18263)
+++ trunk/resources/data/defaultpresets.xml	(revision 18264)
@@ -415,4 +415,21 @@
             <reference ref="voltage_frequency" />
         </optional>
+    </chunk>
+    <chunk id="power_plant">
+        <key key="power" value="plant" />
+        <reference ref="name_ref_operator" />
+        <text key="start_date" text="Start date" />
+        <optional text="Output forms of energy (optional):">
+            <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" />
+        </optional>
+    </chunk>
+    <chunk id="power_source_values">
     </chunk>
     <chunk id="power_pole">
@@ -6180,42 +6197,177 @@
     </group> <!-- Military -->
     <group name="Power" icon="presets/power/power.svg">
-        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
-            <link wiki="Tag:power=plant" />
-            <space />
-            <key key="power" value="plant" />
-            <reference ref="name_ref_operator" />
-            <text key="start_date" text="Start date" />
-            <optional text="Output forms of energy (optional):">
-                <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" />
-                <space />
-                <combo key="plant:source" text="Plant source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
-            </optional>
-        </item> <!-- Power Plant -->
+        <group name="Power Plant" icon="presets/power/plant.svg">
+            <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+              <!-- FIXME, following does not work: match_expression="power=plant !(plant:source=biofuel|plant:source=biogas|plant:source=biomass|plant:source=coal|plant:source=diesel|plant:source=gas|plant:source=gasoline|plant:source=geothermal|plant:source=hydro|plant:source=nuclear|plant:source=oil|plant:source=osmotic|plant:source=solar|plant:source=tidal|plant:source=waste|plant:source=wave|plant:source=wind)" -->
+                <link wiki="Tag:power=plant" />
+                <space />
+                <reference ref="power_plant" />
+                <multiselect key="plant:source" text="Plant source" values_searchable="true" values_sort="false">
+                    <list_entry value="biofuel" display_value="Biofuel" icon="presets/power/power_source-biofuel.svg" />
+                    <list_entry value="oil" display_value="Oil" icon="presets/power/power_source-oil.svg" />
+                    <list_entry value="diesel" display_value="Diesel" icon="presets/power/power_source-oil.svg" />
+                    <list_entry value="gasoline" display_value="Gasoline" icon="presets/power/power_source-oil.svg" />
+                    <list_entry value="biogas" display_value="Biogas" icon="presets/power/power_source-biofuel.svg" />
+                    <list_entry value="gas" display_value="Gas" icon="presets/power/power_source-gas.svg" />
+                    <list_entry value="biomass" display_value="Biomass" icon="presets/power/power_source-biofuel.svg" />
+                    <list_entry value="waste" display_value="Waste" icon="presets/power/power_source-waste.svg" />
+                    <list_entry value="coal" display_value="Coal" icon="presets/power/power_source-coal.svg" />
+                    <list_entry value="nuclear" display_value="Nuclear" icon="presets/power/power_source-nuclear.svg" />
+                    <list_entry value="geothermal" display_value="Geothermal" icon="presets/power/power_source-geothermal.svg" />
+                    <list_entry value="hydro" display_value="Hygro" icon="presets/power/power_source-water.svg" />
+                    <list_entry value="osmotic" display_value="Osmotic" icon="presets/power/power_source-water.svg" />
+                    <list_entry value="tidal" display_value="Tidal" icon="presets/power/power_source-water.svg" />
+                    <list_entry value="wave" display_value="Wave" icon="presets/power/power_source-water.svg" />
+                    <list_entry value="solar" display_value="Solar" icon="presets/power/power_source-sun.svg" />
+                    <list_entry value="wind" display_value="Wind" icon="presets/power/power_source-wind.svg" />
+                </multiselect>
+            </item> <!-- Power Plant -->
+            <separator/>
+            <item name="Biofuel Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="biofuel" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Biofuel Power Plant -->
+            <item name="Biogas Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="biogas" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Biogas Power Plant -->
+            <item name="Biomass Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=biomass" />
+                <key key="plant:source" value="biomass" />
+                <space />
+                <reference ref="power_plant" />
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
+            </item> <!-- Biomass Power Plant -->
+            <item name="Coal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=coal" />
+                <key key="plant:source" value="coal" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Coal Power Plant -->
+            <item name="Gas Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=gas" />
+                <key key="plant:source" value="gas" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Gas Power Plant -->
+            <item name="Oil Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=oil" />
+                <key key="plant:source" value="oil" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Oil Power Plant -->
+            <item name="Diesel Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="diesel" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Diesel Power Plant -->
+            <item name="Gasoline Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="gasoline" />
+                <key key="plant:method" value="combustion" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Gasoline Power Plant -->
+            <item name="Nuclear Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=nuclear" />
+                <key key="plant:source" value="nuclear" />
+                <space />
+                <reference ref="power_plant" />
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="fission,fusion" />
+            </item> <!-- Nuclear Power Plant -->
+            <item name="Solar Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=solar" />
+                <key key="plant:source" value="solar" />
+                <space />
+                <reference ref="power_plant" />
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
+            </item> <!-- Solar Power Plant -->
+            <item name="Waste Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=waste" />
+                <key key="plant:source" value="waste" />
+                <space />
+                <reference ref="power_plant" />
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
+            </item> <!-- Waste Power Plant -->
+            <item name="Hydro Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=hydro" />
+                <key key="plant:source" value="hydro" />
+                <space />
+                <reference ref="power_plant" />
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
+            </item> <!-- Hydro Power Plant -->
+            <item name="Tidal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="tidal" />
+                <space />
+                <reference ref="power_plant" />
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="barrage,stream" />
+            </item> <!-- Tidal Power Plant -->
+            <item name="Wave Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="wave" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Wave Power Plant -->
+            <item name="Osmotic Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:power=plant" />
+                <key key="plant:source" value="osmotic" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Osmotic Power Plant -->
+            <item name="Geothermal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=geothermal" />
+                <key key="plant:source" value="geothermal" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Geothermal Power Plant -->
+            <item name="Wind Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=wind" />
+                <key key="plant:source" value="wind" />
+                <key key="plant:method" value="wind_turbine" match="none" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Wind Power Plant -->
+        </group> <!-- Power Plant -->
         <group name="Power Generator" icon="presets/power/generator.svg">
             <item name="Biofuel Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=biofuel" />
                 <key key="generator:source" value="biofuel" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=biofuel" />
             </item> <!-- Power Generator -->
             <item name="Biogas Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=biogas" />
                 <key key="generator:source" value="biogas" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=biogas" />
             </item> <!-- Biogas Power Generator -->
             <item name="Biomass Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=biomass" />
                 <key key="generator:source" value="biomass" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
@@ -6227,47 +6379,54 @@
                 </combo>
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=biomass" />
             </item> <!-- Biomass Power Generator -->
             <item name="Coal Power Generator" icon="presets/power/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=coal" />
                 <key key="generator:source" value="coal" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=coal" />
             </item> <!-- Coal Power Generator -->
             <item name="Gas Power Generator" icon="presets/power/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=gas" />
                 <key key="generator:source" value="gas" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=gas" />
             </item> <!-- Gas Power Generator -->
             <item name="Oil Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=oil" />
                 <key key="generator:source" value="oil" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=oil" />
             </item> <!-- Oil Power Generator -->
             <item name="Diesel Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=diesel" />
                 <key key="generator:source" value="diesel" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
             </item> <!-- Diesel Power Generator -->
             <item name="Gasoline Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=gasoline" />
                 <key key="generator:source" value="gasoline" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="combustion" />
+                <key key="generator:method" value="combustion" match="none" />
                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=gasoline" />
             </item> <!-- Gasoline Power Generator -->
             <item name="Nuclear Reactor" icon="presets/power/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=nuclear" />
                 <key key="generator:source" value="nuclear" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:method" text="Method" values_context="generator method" values="fission,fusion" />
@@ -6292,8 +6451,9 @@
                 </combo>
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=nuclear" />
             </item> <!-- Nuclear Reactor -->
             <item name="Solar Power Generator" icon="presets/power/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=solar" />
                 <key key="generator:source" value="solar" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
@@ -6304,8 +6464,9 @@
                 </combo>
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=solar" />
             </item> <!-- Solar Power Generator -->
             <item name="Waste Power Generator" icon="presets/power/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=waste" />
                 <key key="generator:source" value="waste" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
@@ -6318,8 +6479,9 @@
                 <combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=waste" />
             </item> <!-- Waste Power Generator -->
             <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=hydro" />
                 <key key="generator:source" value="hydro" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
@@ -6331,8 +6493,9 @@
                 </combo>
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=hydro" />
             </item> <!-- Water Turbine -->
             <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=tidal" />
                 <key key="generator:source" value="tidal" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:method" text="Method" values_context="generator method" values="barrage,stream" />
@@ -6343,34 +6506,47 @@
                 </combo>
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=tidal" />
             </item> <!-- Tidal Water Turbine -->
             <item name="Wave Energy Converter" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=wave" />
                 <key key="generator:source" value="wave" />
+                <space />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=wave" />
             </item> <!-- Wave Energy Converter -->
             <item name="Osmotic Power Generator" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=osmotic" />
                 <key key="generator:source" value="osmotic" />
+                <space />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=osmotic" />
             </item> <!-- Osmotic Power Generator -->
             <item name="Geothermal Power Generator" icon="presets/power/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:generator:source=geothermal" />
                 <key key="generator:source" value="geothermal" />
+                <space />
                 <reference ref="power_generator" />
                 <combo key="generator:type" text="Generator Type" values="heat_pump,steam_turbine" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=geothermal" />
             </item> <!-- Geothermal Power Generator -->
             <item name="Wind Turbine" icon="presets/power/power_source-wind.svg" type="node,closedway" preset_name_label="true">
+                <link wiki="Tag:generator:source=wind" />
                 <key key="generator:source" value="wind" />
+                <space />
                 <reference ref="power_generator" />
-                <key key="generator:method" value="wind_turbine" />
+                <key key="generator:method" value="wind_turbine" match="none" />
                 <combo key="generator:type" text="Generator Type" values="horizontal_axis,vertical_axis" />
                 <reference ref="power_output" />
-                <link wiki="Tag:generator:source=wind" />
             </item> <!-- Wind Turbine -->
         </group> <!-- Power Generator -->
+        <item name="Heliostat" icon="presets/power/heliostat.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:power=heliostat" />
+            <key key="power" value="heliostat" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="start_date" text="Start date" />
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+        </item> <!-- Heliostat -->
         <separator/>
         <item name="Power Substation" icon="presets/power/substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
Index: trunk/resources/images/presets/power/heliostat.svg
===================================================================
--- trunk/resources/images/presets/power/heliostat.svg	(revision 18264)
+++ trunk/resources/images/presets/power/heliostat.svg	(revision 18264)
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333332"
+   version="1.1"
+   id="svg103">
+  <defs
+     id="defs97">
+    <linearGradient
+       id="linearGradient875">
+      <stop
+         style="stop-color:#37c8ab;stop-opacity:1;"
+         offset="0"
+         id="stop871" />
+      <stop
+         style="stop-color:#37c8ab;stop-opacity:0;"
+         offset="1"
+         id="stop873" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient2746"
+       id="linearGradient76"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0063402,0,0,0.01089837,0.31596912,-3.1031401)"
+       x1="134.69441"
+       y1="351.9769"
+       x2="397.56601"
+       y2="546.21515" />
+    <linearGradient
+       id="linearGradient2746"
+       y2="528.78003"
+       gradientUnits="userSpaceOnUse"
+       x2="495.23999"
+       y1="552.96997"
+       x1="495.23999">
+      <stop
+         style="stop-color:#d7e8e5;stop-opacity:1"
+         offset="0"
+         id="stop2742" />
+      <stop
+         style="stop-color:#3a8af0;stop-opacity:1"
+         offset="1"
+         id="stop2744" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_7_"
+       y2="410.01999"
+       gradientUnits="userSpaceOnUse"
+       x2="97.646004"
+       y1="559.02002"
+       x1="487.64999"
+       gradientTransform="matrix(0.00704467,0,0,0.0121093,0.10949174,-3.6725327)">
+      <stop
+         style="stop-color:#878787"
+         offset="0"
+         id="stop94" />
+      <stop
+         style="stop-color:#8F8F8E"
+         offset=".2396"
+         id="stop96" />
+      <stop
+         style="stop-color:#A1A1A1"
+         offset=".9066"
+         id="stop98" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_6_"
+       y2="561.08002"
+       gradientUnits="userSpaceOnUse"
+       x2="284.92001"
+       y1="589.39001"
+       x1="284.92001"
+       gradientTransform="matrix(0.00704467,0,0,0.00782921,0.10949843,-1.2547334)">
+      <stop
+         style="stop-color:#474746"
+         offset="0"
+         id="stop87" />
+      <stop
+         style="stop-color:#727271"
+         offset=".9505"
+         id="stop89" />
+    </linearGradient>
+    <radialGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       cy="17073"
+       cx="1528.5"
+       gradientTransform="matrix(0.00682951,0,0,3.9142193e-4,-8.3222223,-2.7011195)"
+       r="226.97">
+      <stop
+         style="stop-color:#373636"
+         offset="0"
+         id="stop2" />
+      <stop
+         style="stop-color:#3E3E3D"
+         offset=".0742"
+         id="stop4" />
+      <stop
+         style="stop-color:#515150"
+         offset=".1777"
+         id="stop6" />
+      <stop
+         style="stop-color:#6E6E6D"
+         offset=".2987"
+         id="stop8" />
+      <stop
+         style="stop-color:#939393"
+         offset=".4317"
+         id="stop10" />
+      <stop
+         style="stop-color:#9B9B9A"
+         offset=".4581"
+         id="stop12" />
+      <stop
+         style="stop-color:#B9B8B8"
+         offset=".5564"
+         id="stop14" />
+      <stop
+         style="stop-color:#D2D2D2"
+         offset=".6658"
+         id="stop16" />
+      <stop
+         style="stop-color:#E2E2E2"
+         offset=".7569"
+         id="stop18" />
+      <stop
+         style="stop-color:#E7E7E7"
+         offset=".8177"
+         id="stop20" />
+      <stop
+         style="stop-color:#FFFFFF"
+         offset="1"
+         id="stop22" />
+    </radialGradient>
+    <linearGradient
+       id="SVGID_5_"
+       y2="490.45001"
+       gradientUnits="userSpaceOnUse"
+       x2="284.92001"
+       y1="669.77002"
+       x1="284.92001"
+       gradientTransform="matrix(0.00782842,0,0,0.00782842,-0.11380738,-1.2542693)">
+      <stop
+         style="stop-color:#9B9B9A"
+         offset="0"
+         id="stop80" />
+      <stop
+         style="stop-color:#7E7E7D"
+         offset=".9505"
+         id="stop82" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient875"
+       id="linearGradient877"
+       x1="2.5141428"
+       y1="2.7444255"
+       x2="2.0340495"
+       y2="2.5912654"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata100">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     y="2.585182"
+     x="1.8946526"
+     height="1.4037925"
+     width="0.44402808"
+     fill="url(#SVGID_5_)"
+     id="rect85"
+     style="fill:url(#SVGID_5_);stroke:#ffffff;stroke-width:0.00782841" />
+  <ellipse
+     style="opacity:0.998;fill:#cccccc;fill-opacity:1;stroke:#dbe3e2;stroke-width:0.00724377;stroke-linejoin:round;stop-color:#000000"
+     id="path117-7"
+     cx="2.1166666"
+     cy="2.6095161"
+     rx="0.36218813"
+     ry="0.28132737" />
+  <ellipse
+     style="opacity:0.998;fill:url(#linearGradient877);stroke:#000000;stroke-width:0.00724377;stroke-linejoin:round;stop-color:#000000;fill-opacity:1"
+     id="path117"
+     cx="2.1166666"
+     cy="2.6095161"
+     rx="0.36218813"
+     ry="0.28132737" />
+  <g
+     id="g56">
+    <path
+       d="m 0.26003573,3.13808 v 0.1718956 c 0,0.029118 0.021262,0.04971 0.047481,0.04971 H 1.6036591 c 0.024058,0 0.0367,-0.016571 0.040819,-0.04971 L 1.7278728,2.5812531 H 2.5044686 L 2.5908291,3.30997 c 0.00608,0.030971 0.016402,0.04971 0.041514,0.04971 l 1.2935245,-3e-7 c 0.0262,0 0.04743,-0.023656 0.04743,-0.052784 V 3.1380742 L 2.745042,3.1456572 2.6488177,2.3254478 H 1.5875 L 1.4958728,3.1456572 H 0.26005723 Z"
+       fill="url(#SVGID_6_)"
+       id="path92"
+       style="fill:url(#SVGID_6_);stroke-width:0.00742656" />
+    <path
+       d="m 3.9732813,3.119814 c 0.005,0.026617 -0.01231,0.048135 -0.03853,0.048135 H 2.7012192 c -0.036863,0 -0.03823,-0.029679 -0.046483,-0.053165 L 2.5654696,2.3812499 H 1.6543774 l -0.07443,0.7330735 c -0.00934,0.028515 -0.01687,0.051887 -0.052087,0.05193 l -1.22928126,0.00169 c -0.026243,3.2e-5 -0.043481,-0.021513 -0.038543,-0.048135 l 0.408527,-2.19661937 c 0.00495,-0.026665 0.025383,-0.048183 0.045566,-0.048183 H 3.5191733 c 0.02026,0 0.0407,0.021513 0.04559,0.048183 L 3.9732853,3.119814 Z"
+       fill="url(#SVGID_7_)"
+       id="path101"
+       style="display:inline;fill:url(#SVGID_7_);stroke:#ececec;stroke-width:0.00923615" />
+    <path
+       d="m 3.7889941,3.0532938 -1.0009473,0.00705 -0.098871,-0.8711631 h -1.152728 l -0.080893,0.862589 -1.01120978,0.00153 0.3739951,-2.06364627 H 3.4149728 Z"
+       fill="url(#SVGID_7_)"
+       id="path101-3"
+       style="display:inline;fill:url(#linearGradient76);fill-opacity:1;stroke:#000000;stroke-width:0.00828307;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 18263)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 18264)
@@ -1291,4 +1291,8 @@
 node[power=generator] {
     icon-image: "presets/power/generator.svg";
+    set icon_z17;
+}
+node[power=heliostat] {
+    icon-image: "presets/power/heliostat.svg";
     set icon_z17;
 }