Changes between Version 19 and Version 20 of Styles/Lane_and_Road_Attributes


Ignore:
Timestamp:
2013-02-26T13:54:08+01:00 (13 years ago)
Author:
imagic
Comment:

The border of roads with placement=transition is now dashed. The number of lanes given by :lanes-tags is now correctly considered in case of one-ways.

Legend:

Unmodified
Added
Removed
Modified

  • Styles/Lane_and_Road_Attributes

    v19 v20  
    4848    description: "Visualization of lanes, width, turn lanes, changing the lane, destination, lighting and street lamps, sidewalk, cycletracks, bicycle lanes, bus lanes, psv lanes.";
    4949    author: "Martin Vonwald";
    50     version: "0.99-beta14-[[revision]]_[[date]]";
     50    version: "0.99-beta15-[[revision]]_[[date]]";
    5151    license: "CC-BY-SA";
    5252    min-josm-version: "5714";
    … …  
    374374
    375375
    376 
    377376/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
    378377/* Backward lanes                                                                                                                                   */
    … …  
    830829    lanes_both: eval(cond((prop(lanes_both)<0),0,prop(lanes_both)));
    831830
     831    /* In case of one-ways treat the number of all lanes as number of forward/backward lanes */
     832    tag_lanes_fwd_min: eval((prop(oneway_type)=1)?min(prop(tag_lanes_all_min),prop(tag_lanes_fwd_min)):prop(tag_lanes_fwd_min));
     833    tag_lanes_fwd_max: eval((prop(oneway_type)=1)?max(prop(tag_lanes_all_max),prop(tag_lanes_fwd_max)):prop(tag_lanes_fwd_max));
     834    tag_lanes_bwd_min: eval((prop(oneway_type)=(-1))?min(prop(tag_lanes_all_min),prop(tag_lanes_bwd_min)):prop(tag_lanes_bwd_min));
     835    tag_lanes_bwd_max: eval((prop(oneway_type)=(-1))?max(prop(tag_lanes_all_max),prop(tag_lanes_bwd_max)):prop(tag_lanes_bwd_max));
     836
    832837    /* Difference to the lane count specified by :lanes-tags */
    833838    temp_add_fwd:  eval(max(0,prop(tag_lanes_fwd_max)-prop(lanes_fwd)));
    … …  
    858863    lane_min_width: 4;
    859864    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((1.25*tag(width))/prop(lanes_all)):4)));
    860     change_allowed: 6,9;
    861     change_forbidden: 0;
     865    change_allowed: list(6,9);
    862866    road_marking_width: 1;
    863867    road_marking_space: 0;
    … …  
    868872    lane_min_width: 8;
    869873    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((2.5*tag(width))/prop(lanes_all)):8)));
    870     change_allowed: 12,18;
    871     change_forbidden: 0;
     874    change_allowed: list(12,18);
    872875    road_marking_width: 2;
    873876    road_marking_space: 1;
    … …  
    878881    lane_min_width: 8;
    879882    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((5*tag(width))/prop(lanes_all)):16)));
    880     change_allowed: 24,36;
    881     change_forbidden: 0;
     883    change_allowed: list(24,36);
    882884    road_marking_width: 2;
    883885    road_marking_space: 1;
    … …  
    888890    lane_min_width: 8;
    889891    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((10*tag(width))/prop(lanes_all)):32)));
    890     change_allowed: 48,72;
    891     change_forbidden: 0;
     892    change_allowed: list(48,72);
    892893    road_marking_width: 2;
    893894    road_marking_space: 2;
    … …  
    898899    lane_min_width: 12;
    899900    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((20*tag(width))/prop(lanes_all)):64)));
    900     change_allowed: 96,144;
    901     change_forbidden: 0;
     901    change_allowed: list(96,144);
    902902    road_marking_width: 4;
    903903    road_marking_space: 3;
    … …  
    908908    lane_min_width: 20;
    909909    lane_default_width: eval(max(prop(lane_min_width),(has_tag_key(width)?((40*tag(width))/prop(lanes_all)):128)));
    910     change_allowed: 192,288;
    911     change_forbidden: 0;
     910    change_allowed: list(192,288);
    912911    road_marking_width: 6;
    913912    road_marking_space: 4;
    914913}
    915914
    916 /* Some helper variables */
     915/* Zoom indepedent variables and helpers */
    917916way|z17-[is_prop_set(ok)]
    918917{
    919918    lane_casing:  eval((2*prop(road_marking_width))+prop(road_marking_space));
     919    change_forbidden: 0;
     920    change_border: eval((has_tag_key("placement") && (tag("placement")="transition"))?list(1,2):prop(change_forbidden));
    920921}
    921922
    … …  
    998999way|z17-[is_prop_set(ok)][prop(style_right_hand_traffic)]
    9991000{
    1000     change_forward_1_left:  eval((prop(oneway_type)=1)?prop(change_forbidden):prop(change_forward_1_left));
    1001     change_backward_1_left: eval((prop(oneway_type)=(-1))?prop(change_forbidden):prop(change_backward_1_left));
     1001    change_forward_1_left:  eval((prop(oneway_type)=1)?prop(change_border):prop(change_forward_1_left));
     1002    change_backward_1_left: eval((prop(oneway_type)=(-1))?prop(change_border):prop(change_backward_1_left));
    10021003}
    10031004
    10041005way|z17-[is_prop_set(ok)][!prop(style_right_hand_traffic)]
    10051006{
    1006     change_forward_1_left:  prop(change_forbidden);
    1007     change_backward_1_left: prop(change_forbidden);
     1007    change_forward_1_left:  prop(change_border);
     1008    change_backward_1_left: prop(change_border);
    10081009}
    10091010way|z17-[is_prop_set(ok)][prop(style_right_hand_traffic)],
    10101011way|z17-[is_prop_set(ok)][!prop(style_right_hand_traffic)][prop(oneway_type)=1]
    10111012{
    1012     change_forward_1_right: eval((prop(lanes_fwd)=1)?prop(change_forbidden):prop(change_forward_1_right)); 
    1013     change_forward_2_right: eval((prop(lanes_fwd)=2)?prop(change_forbidden):prop(change_forward_2_right)); 
    1014     change_forward_3_right: eval((prop(lanes_fwd)=3)?prop(change_forbidden):prop(change_forward_3_right)); 
    1015     change_forward_4_right: eval((prop(lanes_fwd)=4)?prop(change_forbidden):prop(change_forward_4_right)); 
    1016     change_forward_5_right: eval((prop(lanes_fwd)=5)?prop(change_forbidden):prop(change_forward_5_right)); 
    1017     change_forward_6_right: eval((prop(lanes_fwd)=6)?prop(change_forbidden):prop(change_forward_6_right)); 
    1018     change_forward_7_right: eval((prop(lanes_fwd)=7)?prop(change_forbidden):prop(change_forward_7_right)); 
    1019     change_forward_8_right: eval((prop(lanes_fwd)=8)?prop(change_forbidden):prop(change_forward_8_right)); 
     1013    change_forward_1_right: eval((prop(lanes_fwd)=1)?prop(change_border):prop(change_forward_1_right)); 
     1014    change_forward_2_right: eval((prop(lanes_fwd)=2)?prop(change_border):prop(change_forward_2_right)); 
     1015    change_forward_3_right: eval((prop(lanes_fwd)=3)?prop(change_border):prop(change_forward_3_right)); 
     1016    change_forward_4_right: eval((prop(lanes_fwd)=4)?prop(change_border):prop(change_forward_4_right)); 
     1017    change_forward_5_right: eval((prop(lanes_fwd)=5)?prop(change_border):prop(change_forward_5_right)); 
     1018    change_forward_6_right: eval((prop(lanes_fwd)=6)?prop(change_border):prop(change_forward_6_right)); 
     1019    change_forward_7_right: eval((prop(lanes_fwd)=7)?prop(change_border):prop(change_forward_7_right)); 
     1020    change_forward_8_right: eval((prop(lanes_fwd)=8)?prop(change_border):prop(change_forward_8_right)); 
    10201021}
    10211022way|z17-[is_prop_set(ok)][prop(style_right_hand_traffic)],
    10221023way|z17-[is_prop_set(ok)][!prop(style_right_hand_traffic)][prop(oneway_type)=(-1)]
    10231024{
    1024     change_backward_1_right: eval((prop(lanes_bwd)=1)?prop(change_forbidden):prop(change_backward_1_right)); 
    1025     change_backward_2_right: eval((prop(lanes_bwd)=2)?prop(change_forbidden):prop(change_backward_2_right)); 
    1026     change_backward_3_right: eval((prop(lanes_bwd)=3)?prop(change_forbidden):prop(change_backward_3_right)); 
    1027     change_backward_4_right: eval((prop(lanes_bwd)=4)?prop(change_forbidden):prop(change_backward_4_right)); 
    1028     change_backward_5_right: eval((prop(lanes_bwd)=5)?prop(change_forbidden):prop(change_backward_5_right)); 
    1029     change_backward_6_right: eval((prop(lanes_bwd)=6)?prop(change_forbidden):prop(change_backward_6_right)); 
    1030     change_backward_7_right: eval((prop(lanes_bwd)=7)?prop(change_forbidden):prop(change_backward_7_right)); 
    1031     change_backward_8_right: eval((prop(lanes_bwd)=8)?prop(change_forbidden):prop(change_backward_8_right)); 
     1025    change_backward_1_right: eval((prop(lanes_bwd)=1)?prop(change_border):prop(change_backward_1_right)); 
     1026    change_backward_2_right: eval((prop(lanes_bwd)=2)?prop(change_border):prop(change_backward_2_right)); 
     1027    change_backward_3_right: eval((prop(lanes_bwd)=3)?prop(change_border):prop(change_backward_3_right)); 
     1028    change_backward_4_right: eval((prop(lanes_bwd)=4)?prop(change_border):prop(change_backward_4_right)); 
     1029    change_backward_5_right: eval((prop(lanes_bwd)=5)?prop(change_border):prop(change_backward_5_right)); 
     1030    change_backward_6_right: eval((prop(lanes_bwd)=6)?prop(change_border):prop(change_backward_6_right)); 
     1031    change_backward_7_right: eval((prop(lanes_bwd)=7)?prop(change_border):prop(change_backward_7_right)); 
     1032    change_backward_8_right: eval((prop(lanes_bwd)=8)?prop(change_border):prop(change_backward_8_right)); 
    10321033}
    10331034