Changeset 8012 in josm for trunk/styles


Ignore:
Timestamp:
2015-02-05T21:27:10+01:00 (5 years ago)
Author:
Klumbumbus
Message:

fix #11023 - Display restriction icons on nodes only if tagged together with traffic_sign=*; allow access preset also for closed ways

File:
1 edited

Legend:

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

    r8010 r8012  
    152152    dashes: 2,2;
    153153}
    154 node[access?!] {
     154node[traffic_sign][access?!] {
    155155    icon-image: "vehicle/restriction/access.png";
    156156    set icon_z17;
    157157}
    158 node[access=permissive],
    159 node[access=private],
    160 node[access=destination] {
     158node[traffic_sign][access=permissive],
     159node[traffic_sign][access=private],
     160node[traffic_sign][access=destination] {
    161161    icon-image: "misc/no_icon.png";
    162162    set icon_z17;
    163163    text: auto;
    164164}
    165 node[bicycle?!] {
     165node[traffic_sign][bicycle?!] {
    166166    icon-image: "vehicle/restriction/bicycle.png";
    167167    set icon_z17;
    168168}
    169 node[bicycle=designated] {
     169node[traffic_sign][bicycle=designated] {
    170170    icon-image: "vehicle/restriction/bicycle-designated.png";
    171171    set icon_z17;
    172172    text: auto;
    173173}
    174 node[foot?!] {
     174node[traffic_sign][foot?!] {
    175175    icon-image: "vehicle/restriction/foot.png";
    176176    set icon_z17;
    177177}
    178 node[foot=designated] {
     178node[traffic_sign][foot=designated] {
    179179    icon-image: "vehicle/restriction/foot-designated.png";
    180180    set icon_z17;
    181181    text: auto;
    182182}
    183 node[goods?!],
    184 node[hgv?!] {
     183node[traffic_sign][goods?!],
     184node[traffic_sign][hgv?!] {
    185185    icon-image: "vehicle/restriction/goods.png";
    186186    set icon_z17;
    187187}
    188 node[horse?!] {
     188node[traffic_sign][horse?!] {
    189189    icon-image: "vehicle/restriction/horse.png";
    190190    set icon_z17;
    191191}
    192 node[horse=designated] {
     192node[traffic_sign][horse=designated] {
    193193    icon-image: "vehicle/restriction/horse-designated.png";
    194194    set icon_z17;
    195195}
    196 node[motorcycle?!] {
     196node[traffic_sign][motorcycle?!] {
    197197    icon-image: "vehicle/restriction/motorbike.png";
    198198    set icon_z17;
    199199}
    200 node[motorcar?!] {
     200node[traffic_sign][motorcar?!] {
    201201    icon-image: "vehicle/restriction/motorcar.png";
    202202    set icon_z17;
    203203}
    204 node[psv?!] {
     204node[traffic_sign][psv?!] {
    205205    icon-image: "vehicle/restriction/psv.png";
    206206    set icon_z17;
    207207}
    208 node[motorboat?!],
    209 node[boat?!] {
     208node[traffic_sign][motorboat?!],
     209node[traffic_sign][boat?!] {
    210210    icon-image: "misc/no_icon.png";
    211211    set icon_z17;
     
    215215    set icon_z17;
    216216}
    217 node[maxweight] {
     217node[traffic_sign][maxweight] {
    218218    icon-image: "vehicle/restriction/maxweight.png";
    219219    set icon_z17;
    220220}
    221 node[maxheight] {
     221node[traffic_sign][maxheight] {
    222222    icon-image: "vehicle/restriction/maxheight.png";
    223223    set icon_z17;
    224224}
    225 node[maxwidth] {
     225node[traffic_sign][maxwidth] {
    226226    icon-image: "vehicle/restriction/maxwidth.png";
    227227    set icon_z17;
    228228}
    229 node[maxlength] {
     229node[traffic_sign][maxlength] {
    230230    icon-image: "vehicle/restriction/maxlength.png";
    231231    set icon_z17;
    232232}
    233 node[minspeed] {
     233node[traffic_sign][minspeed] {
    234234    icon-image: "vehicle/restriction/minspeed.png";
    235235    set icon_z17;
    236236}
    237 node[maxstay],
    238 node[toll] {
     237node[traffic_sign][maxstay],
     238node[traffic_sign][toll] {
    239239    icon-image: "misc/no_icon.png";
    240240    set icon_z17;
     
    42054205/* maxspeed nodes */
    42064206/******************/
    4207 node[maxspeed=none][!is_prop_set(icon-image)] {
     4207node[traffic_sign][maxspeed=none][!is_prop_set(icon-image)] {
    42084208    icon-image: "vehicle/restriction/maxspeed_none.svg";
    42094209    set icon_z17;
    42104210}
    4211 node[maxspeed=~/^[0-9]+$/][!is_prop_set(icon-image)] {
     4211node[traffic_sign][maxspeed=~/^[0-9]+$/][!is_prop_set(icon-image)] {
    42124212    maxspeedprop: tag(maxspeed);
    42134213    set maxspeedclass;
    42144214}
    4215 node[maxspeed=signals][!is_prop_set(icon-image)] {
     4215node[traffic_sign][maxspeed=signals][!is_prop_set(icon-image)] {
    42164216    maxspeedprop: " ?";
    42174217    set maxspeedclass;
    42184218}
    4219 node[maxspeed=~/^[0-9]+ mph/][!is_prop_set(icon-image)] {
     4219node[traffic_sign][maxspeed=~/^[0-9]+ mph/][!is_prop_set(icon-image)] {
    42204220    maxspeedprop: get(split(" mph",tag(maxspeed)),0);
    42214221    set maxspeedclass;
    42224222}
    4223 node[maxspeed=~/[0-9]+ km\/h/][!is_prop_set(icon-image)] {
     4223node[traffic_sign][maxspeed=~/[0-9]+ km\/h/][!is_prop_set(icon-image)] {
    42244224    maxspeedprop: get(split(" km/h",tag(maxspeed)),0);
    42254225    set maxspeedclass;
    42264226}
    4227 node[maxspeed=~/[0-9]+ knots/][!is_prop_set(icon-image)] {
     4227node[traffic_sign][maxspeed=~/[0-9]+ knots/][!is_prop_set(icon-image)] {
    42284228    maxspeedprop: get(split(" knots",tag(maxspeed)),0);
    42294229    set maxspeedclass;
     
    42364236    major-z-index: 4.2;
    42374237}
    4238 node[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodebg,
    4239 node[maxspeed=signals]::core_maxnodebg {
     4238node[traffic_sign][maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodebg,
     4239node[traffic_sign][maxspeed=signals]::core_maxnodebg {
    42404240    /* background (black) */
    42414241    symbol-fill-color: black;
     
    42574257    major-z-index: 4.2;
    42584258}
    4259 node[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodefg,
    4260 node[maxspeed=signals]::core_maxnodefg {
     4259node[traffic_sign][maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodefg,
     4260node[traffic_sign][maxspeed=signals]::core_maxnodefg {
    42614261    /* foreground (white text) */
    42624262    text-color: white;
Note: See TracChangeset for help on using the changeset viewer.