Changeset 7821 in josm for trunk

Timestamp:

2014-12-18T17:38:04+01:00 (9 years ago)

Author:

Klumbumbus

Message:

see #10835 - icon unification and geometry consistency for barrier=*

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (6 diffs)
• images/presets/cattle_grid.png (deleted)
• images/presets/stile.png (deleted)
• images_nodist/icons/bollard-bw.png (added)
• images_nodist/icons/bollard_2.png (added)
• styles/standard/elemstyles.mapcss (modified) (4 diffs)

trunk/data/defaultpresets.xml

@@ -1236 +1236 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Cycle Barrier -->
-        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node" preset_name_label="true">
+        <item name="Cattle Grid" icon="styles/standard/vehicle/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
@@ -1317 +1317 @@
             </optional>
         </item> <!-- Fence -->
-        <item name="Guard Rail" type="way" preset_name_label="true">
+        <item name="Guard Rail" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
@@ -1355 +1355 @@
             <reference ref="optional_height" />
         </item> <!-- Retaining Wall -->
-        <item name="Ditch" name_context="Barrier" type="way" preset_name_label="true">
+        <item name="Ditch" name_context="Barrier" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
@@ -1383 +1383 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Entrance (Barrier Opening) -->
-        <item name="Gate" icon="presets/gate.png" type="node" preset_name_label="true">
+        <item name="Gate" icon="styles/standard/vehicle/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
@@ -1455 +1455 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Kissing Gate -->
-        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way" preset_name_label="true">
+        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
@@ -1462 +1462 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Chain -->
-        <item name="Stile" icon="presets/stile.png" type="node" preset_name_label="true">
+        <item name="Stile" icon="styles/standard/vehicle/stile.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
             <space />

trunk/styles/standard/elemstyles.mapcss

@@ -331 +331 @@
 }
 node[barrier=bollard] {
-    icon-image: "vehicle/restriction/bollard.png";
+    icon-image: "presets/bollard.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -349 +350 @@
 way[barrier=block],
 way[barrier=chain],
+way[barrier=ditch],
 way[barrier=kerb] {
     width: 2;
@@ -357 +359 @@
 node[barrier=guard_rail],
 node[barrier=city_wall],
-node[barrier=retaining_wall] {
+node[barrier=retaining_wall],
+node[barrier=ditch] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
@@ -378 +381 @@
 }
 node[barrier=stile] {
-    icon-image: "vehicle/stile.png";
+    icon-image: "vehicle/stile.svg";
     set icon_z17;
     text: auto;