Ignore:
Timestamp:
2016-01-22T20:06:35+01:00 (3 years ago)
Author:
Klumbumbus
Message:

fix #11549 - support cycleway=shared_lane, cycleway:left=shared_lane and cycleway:right=shared_lane in mapview

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/styles/standard/elemstyles.mapcss

    r9550 r9566  
    953953/*****************/
    954954
     955    /* prepare lane */
    955956way[oneway?][cycleway=lane]:righthandtraffic::core_cycleway,
    956957way[oneway=-1][cycleway=opposite_lane]:righthandtraffic::core_cycleway {
    957     set lR;
     958    set laneRight;
    958959    set righthandtr;
    959960}
    960961way[oneway?][cycleway=opposite_lane]:righthandtraffic::core_cycleway,
    961962way[oneway=-1][cycleway=lane]:righthandtraffic::core_cycleway {
    962     set lL;
     963    set laneLeft;
    963964    set righthandtr;
    964965}
    965966way[oneway?][cycleway=lane]!.righthandtr::core_cycleway,
    966967way[oneway=-1][cycleway=opposite_lane]!.righthandtr::core_cycleway {
    967     set lL;
     968    set laneLeft;
    968969}
    969970way[oneway?][cycleway=opposite_lane]!.righthandtr::core_cycleway,
    970971way[oneway=-1][cycleway=lane]!.righthandtr::core_cycleway {
    971     set lR;
     972    set laneRight;
    972973}
    973974way[cycleway:left=lane]::core_cycleway {
    974     set lL;
     975    set laneLeft;
    975976}
    976977way[cycleway:right=lane]::core_cycleway {
    977     set lR;
     978    set laneRight;
    978979}
    979980way[oneway=no][cycleway=lane]::core_cycleway,
    980981way[!oneway][cycleway=lane]::core_cycleway {
    981     set lL;
    982     set lR;
    983 }
    984 
     982    set laneLeft;
     983    set laneRight;
     984}
     985
     986    /* prepare shared_lane */
     987way[oneway?][cycleway=shared_lane]:righthandtraffic::core_cycleway {
     988    set shared_laneRight;
     989    set righthandtr;
     990}
     991way[oneway=-1][cycleway=shared_lane]:righthandtraffic::core_cycleway {
     992    set shared_laneLeft;
     993    set righthandtr;
     994}
     995way[oneway?][cycleway=shared_lane]!.righthandtr::core_cycleway {
     996    set shared_laneLeft;
     997}
     998way[oneway=-1][cycleway=shared_lane]!.righthandtr::core_cycleway {
     999    set shared_laneRight;
     1000}
     1001way[cycleway:left=shared_lane]::core_cycleway {
     1002    set shared_laneLeft;
     1003}
     1004way[cycleway:right=shared_lane]::core_cycleway {
     1005    set shared_laneRight;
     1006}
     1007way[oneway=no][cycleway=shared_lane]::core_cycleway,
     1008way[!oneway][cycleway=shared_lane]::core_cycleway {
     1009    set shared_laneLeft;
     1010    set shared_laneRight;
     1011}
     1012
     1013    /* prepare track */
    9851014way[oneway?][cycleway=track]:righthandtraffic::core_cycleway,
    9861015way[oneway=-1][cycleway=opposite_track]:righthandtraffic::core_cycleway {
    987     set tR;
     1016    set trackRight;
    9881017    set righthandtr;
    9891018}
    9901019way[oneway?][cycleway=opposite_track]:righthandtraffic::core_cycleway,
    9911020way[oneway=-1][cycleway=track]:righthandtraffic::core_cycleway {
    992     set tL;
     1021    set trackLeft;
    9931022    set righthandtr;
    9941023}
    9951024way[oneway?][cycleway=track]!.righthandtr::core_cycleway,
    9961025way[oneway=-1][cycleway=opposite_track]!.righthandtr::core_cycleway {
    997     set tL;
     1026    set trackLeft;
    9981027}
    9991028way[oneway?][cycleway=opposite_track]!.righthandtr::core_cycleway,
    10001029way[oneway=-1][cycleway=track]!.righthandtr::core_cycleway {
    1001     set tR;
     1030    set trackRight;
    10021031}
    10031032way[cycleway:left=track]::core_cycleway {
    1004     set tL;
     1033    set trackLeft;
    10051034}
    10061035way[cycleway:right=track]::core_cycleway {
    1007     set tR;
     1036    set trackRight;
    10081037}
    10091038way[oneway=no][cycleway=track]::core_cycleway,
    10101039way[!oneway][cycleway=track]::core_cycleway {
    1011     set tL;
    1012     set tR;
    1013 }
    1014 
    1015 way.lR::core_cycleway {
     1040    set trackLeft;
     1041    set trackRight;
     1042}
     1043
     1044    /* render lane */
     1045way.laneRight::core_cycleway {
    10161046    width: 2;
    10171047    color: bicycle#b100ff;
     
    10211051    modifier: true;
    10221052}
    1023 way[prop("lL","core_cycleway")]::core_cycleway2 {
     1053way[prop("laneLeft","core_cycleway")]::core_cycleway2 {
    10241054    width: 2;
    10251055    color: bicycle#b100ff;
     
    10291059    modifier: true;
    10301060}
    1031 way.tR::core_cycleway {
     1061    /* render shared_lane */
     1062way.shared_laneRight::core_cycleway {
     1063    width: 2;
     1064    color: bicycle#b100ff;
     1065    dashes: 6, 3;
     1066    offset: 0 - (prop("width", "default") / 2) - 2;
     1067    major-z-index: 2.1;
     1068    modifier: true;
     1069}
     1070way[prop("shared_laneLeft","core_cycleway")]::core_cycleway2 {
     1071    width: 2;
     1072    color: bicycle#b100ff;
     1073    dashes: 6, 3;
     1074    offset: (prop("width", "default") / 2) + 2;
     1075    major-z-index: 2.1;
     1076    modifier: true;
     1077}
     1078    /* render track */
     1079way.trackRight::core_cycleway {
    10321080    width: 2;
    10331081    color: bicycle#b100ff;
     
    10371085    modifier: true;
    10381086}
    1039 way[prop("tL","core_cycleway")]::core_cycleway2 {
     1087way[prop("trackLeft","core_cycleway")]::core_cycleway2 {
    10401088    width: 2;
    10411089    color: bicycle#b100ff;
     
    10451093    modifier: true;
    10461094}
    1047 
     1095    /* render opposite */
    10481096way[cycleway=opposite]::core_cycleway {
    10491097    object-z-index: 1;
Note: See TracChangeset for help on using the changeset viewer.