Changeset 7116 in josm


Ignore:
Timestamp:
2014-05-12T23:40:14+02:00 (6 years ago)
Author:
simon04
Message:

fix #9852 - Add new bridge types to styles and presets; drop icons for bridge= on nodes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7114 r7116  
    828828                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge" />
    829829            <space />
    830             <combo key="bridge" text="Bridge" values="yes,viaduct,suspension,swing,aqueduct" match="keyvalue" default="yes" />
     830            <combo key="bridge" text="Bridge" values="yes,aqueduct,cantilever,covered,low_water_crossing,movable,suspension,swing,trestle,viaduct" match="keyvalue" default="yes" />
    831831            <optional>
    832832                <text key="name" text="Name" />
  • trunk/styles/standard/elemstyles.mapcss

    r7044 r7116  
    8282way[bridge=viaduct]::core_bridge,
    8383way[bridge=swing]::core_bridge,
     84way[bridge=movable]::core_bridge,
     85way[bridge=cantilever]::core_bridge,
     86way[bridge=covered]::core_bridge,
     87way[bridge=low_water_crossing]::core_bridge,
     88way[bridge=trestle]::core_bridge,
    8489way[bridge=aqueduct]::core_bridge {
    8590    object-z-index: 1;
     
    8893    opacity: 0.5;
    8994}
    90 node[bridge?],
    91 node[bridge=viaduct],
    92 node[bridge=swing] {
    93     icon-image: "vehicle/viaduct.png";
    94     text: auto;
    95 }
    96 node[bridge=aqueduct] {
    97     icon-image: "nautical/aqueduct.png";
    98     text: auto;
    99 }
    10095way[tunnel?]::core_tunnel {
    10196    object-z-index: 1;
     
    105100}
    106101node[oneway],
    107 node[bridge?!],
     102node[bridge],
    108103node[tunnel?],
    109104node[tunnel?!],
  • trunk/styles/standard/elemstyles.xml

    r7044 r7116  
    113113        </rule>
    114114        <rule>
     115                <condition k="bridge"/>
     116                <icon annotate="true" src="misc/deprecated.png"/>
     117        </rule>
     118        <rule>
    115119                <condition k="bridge" b="yes"/>
    116120                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
    117                 <icon annotate="true" src="vehicle/viaduct.png"/>
    118         </rule>
    119         <rule>
    120                 <condition k="bridge" b="no"/>
    121                 <icon annotate="true" src="misc/deprecated.png"/>
    122121        </rule>
    123122        <rule>
    124123                <condition k="bridge" v="viaduct"/>
    125124                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
    126                 <icon annotate="true" src="vehicle/viaduct.png"/>
    127125        </rule>
    128126        <rule>
    129127                <condition k="bridge" v="aqueduct"/>
    130128                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
    131                 <icon annotate="true" src="nautical/aqueduct.png"/>
     129        </rule>
     130        <rule>
     131                <condition k="bridge" v="movable"/>
     132                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
     133        </rule>
     134        <rule>
     135                <condition k="bridge" v="cantilever"/>
     136                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
     137        </rule>
     138        <rule>
     139                <condition k="bridge" v="covered"/>
     140                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
     141        </rule>
     142        <rule>
     143                <condition k="bridge" v="low_water_crossing"/>
     144                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
     145        </rule>
     146        <rule>
     147                <condition k="bridge" v="trestle"/>
     148                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
    132149        </rule>
    133150        <rule>
    134151                <condition k="bridge" v="swing"/>
    135152                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
    136                 <icon annotate="true" src="vehicle/viaduct.png"/>
    137153        </rule>
    138154        <rule>
Note: See TracChangeset for help on using the changeset viewer.