Changeset 7116 in josm for trunk

Timestamp:

2014-05-12T23:40:14+02:00 (10 years ago)

Author:

simon04

Message:

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

Location:

trunk

Files:

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

trunk/data/defaultpresets.xml

@@ -828 +828 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge" />
             <space />
-            <combo key="bridge" text="Bridge" values="yes,viaduct,suspension,swing,aqueduct" match="keyvalue" default="yes" />
+            <combo key="bridge" text="Bridge" values="yes,aqueduct,cantilever,covered,low_water_crossing,movable,suspension,swing,trestle,viaduct" match="keyvalue" default="yes" />
             <optional>
                 <text key="name" text="Name" />

trunk/styles/standard/elemstyles.mapcss

@@ -82 +82 @@
 way[bridge=viaduct]::core_bridge,
 way[bridge=swing]::core_bridge,
+way[bridge=movable]::core_bridge,
+way[bridge=cantilever]::core_bridge,
+way[bridge=covered]::core_bridge,
+way[bridge=low_water_crossing]::core_bridge,
+way[bridge=trestle]::core_bridge,
 way[bridge=aqueduct]::core_bridge {
     object-z-index: 1;
@@ -88 +93 @@
     opacity: 0.5;
 }
-node[bridge?],
-node[bridge=viaduct],
-node[bridge=swing] {
-    icon-image: "vehicle/viaduct.png";
-    text: auto;
-}
-node[bridge=aqueduct] {
-    icon-image: "nautical/aqueduct.png";
-    text: auto;
-}
 way[tunnel?]::core_tunnel {
     object-z-index: 1;
@@ -105 +100 @@
 }
 node[oneway],
-node[bridge?!],
+node[bridge],
 node[tunnel?],
 node[tunnel?!],

trunk/styles/standard/elemstyles.xml

@@ -113 +113 @@
         </rule>
         <rule>
+                <condition k="bridge"/>
+                <icon annotate="true" src="misc/deprecated.png"/>
+        </rule>
+        <rule>
                 <condition k="bridge" b="yes"/>
                 <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
-                <icon annotate="true" src="vehicle/viaduct.png"/>
-        </rule>
-        <rule>
-                <condition k="bridge" b="no"/>
-                <icon annotate="true" src="misc/deprecated.png"/>
         </rule>
         <rule>
                 <condition k="bridge" v="viaduct"/>
                 <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
-                <icon annotate="true" src="vehicle/viaduct.png"/>
         </rule>
         <rule>
                 <condition k="bridge" v="aqueduct"/>
                 <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
-                <icon annotate="true" src="nautical/aqueduct.png"/>
+        </rule>
+        <rule>
+                <condition k="bridge" v="movable"/>
+                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+        </rule>
+        <rule>
+                <condition k="bridge" v="cantilever"/>
+                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+        </rule>
+        <rule>
+                <condition k="bridge" v="covered"/>
+                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+        </rule>
+        <rule>
+                <condition k="bridge" v="low_water_crossing"/>
+                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+        </rule>
+        <rule>
+                <condition k="bridge" v="trestle"/>
+                <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
         </rule>
         <rule>
                 <condition k="bridge" v="swing"/>
                 <linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
-                <icon annotate="true" src="vehicle/viaduct.png"/>
         </rule>
         <rule>