Changeset 10896 in josm

Timestamp:

2016-08-25T16:26:06+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #6708 - Pistes can be drawn as area or linear. If linear they can be closed or not. So draw area style only if area=yes is tagged and oneway arrows only if area=yes is not tagged.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -128 +128 @@
         String directionDefault = "oneway? | (aerialway=* -aerialway=station) | "+
                 "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
-                "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
+                "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
                 "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
                 "(highway=motorway_link & -oneway=no & -oneway=reversible)";

trunk/styles/standard/elemstyles.mapcss

@@ -1061 +1061 @@
     color: ski#809bc0;
 }
-area[piste:difficulty=easy][!highway]:closed::core_piste {
+area[piste:difficulty=easy][!highway][area=yes]::core_piste {
     fill-color: piste_easy#0000ff;
 }
@@ -1070 +1070 @@
     color: piste_easy#0000ff;
 }
-area[piste:difficulty=intermediate][!highway]:closed::core_piste {
+area[piste:difficulty=intermediate][!highway][area=yes]::core_piste {
     fill-color: piste_intermediate#ff0000;
 }
@@ -1079 +1079 @@
     color: piste_intermediate#ff0000;
 }
-area[piste:difficulty=advanced][!highway]:closed::core_piste {
+area[piste:difficulty=advanced][!highway][area=yes]::core_piste {
     fill-color: piste_advanced#606060;
 }
@@ -1088 +1088 @@
     color: piste_advanced#606060;
 }
-area[piste:difficulty=expert][!highway]:closed::core_piste {
+area[piste:difficulty=expert][!highway][area=yes]::core_piste {
     fill-color: piste_expert#606060;
 }
@@ -1097 +1097 @@
     color: piste_expert#606060;
 }
-area[piste:difficulty=freeride][!highway]:closed::core_piste {
+area[piste:difficulty=freeride][!highway][area=yes]::core_piste {
     fill-color: piste_freeride#ffff00;
 }
@@ -1106 +1106 @@
     color: piste_freeride#ffff00;
 }
-area[piste:difficulty=novice][!highway]:closed::core_piste {
+area[piste:difficulty=novice][!highway][area=yes]::core_piste {
     fill-color: piste_novice#00ff00;
 }