Changeset 4210 in josm for trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

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

  • trunk/styles/standard/elemstyles.xml

    r4044 r4210  
    12411241        </rule>
    12421242
     1243    <!-- power_source is depricated by the wiki, but still in use -->
    12431244        <rule>
    12441245                <condition k="power_source" v="wind"/>
    … …  
    12791280        <rule>
    12801281                <condition k="power_source" v="nuclear"/>
     1282                <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
     1283                <area colour="power#eeeeee"/>
     1284        </rule>
     1285
     1286    <!-- generator:source replaces power_source -->
     1287        <rule>
     1288                <condition k="generator:source" v="wind"/>
     1289                <icon annotate="true" src="misc/landmark/power/wind.png"/>
     1290                <area colour="power#eeeeee"/>
     1291        </rule>
     1292
     1293        <rule>
     1294                <condition k="generator:source" v="hydro"/>
     1295                <icon annotate="true" src="misc/landmark/power/hydro.png"/>
     1296                <area colour="power#eeeeee"/>
     1297        </rule>
     1298
     1299        <rule>
     1300                <condition k="generator:source" v="coal"/>
     1301                <icon annotate="true" src="misc/landmark/power/fossil.png"/>
     1302                <area colour="power#eeeeee"/>
     1303        </rule>
     1304
     1305        <rule>
     1306                <condition k="generator:source" v="gas"/>
     1307                <icon annotate="true" src="misc/landmark/power/fossil.png"/>
     1308                <area colour="power#eeeeee"/>
     1309        </rule>
     1310
     1311        <rule>
     1312                <condition k="generator:source" v="nuclear"/>
    12811313                <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
    12821314                <area colour="power#eeeeee"/>
Note: See TracChangeset for help on using the changeset viewer.