Changeset 4210 in josm

Timestamp:

2011-07-07T15:31:25+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6436 - Changing power_source preset to generator:source (patch by claudius.h)

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -3103 +3103 @@
             <label text="Edit Power Generator" />
             <key key="power" value="generator" />
-            <combo key="power_source" text="Type" values="wind,hydro,fossil,nuclear,coal,photovoltaic,gas,oil" default="" />
+            <combo key="generator:source" text="Source" values="wind,hydro,solar,gas,coal,nuclear,fossil,oil,biofuel,waste,biomass,geothermal,biogas" default="" />
+            <combo key="generator:method" text="Method" values="photovoltaic,combustion,fission,thermal,gasification,wind_turbine,anaerobic_digestion" default="" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>

trunk/styles/standard/elemstyles.xml

@@ -1241 +1241 @@
         </rule>
 
+    <!-- power_source is depricated by the wiki, but still in use -->
         <rule>
                 <condition k="power_source" v="wind"/>
@@ -1279 +1280 @@
         <rule>
                 <condition k="power_source" v="nuclear"/>
+                <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
+                <area colour="power#eeeeee"/>
+        </rule>
+
+    <!-- generator:source replaces power_source -->
+        <rule>
+                <condition k="generator:source" v="wind"/>
+                <icon annotate="true" src="misc/landmark/power/wind.png"/>
+                <area colour="power#eeeeee"/>
+        </rule>
+
+        <rule>
+                <condition k="generator:source" v="hydro"/>
+                <icon annotate="true" src="misc/landmark/power/hydro.png"/>
+                <area colour="power#eeeeee"/>
+        </rule>
+
+        <rule>
+                <condition k="generator:source" v="coal"/>
+                <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+                <area colour="power#eeeeee"/>
+        </rule>
+
+        <rule>
+                <condition k="generator:source" v="gas"/>
+                <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+                <area colour="power#eeeeee"/>
+        </rule>
+
+        <rule>
+                <condition k="generator:source" v="nuclear"/>
                 <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
                 <area colour="power#eeeeee"/>