Changeset 10896 in josm


Ignore:
Timestamp:
2016-08-25T16:26:06+02:00 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r10728 r10896  
    128128        String directionDefault = "oneway? | (aerialway=* -aerialway=station) | "+
    129129                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
    130                 "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
     130                "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
    131131                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
    132132                "(highway=motorway_link & -oneway=no & -oneway=reversible)";
  • trunk/styles/standard/elemstyles.mapcss

    r10825 r10896  
    10611061    color: ski#809bc0;
    10621062}
    1063 area[piste:difficulty=easy][!highway]:closed::core_piste {
     1063area[piste:difficulty=easy][!highway][area=yes]::core_piste {
    10641064    fill-color: piste_easy#0000ff;
    10651065}
     
    10701070    color: piste_easy#0000ff;
    10711071}
    1072 area[piste:difficulty=intermediate][!highway]:closed::core_piste {
     1072area[piste:difficulty=intermediate][!highway][area=yes]::core_piste {
    10731073    fill-color: piste_intermediate#ff0000;
    10741074}
     
    10791079    color: piste_intermediate#ff0000;
    10801080}
    1081 area[piste:difficulty=advanced][!highway]:closed::core_piste {
     1081area[piste:difficulty=advanced][!highway][area=yes]::core_piste {
    10821082    fill-color: piste_advanced#606060;
    10831083}
     
    10881088    color: piste_advanced#606060;
    10891089}
    1090 area[piste:difficulty=expert][!highway]:closed::core_piste {
     1090area[piste:difficulty=expert][!highway][area=yes]::core_piste {
    10911091    fill-color: piste_expert#606060;
    10921092}
     
    10971097    color: piste_expert#606060;
    10981098}
    1099 area[piste:difficulty=freeride][!highway]:closed::core_piste {
     1099area[piste:difficulty=freeride][!highway][area=yes]::core_piste {
    11001100    fill-color: piste_freeride#ffff00;
    11011101}
     
    11061106    color: piste_freeride#ffff00;
    11071107}
    1108 area[piste:difficulty=novice][!highway]:closed::core_piste {
     1108area[piste:difficulty=novice][!highway][area=yes]::core_piste {
    11091109    fill-color: piste_novice#00ff00;
    11101110}
Note: See TracChangeset for help on using the changeset viewer.