Changeset 15314 in josm


Ignore:
Timestamp:
2019-08-23T20:55:34+02:00 (4 weeks ago)
Author:
Klumbumbus
Message:

fix #18070, see #15483, fix #17022, see #11270 - restore display of tram when tagged together or overlapping with highway, handle light_rail the same as tram, i.e. draw on top of highway and don't warn about missing railway=crossing|level_crossing

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/validator/highway.mapcss

    r15312 r15314  
    144144}
    145145
    146 /* #11270, #9297, #15439, #16424 */
    147 way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
     146/* #11270, #9297, #15439, #16424, #17022 */
     147way[railway =~ /^(miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
    148148way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node { set .is_in_minor_road }
    149149way[highway =~ /^(bus_guideway|living_street|motorway|motorway_link|pedestrian|primary|primary_link|raceway|residential|road|secondary|secondary_link|service|tertiary|tertiary_link|track|trunk|trunk_link|unclassified)$/] > node { set .is_in_major_road }
  • trunk/styles/standard/elemstyles.mapcss

    r15308 r15314  
    36233623    color: railyard#552200;
    36243624}
    3625 /* draw tram on top of other way (highway=*) or
     3625/* draw tram and light_rail on top of other way (highway=*) or
    36263626   as a standalone style */
    36273627way[highway][railway=tram]::core_railway,
    36283628way[!highway][railway=tram] {
    3629     object-z-index: 1;
     3629    z-index: 1;
    36303630    modifier: false; /* don't draw default way if there is no line on default layer */
    36313631    width: 1;
     
    36493649}
    36503650
    3651 way[railway=light_rail] {
     3651way[highway][railway=light_rail]::core_railway,
     3652way[!highway][railway=light_rail] {
     3653    z-index: 1;
     3654    modifier: false; /* don't draw default way if there is no line on default layer */
    36523655    width: 2;
    36533656    color: otherrail#808080;
     
    37673770    dashes-background-color: construction#ffff00;
    37683771}
    3769 way[railway=construction][construction=light_rail] {
     3772way[railway=construction][construction=light_rail][highway]::core_railway,
     3773way[railway=construction][construction=light_rail][!highway] {
     3774    z-index: 1;
    37703775    width: 2;
     3776    dashes: 9,9;
     3777    color: construction#ffff00;
    37713778}
    37723779way[railway=construction][construction=tram][highway]::core_railway,
Note: See TracChangeset for help on using the changeset viewer.