From 513235646c6bc5a3a44c4371f4169bb8df2227a7 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Mon, 5 Jan 2026 18:19:48 +0100 Subject: [PATCH] [styles] Add road borders to minor roads Signed-off-by: Yannik Bloscheck --- data/styles/default/dark/colors.mapcss | 2 + data/styles/default/include/Roads.mapcss | 211 ++++++++++++++- .../include/priorities_1_BG-by-size.prio.txt | 6 +- .../default/include/priorities_3_FG.prio.txt | 246 +++++++++++------- .../include/priorities_4_overlays.prio.txt | 102 ++++---- data/styles/default/light/colors.mapcss | 2 + .../include/priorities_1_BG-by-size.prio.txt | 6 +- .../outdoors/include/priorities_3_FG.prio.txt | 246 +++++++++++------- .../include/priorities_4_overlays.prio.txt | 102 ++++---- 9 files changed, 624 insertions(+), 299 deletions(-) diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 088818f8b..e81f14018 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -162,11 +162,13 @@ @path: #944A12; @path_expert: #523E33; @bridleway: #2B2827; +@minor_road_border: #b2b2b2; /* 5.2 Bridges */ @bridge_background: #2C2C1A; @bridge_casing: #505050; +@bridge_minor_road_border: #393928; /* 5.3 Tunnels */ diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 959470626..161c6c3bb 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -35,7 +35,8 @@ 8.7 Footway 15-22 ZOOM 8.8 Steps 15-22 ZOOM 8.9 Bridleway 14-22 ZOOM - 8.10 Runway 12-22 ZOOM + 8.10 Minor road borders + 8.11 Runway 12-22 ZOOM 9.RAIL 11-22 ZOOM 9.1 RAIL 11-22 ZOOM 9.2 Rail tunnel 14-22 ZOOM @@ -1137,7 +1138,213 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite line|z17-[highway=bridleway][bridge?]::bridgeblack {casing-width-add: 1;} -/* 8.10 Runway 12-22 ZOOM */ +/* 8.10 Minor road borders */ + +line|z11-[highway=tertiary]::border, +line|z14-[highway=tertiary_link]::border, +line|z11-[highway=unclassified]::border, +line|z12-[highway=residential]::border, +line|z12-[highway=road]::border, +line|z12-[highway=living_street]::border, +line|z13-[highway=pedestrian]::border, +line|z13-[highway=ford]::border, +line|z15-[highway=service]::border, +line|z15-[highway=service][service=busway]::border, +line|z15-[highway=busway]::border, +line|z15-[highway=footway]::border, +line|z15-[highway=ladder]::border, +line|z15-[highway=steps]::border, +{color: @minor_road_border; opacity: 0.1;} + +line|z11-[highway=tertiary][bridge?]::border, +line|z14-[highway=tertiary_link][bridge?]::border, +line|z11-[highway=unclassified][bridge?]::border, +line|z12-[highway=residential][bridge?]::border, +line|z12-[highway=road][bridge?]::border, +line|z12-[highway=living_street][bridge?]::border, +line|z13-[highway=pedestrian][bridge?]::border, +line|z15-[highway=service][bridge?]::border, +line|z15-[highway=service][service=busway][bridge?]::border, +line|z15-[highway=busway][bridge?]::border, +line|z15-[highway=footway][bridge?]::border, +line|z15-[highway=steps][bridge?]::border, +{color: @bridge_minor_road_border; opacity: 1; linecap: butt} + +/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */ + +line|z11[highway=tertiary]::border, +{width: 1.7;} +line|z12[highway=tertiary]::border, +{width: 2.1;} +line|z13[highway=tertiary]::border, +{width: 2.3;} +line|z14[highway=tertiary]::border, +{width: 3.7;} +line|z15[highway=tertiary]::border, +{width: 4.8;} +line|z16[highway=tertiary]::border, +{width: 6;} +line|z17[highway=tertiary]::border, +{width: 7.6;} +line|z18[highway=tertiary]::border, +{width: 10.4;} +line|z19-[highway=tertiary]::border, +{width: 12.6;} + +line|z14[highway=tertiary_link]::border, +{width: 2.3;} +line|z15[highway=tertiary_link]::border, +{width: 3.5;} +line|z16[highway=tertiary_link]::border, +{width: 4.2;} +line|z17[highway=tertiary_link]::border, +{width: 5.7;} +line|z18[highway=tertiary_link]::border, +{width: 7.4;} +line|z19-[highway=tertiary_link]::border, +{width: 9.2;} + +line|z11[highway=unclassified]::border, +{width: 0;} +line|z12[highway=unclassified]::border, +{width: 0;} +line|z13[highway=unclassified]::border, +{width: 1.9;} +line|z14[highway=unclassified]::border, +{width: 3.3;} +line|z15[highway=unclassified]::border, +{width: 4.2;} +line|z16[highway=unclassified]::border, +{width: 5.2;} +line|z17[highway=unclassified]::border, +{width: 7;} +line|z18[highway=unclassified]::border, +{width: 9;} +line|z19-[highway=unclassified]::border, +{width: 11;} + +line|z12[highway=residential]::border, +line|z12[highway=road]::border, +line|z12[highway=living_street]::border, +{width: 0;} +line|z13[highway=residential]::border, +line|z13[highway=road]::border, +line|z13[highway=living_street]::border, +{width: 0;} +line|z14[highway=residential]::border, +line|z14[highway=road]::border, +line|z14[highway=living_street]::border, +{width: 2.1;} +line|z15[highway=residential]::border, +line|z15[highway=road]::border, +line|z15[highway=living_street]::border, +{width: 3.4;} +line|z16[highway=residential]::border, +line|z16[highway=road]::border, +line|z16[highway=living_street]::border, +{width: 4.2;} +line|z17[highway=residential]::border, +line|z17[highway=road]::border, +line|z17[highway=living_street]::border, +{width: 5.7;} +line|z18[highway=residential]::border, +line|z18[highway=road]::border, +line|z18[highway=living_street]::border, +{width: 7.4;} +line|z19-[highway=residential]::border, +line|z19-[highway=road]::border, +line|z19-[highway=living_street]::border, +{width: 9.2;} + +line|z13[highway=pedestrian]::border, +line|z13[highway=ford]::border, +{width: 0;dashes: 4,1;} +line|z14[highway=pedestrian]::border, +line|z14[highway=ford]::border, +{width: 2.1;dashes: 6,1.3;} +line|z15[highway=pedestrian]::border, +line|z15[highway=ford]::border, +{width: 3;dashes: 8,1.5;} +line|z16[highway=pedestrian]::border, +line|z16[highway=ford]::border, +{width: 3.4;dashes: 8,1.5;} +line|z17[highway=pedestrian]::border, +line|z17[highway=ford]::border, +{width: 4;dashes: 9,1.8;} +line|z18[highway=pedestrian]::border, +line|z18[highway=ford]::border, +{width: 5;dashes: 11,2.3;} +line|z19-[highway=pedestrian]::border, +line|z19-[highway=ford]::border, +{width: 6;dashes: 13,2.7;} + +line|z15[highway=service]::border, +line|z15[highway=service][service=busway]::border, +line|z15[highway=busway]::border, +{width: 1.7;} +line|z15[highway=service][service=driveway]::border, +{width: 0;} +line|z16[highway=service]::border, +line|z16[highway=service][service=busway]::border, +line|z16[highway=busway]::border, +{width: 2.1;} +line|z17[highway=service]::border, +line|z17[highway=service][service=busway]::border, +line|z17[highway=busway]::border, +{width: 3;} +line|z18[highway=service]::border, +line|z18[highway=service][service=busway]::border, +line|z18[highway=busway]::border, +{width: 4;} +line|z19-[highway=service]::border, +line|z19-[highway=service][service=busway]::border, +line|z19-[highway=busway]::border, +{width: 5;} + +line|z15[highway=footway]::border, +{width: 2; dashes: 5,1.5;} +line|z16[highway=footway]::border, +{width: 3; dashes: 5,1.5;} +line|z17[highway=footway]::border, +{width: 3.4; dashes: 6,1.8;} +line|z18[highway=footway]::border, +{width: 4.2; dashes: 8,2.3;} +line|z19-[highway=footway]::border, +{width: 5.2; dashes: 10,2.7;} + +line|z15[highway=footway][bicycle=designated]::border, +{width: 2; dashes: 6,9;} +line|z16[highway=footway][bicycle=designated]::border, +{width: 3; dashes: 8,10;} +line|z17[highway=footway][bicycle=designated]::border, +{width: 3.4; dashes: 10,11;} +line|z18[highway=footway][bicycle=designated]::border, +{width: 4.2; dashes: 15,15;} +line|z19-[highway=footway][bicycle=designated]::border, +{width: 5.2; dashes: 20,20;} + +/* Don't display sidewalks and pedestrian crossings on z15. */ +line|z15[highway=footway][footway=sidewalk]::border, +line|z15[highway=footway][footway=crossing]::border, +{width: 0;} + +line|z15[highway=ladder]::border, +line|z15[highway=steps]::border, +{width: 3.4; dashes: 1.5,1.3;} +line|z16[highway=ladder]::border, +line|z16[highway=steps]::border, +{width: 5; dashes: 1.8,1.6;} +line|z17-[highway=ladder]::border, +line|z17-[highway=steps]::border, +{width: 7; dashes: 2.5,2.2;} +line|z18[highway=ladder]::border, +line|z18[highway=steps]::border, +{width: 9; dashes: 3.2,2.8;} +line|z19-[highway=ladder]::border, +line|z19-[highway=steps]::border, +{width: 11; dashes: 4,3.5;} + +/* 8.11 Runway 12-22 ZOOM */ line|z12-[aeroway=runway], line|z14-[aeroway=taxiway], diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index e6d63a05d..39487bf4d 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -97,8 +97,8 @@ amenity-recycling-centre # area z15- (also has icon z amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) -highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) -highway-pedestrian-square # area z14- (also has line z13-, pathtext z14-) +highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-) +highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-) highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-) highway-services # area z13- (also has icon z14-, caption(optional) z14-) landuse-garages # area z13- (also has caption z15-) @@ -111,7 +111,7 @@ tourism-information-office # area z15- (also has icon z tourism-information-visitor_centre # area z13- (also has icon z15-, caption(optional) z15-) === 170 -highway-footway-area # area z14- (also has line z15-, pathtext z15-) +highway-footway-area # area z14- (also has line z15-, line::border z15-, pathtext z15-) leisure-track-area # area z15- (also has caption z16-) === 160 diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 7aa501027..456cb3a3d 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -45,10 +45,10 @@ power-line # line z19- (also has line:: power-line::dash # line::dash z19- (also has line z19-) === 340 -highway-ladder # line z15- (also has icon z17-, pathtext z17-) -highway-steps # line z15- (also has pathtext z16-) -highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) -highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +highway-ladder # line z15- (also has line::border z15-, icon z17-, pathtext z17-) +highway-steps # line z15- (also has line::border z15-, pathtext z16-) +highway-steps-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +highway-steps-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) hwtag-oneway::arrows # line::arrows z15- waterway-weir # line z14- (also has pathtext z15-) === 330 @@ -135,33 +135,33 @@ highway-secondary-tunnel # line z10- (also has line(c # highway-secondary-tunnel # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-) # === 269 -highway-tertiary # line z11- (also has pathtext z12-, shield::shield z13-) -highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-) -highway-unclassified # line z11- (also has pathtext z13-) -highway-unclassified-area # line z11- (also has pathtext z13-) -highway-unclassified-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) -highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-) +highway-tertiary # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-) +highway-tertiary-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary-tunnel # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-) +highway-unclassified # line z11- (also has line::border z13-, pathtext z13-) +highway-unclassified-area # line z11- (also has line::border z13-, pathtext z13-) +highway-unclassified-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +highway-unclassified-tunnel # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-) === 250 -# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-) -# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) +# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-) +# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-) # === 249 -highway-living_street # line z12- (also has pathtext z14-) -highway-living_street-bridge # line z12- (also has pathtext z14-) -highway-living_street-tunnel # line z12- (also has line(casing) z16-, pathtext z14-) -highway-residential # line z12- (also has pathtext z13-, shield::shield z15-) -highway-residential-area # line z12- (also has pathtext z13-, shield::shield z15-) -highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-) -highway-road # line z12- (also has pathtext z14-) -highway-road-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) -highway-road-tunnel # line z12- (also has pathtext z14-) +highway-living_street # line z12- (also has line::border z14-, pathtext z14-) +highway-living_street-bridge # line z12- (also has line::border z14-, pathtext z14-) +highway-living_street-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-) +highway-residential # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-) +highway-residential-area # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-) +highway-residential-bridge # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-residential-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-) +highway-road # line z12- (also has line::border z14-, pathtext z14-) +highway-road-bridge # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +highway-road-tunnel # line z12- (also has line::border z14-, pathtext z14-) === 230 -# highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-) -# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-) # === 229 highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-) @@ -190,25 +190,25 @@ highway-secondary_link-tunnel # line z13- (also has line(c === 224 # highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-) -highway-tertiary_link # line z14- (also has pathtext z18-) -highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) -highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-) +highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-) +highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-) === 223 -highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) -highway-service # line z15- (also has pathtext z16-) -highway-service-area # line z15- (also has pathtext z16-) -highway-service-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-service-driveway # line z16- (also has pathtext z16-) -highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) -# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) +highway-busway # line z15- (also has line::border z15-, pathtext z16-) +highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +highway-service # line z15- (also has line::border z15-, pathtext z16-) +highway-service-area # line z15- (also has line::border z15-, pathtext z16-) +highway-service-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-) +highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +highway-service-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) === 222 -# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) -# highway-service-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail::dash # line::dash z16- (also has line z11-) @@ -227,11 +227,11 @@ railway-subway::dash # line::dash z16- (also has railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) === 221 -highway-footway-bicycle # line z15- (also has line::cycleline z15-, pathtext z15-) +highway-footway-bicycle # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-) highway-path-bicycle # line z15- (also has line::cycleline z14-, pathtext z15-) === 220 -highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-) +highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-) highway-path-bicycle::cycleline # line::cycleline z14- (also has line z15-, pathtext z15-) === 219 @@ -264,23 +264,23 @@ railway-subway-bridge # line z13- (also has line:: # railway-rail-utility-tunnel # line(casing) z14- (also has line z13-, line::dash z17-) # === 209 -highway-ford # line z13- (also has icon z16-, pathtext z16-) -highway-pedestrian # line z13- (also has pathtext z14-) -highway-pedestrian-area # line z13- and area z14- (also has pathtext z14-) -highway-pedestrian-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) -highway-pedestrian-square # line z13- and area z14- (also has pathtext z14-) -highway-pedestrian-tunnel # line z13- (also has line(casing) z16-, pathtext z14-) +highway-ford # line z13- (also has line::border z14-, icon z16-, pathtext z16-) +highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-) +highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-) +highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-) +highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-) === 200 -# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-) +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) # === 199 highway-bridleway # line z14- (also has pathtext z15-) highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) -highway-footway # line z15- (also has pathtext z15-) -highway-footway-area # line z15- and area z14- (also has pathtext z15-) -highway-footway-crossing # line z16- +highway-footway # line z15- (also has line::border z15-, pathtext z15-) +highway-footway-area # line z15- and area z14- (also has line::border z15-, pathtext z15-) +highway-footway-crossing # line z16- (also has line::border z16-) highway-path # line z15- (also has pathtext z15-) highway-path-difficult # line z15- (also has pathtext z15-) highway-path-expert # line z15- (also has pathtext z15-) @@ -290,7 +290,7 @@ highway-track-area # line z15- (also has pathte highway-track-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-track-no-access # line z15- (also has pathtext z15-) highway-track-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) -=== 180 +=== 190 highway-construction # line z13- (also has pathtext z15-) leisure-track # line z15- (also has caption z16-) @@ -306,54 +306,112 @@ railway-preserved # line z15- railway-preserved-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z15- railway-turntable # line z17- -=== 160 +=== 180 -highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-footway-sidewalk # line z16- -highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-footway-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +highway-footway-sidewalk # line z16- (also has line::border z16-) +highway-footway-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) highway-path-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-path-horse # line z15- (also has pathtext z15-) highway-path-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) -=== 155 +=== 170 highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-) highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) -highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-) +highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-) highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) -=== 154 +=== 165 highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-) highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) -highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-) +highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-) highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) -=== 153 +=== 160 + +highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) +highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-) +highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +highway-road::border # line::border z14- (also has line z12-, pathtext z14-) +highway-service::border # line::border z15- (also has line z15-, pathtext z16-) +highway-service-area::border # line::border z15- (also has line z15-, pathtext z16-) +highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-) +highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-) +highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-) +highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-) +highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-) +highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-) +=== 150 + +highway-footway::border # line::border z15- (also has line z15-, pathtext z15-) +highway-footway-area::border # line::border z15- (also has line z15-, area z14-, pathtext z15-) +highway-footway-bicycle::border # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-) +highway-footway-crossing::border # line::border z16- (also has line z16-) +highway-footway-sidewalk::border # line::border z16- (also has line z16-) +highway-ford::border # line::border z14- (also has line z13-, icon z16-, pathtext z16-) +highway-ladder::border # line::border z15- (also has line z15-, icon z17-, pathtext z17-) +highway-pedestrian::border # line::border z14- (also has line z13-, pathtext z14-) +highway-pedestrian-area::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +highway-pedestrian-square::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +highway-steps::border # line::border z15- (also has line z15-, pathtext z16-) +=== 149 + +highway-busway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-living_street-bridge::border # line::border z14- (also has line z12-, pathtext z14-) +highway-residential-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-road-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +highway-service-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-tertiary_link-bridge::border # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +highway-unclassified-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +=== 148 + +highway-footway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +highway-pedestrian-bridge::border # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +highway-steps-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +=== 147 + +highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +highway-living_street-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-) +highway-residential-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +highway-road-tunnel::border # line::border z14- (also has line z12-, pathtext z14-) +highway-service-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +highway-tertiary-tunnel::border # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-) +highway-tertiary_link-tunnel::border # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-) +highway-unclassified-tunnel::border # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-) +=== 146 + +highway-footway-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-pedestrian-tunnel::border # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-) +highway-steps-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +=== 145 highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) -highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) +highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) -highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) -highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) +highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-) highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) +highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) -highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) -highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) +highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-) +highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) +highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) @@ -367,30 +425,30 @@ railway-rail-spur-bridge::bridgewhite # line::bridgewhite z15- (al railway-rail-tourism-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-) railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-) railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) -=== 150 +=== 135 highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) -highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) -highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) -highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) +highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-) highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) +highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) -highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) -highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) +highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) +highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) @@ -404,14 +462,14 @@ railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (al railway-rail-tourism-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) railway-rail-utility-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-) railway-subway-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) -=== 140 +=== 130 building # area z14- (also has caption z17-) building-garage # area z14- (also has caption z17-) building-guardhouse # area z14- (also has icon z18-, caption(optional) z18-) building-has_parts # area z14- (also has caption z17-) building-train_station # area z14- (also has icon z17-, caption(optional) z17-) -=== 130 +=== 120 piste:type-connection # line z15- piste:type-downhill # line z14- (also has pathtext z15-) @@ -425,30 +483,30 @@ piste:type-hike # line z15- (also has pathte piste:type-nordic # line z14- (also has pathtext z15-) piste:type-skitour # line z14- (also has pathtext z15-) piste:type-sled # line z14- (also has pathtext z15-) -=== 120 +=== 110 building:part # area z16- -=== 110 +=== 100 barrier-retaining_wall # line z16- man_made-embankment # line z16- (also has pathtext z18-) natural-cliff # line z14- (also has pathtext z16-) natural-earth_bank # line z14- -=== 100 +=== 90 boundary-administrative-2 # line z2- boundary-administrative-3 # line z4 boundary-administrative-4 # line z5- -=== 90 +=== 80 man_made-cutline # line z14- route-ferry # line z7- (also has pathtext z10-) -=== 80 +=== 70 aeroway-runway # line z12- aeroway-taxiway # line z14- barrier-ditch # line z16- -=== 70 +=== 60 isoline-step_10 # line z15- (also has pathtext z17-) isoline-step_100 # line z12- (also has pathtext z14-) @@ -456,7 +514,7 @@ isoline-step_1000 # line z11- (also has pathte isoline-step_50 # line z14- (also has pathtext z16-) isoline-step_500 # line z11- (also has pathtext z12-) isoline-zero # line z15- (also has pathtext z17-) -=== 60 +=== 50 man_made-breakwater # line z14- and area z12- (also has caption z17-) man_made-pier # line z14- and area z12- (also has caption z17-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 80d421626..9393b875f 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -581,14 +581,14 @@ shop-supermarket # icon z16- (also has captio === 3200 area:highway-pedestrian # caption z15- (also has area z14-) -highway-pedestrian # pathtext z14- (also has line z13-) -highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-) -highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-) -highway-pedestrian-square # pathtext z14- (also has line z13-, area z14-) -highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-) -highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-) -highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-) +highway-pedestrian # pathtext z14- (also has line z13-, line::border z14-) +highway-pedestrian-area # pathtext z14- (also has line z13-, line::border z14-, area z14-) +highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-) +highway-pedestrian-square # pathtext z14- (also has line z13-, line::border z14-, area z14-) +highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-) +highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-) +highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-) natural-strait # caption z13- (also has line z13-) natural-water # caption z10- (also has area z1-) natural-water-pond # caption z10- (also has area z1-) @@ -600,10 +600,10 @@ waterway-dam # pathtext z15- (also has li waterway-river # pathtext z11- (also has line z10-) === 3150 -highway-unclassified # pathtext z13- (also has line z11-) -highway-unclassified-area # pathtext z13- (also has line z11-) -highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-) +highway-unclassified # pathtext z13- (also has line z11-, line::border z13-) +highway-unclassified-area # pathtext z13- (also has line z11-, line::border z13-) +highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-) === 3100 amenity-water_point # icon z17- (also has caption(optional) z18-) @@ -635,13 +635,13 @@ aerialway-mixed_lift # pathtext z15- (also has li aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) -highway-residential # pathtext z13- (also has shield::shield z15-, line z12-) -highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-) -highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-) -highway-road # pathtext z14- (also has line z12-) -highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-) -highway-road-tunnel # pathtext z14- (also has line z12-) +highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-) +highway-road # pathtext z14- (also has line z12-, line::border z14-) +highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-) +highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-) highway-secondary_link # pathtext z16- (also has line z13-) highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-) highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-) @@ -662,19 +662,19 @@ highway-secondary-bridge::shield # shield::shield z12- (also highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-) === 2965 -highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-) -highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-) +highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-) +highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-) === 2960 barrier-city_wall # pathtext z16- (also has line z14-) historic-citywalls # pathtext z16- (also has line z14-) === 2957 -highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-) -highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-) -highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) +highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-) +highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-) +highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-) === 2955 highway-cycleway # pathtext z15- (also has line z13-) @@ -683,14 +683,14 @@ highway-cycleway-tunnel # pathtext z15- (also has li === 2953 area:highway-footway # caption z15- (also has area z14-) -highway-footway # pathtext z15- (also has line z15-) -highway-footway-area # pathtext z15- (also has line z15-, area z14-) -highway-footway-bicycle # pathtext z15- (also has line z15-, line::cycleline z15-) -highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-tertiary_link # pathtext z18- (also has line z14-) -highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-) +highway-footway # pathtext z15- (also has line z15-, line::border z15-) +highway-footway-area # pathtext z15- (also has line z15-, line::border z15-, area z14-) +highway-footway-bicycle # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-) +highway-footway-bridge # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-footway-tunnel # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) === 2950 natural-water-basin # caption z10- (also has area z1-) @@ -707,7 +707,7 @@ waterway-stream-intermittent # pathtext z13- (also has li waterway-weir # pathtext z15- (also has line z14-) === 2900 -highway-ford # icon z16- and pathtext z16- (also has line z13-) +highway-ford # icon z16- and pathtext z16- (also has line z13-, line::border z14-) natural-rock # icon z17- (also has caption(optional) z17-) === 2850 @@ -723,9 +723,9 @@ highway-path-horse # pathtext z15- (also has li highway-path-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 -highway-steps # pathtext z16- (also has line z15-) -highway-steps-bridge # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-steps-tunnel # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-steps # pathtext z16- (also has line z15-, line::border z15-) +highway-steps-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-steps-tunnel # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2810 highway-track # pathtext z15- (also has line z15-) @@ -735,12 +735,12 @@ highway-track-no-access # pathtext z15- (also has li highway-track-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2780 -highway-service # pathtext z16- (also has line z15-) -highway-service-area # pathtext z16- (also has line z15-) -highway-service-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-service-driveway # pathtext z16- (also has line z16-) -highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) +highway-service # pathtext z16- (also has line z15-, line::border z15-) +highway-service-area # pathtext z16- (also has line z15-, line::border z15-) +highway-service-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-service-driveway # pathtext z16- (also has line z16-, line::border z16-) +highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) +highway-service-tunnel # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-) piste:type-downhill # pathtext z15- (also has line z14-) piste:type-downhill-advanced # pathtext z15- (also has line z14-) piste:type-downhill-easy # pathtext z15- (also has line z14-) @@ -823,9 +823,9 @@ attraction-historic # icon z17- (also has captio attraction-maze # icon z17- (also has caption(optional) z17-) attraction-roller_coaster # icon z17- (also has caption(optional) z17-) highway-construction # pathtext z15- (also has line z13-) -highway-living_street # pathtext z14- (also has line z12-) -highway-living_street-bridge # pathtext z14- (also has line z12-) -highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) +highway-living_street # pathtext z14- (also has line z12-, line::border z14-) +highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z14-) +highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-) landuse-plant_nursery # icon z17- (also has caption(optional) z17-, area z12-) leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) @@ -892,9 +892,9 @@ barrier-yes # icon z16- (also has captio leisure-dog_park # icon z16- (also has caption(optional) z16-, area z15-) === 2300 -highway-busway # pathtext z16- (also has line z15-) -highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) +highway-busway # pathtext z16- (also has line z15-, line::border z15-) +highway-busway-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-busway-tunnel # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-) === 2250 amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) @@ -1162,7 +1162,7 @@ amenity-nursing_home # icon z17- (also has captio amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-) amenity-waste_transfer_station # icon z17- (also has caption(optional) z18-, area z13-) -highway-ladder # icon z17- and pathtext z17- (also has line z15-) +highway-ladder # icon z17- and pathtext z17- (also has line z15-, line::border z15-) landuse-farmland # caption z15- (also has area z10-) landuse-garages # caption z15- (also has area z13-) landuse-orchard # caption z15- (also has area z12-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 0755a0dec..78e58c01a 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -161,11 +161,13 @@ @path: #8E4E1D; @path_expert: #3D2617; @bridleway: #3D361E; +@minor_road_border: #000000; /* 5.2 Bridges */ @bridge_background: #FCF1DE; @bridge_casing: #E1D4BE; +@bridge_minor_road_border: #E3D9C8; /* 5.3 Tunnels */ diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 3204e3b73..037f15295 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -97,8 +97,8 @@ amenity-recycling-centre # area z15- (also has icon z amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z12-, caption(optional) z12-) -highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) -highway-pedestrian-square # area z14- (also has line z13-, pathtext z14-) +highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-) +highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-) highway-rest_area # area z13- (also has icon z14-, caption(optional) z15-) highway-services # area z13- (also has icon z14-, caption(optional) z14-) landuse-garages # area z13- (also has caption z15-) @@ -111,7 +111,7 @@ tourism-information-office # area z15- (also has icon z tourism-information-visitor_centre # area z13- (also has icon z13-, caption(optional) z14-) === 170 -highway-footway-area # area z14- (also has line z11-, pathtext z13-) +highway-footway-area # area z14- (also has line z11-, line::border z15-, pathtext z13-) leisure-track-area # area z15- (also has caption z16-) === 160 diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index d062e939f..66a0e7a80 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -47,10 +47,10 @@ power-line::dash # line::dash z13- (also has power-minor_line::dash # line::dash z15- (also has line z15-) === 340 -highway-ladder # line z12- (also has icon z16-, pathtext z17-) -highway-steps # line z12- (also has pathtext z13-) -highway-steps-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-steps-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +highway-ladder # line z12- (also has line::border z15-, icon z16-, pathtext z17-) +highway-steps # line z12- (also has line::border z15-, pathtext z13-) +highway-steps-bridge # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-steps-tunnel # line z12- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) hwtag-oneway::arrows # line::arrows z15- waterway-weir # line z14- (also has pathtext z15-) === 330 @@ -137,33 +137,33 @@ highway-secondary-tunnel # line z10- (also has line(c # highway-secondary-tunnel # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-) # === 269 -highway-tertiary # line z11- (also has pathtext z12-, shield::shield z13-) -highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-) -highway-unclassified # line z11- (also has pathtext z13-) -highway-unclassified-area # line z11- (also has pathtext z13-) -highway-unclassified-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) -highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-) +highway-tertiary # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-) +highway-tertiary-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary-tunnel # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-) +highway-unclassified # line z11- (also has line::border z13-, pathtext z13-) +highway-unclassified-area # line z11- (also has line::border z13-, pathtext z13-) +highway-unclassified-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +highway-unclassified-tunnel # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-) === 250 -# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-) -# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) +# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-) +# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-) # === 249 -highway-living_street # line z12- (also has pathtext z14-) -highway-living_street-bridge # line z12- (also has pathtext z14-) -highway-living_street-tunnel # line z12- (also has line(casing) z16-, pathtext z14-) -highway-residential # line z12- (also has pathtext z13-, shield::shield z15-) -highway-residential-area # line z12- (also has pathtext z13-, shield::shield z15-) -highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-) -highway-road # line z12- (also has pathtext z14-) -highway-road-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) -highway-road-tunnel # line z12- (also has pathtext z14-) +highway-living_street # line z12- (also has line::border z14-, pathtext z14-) +highway-living_street-bridge # line z12- (also has line::border z14-, pathtext z14-) +highway-living_street-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-) +highway-residential # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-) +highway-residential-area # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-) +highway-residential-bridge # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-residential-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-) +highway-road # line z12- (also has line::border z14-, pathtext z14-) +highway-road-bridge # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +highway-road-tunnel # line z12- (also has line::border z14-, pathtext z14-) === 230 -# highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-) -# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-) # === 229 highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-) @@ -192,25 +192,25 @@ highway-secondary_link-tunnel # line z13- (also has line(c === 224 # highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-) -highway-tertiary_link # line z14- (also has pathtext z18-) -highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) -highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-) +highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-) +highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-) === 223 -highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) -highway-service # line z13- (also has pathtext z16-) -highway-service-area # line z13- (also has pathtext z16-) -highway-service-bridge # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-service-driveway # line z16- (also has pathtext z16-) -highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z13- (also has line(casing) z15-, pathtext z16-) -# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) +highway-busway # line z15- (also has line::border z15-, pathtext z16-) +highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +highway-service # line z13- (also has line::border z15-, pathtext z16-) +highway-service-area # line z13- (also has line::border z15-, pathtext z16-) +highway-service-bridge # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-) +highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +highway-service-tunnel # line z13- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) === 222 -# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) -# highway-service-tunnel # line(casing) z15- (also has line z13-, pathtext z16-) +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z13-, line::border z15-, pathtext z16-) railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail::dash # line::dash z15- (also has line z10-) @@ -229,11 +229,11 @@ railway-subway::dash # line::dash z16- (also has railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) === 221 -highway-footway-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-) +highway-footway-bicycle # line z11- (also has line::border z15-, line::cycleline z13-, pathtext z13-) highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-) === 220 -highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) +highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, line::border z15-, pathtext z13-) highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z13-) === 219 @@ -266,23 +266,23 @@ railway-subway-bridge # line z13- (also has line:: # railway-rail-utility-tunnel # line(casing) z14- (also has line z12-, line::dash z16-) # === 209 -highway-ford # line z13- (also has icon z14-, pathtext z16-) -highway-pedestrian # line z13- (also has pathtext z14-) -highway-pedestrian-area # line z13- and area z14- (also has pathtext z14-) -highway-pedestrian-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) -highway-pedestrian-square # line z13- and area z14- (also has pathtext z14-) -highway-pedestrian-tunnel # line z13- (also has line(casing) z16-, pathtext z14-) +highway-ford # line z13- (also has line::border z14-, icon z14-, pathtext z16-) +highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-) +highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-) +highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-) +highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-) === 200 -# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-) +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) # === 199 highway-bridleway # line z11- (also has pathtext z13-) highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -highway-footway # line z11- (also has pathtext z13-) -highway-footway-area # line z11- and area z14- (also has pathtext z13-) -highway-footway-crossing # line z16- +highway-footway # line z11- (also has line::border z15-, pathtext z13-) +highway-footway-area # line z11- and area z14- (also has line::border z15-, pathtext z13-) +highway-footway-crossing # line z16- (also has line::border z16-) highway-path # line z11- (also has pathtext z13-) highway-path-difficult # line z11- (also has pathtext z13-) highway-path-expert # line z11- (also has pathtext z13-) @@ -292,7 +292,7 @@ highway-track-area # line z11- (also has pathte highway-track-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-track-no-access # line z11- (also has pathtext z13-) highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -=== 180 +=== 190 highway-construction # line z11- (also has pathtext z15-) leisure-track # line z15- (also has caption z16-) @@ -308,54 +308,112 @@ railway-preserved # line z13- railway-preserved-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z13- railway-turntable # line z17- -=== 160 +=== 180 -highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-footway-sidewalk # line z13- -highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +highway-footway-bridge # line z11- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-footway-sidewalk # line z13- (also has line::border z16-) +highway-footway-tunnel # line z11- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-path-horse # line z11- (also has pathtext z13-) highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -=== 155 +=== 170 highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::border z15-, line::tunnelCasing z17-, pathtext z13-) highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) +highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::border z15-, line::tunnelCasing z17-, pathtext z13-) highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -=== 154 +=== 165 highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::border z15-, line::tunnelBackground z17-, pathtext z13-) highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) +highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::border z15-, line::tunnelBackground z17-, pathtext z13-) highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -=== 153 +=== 160 + +highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) +highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-) +highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +highway-road::border # line::border z14- (also has line z12-, pathtext z14-) +highway-service::border # line::border z15- (also has line z13-, pathtext z16-) +highway-service-area::border # line::border z15- (also has line z13-, pathtext z16-) +highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-) +highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-) +highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-) +highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-) +highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-) +highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-) +=== 150 + +highway-footway::border # line::border z15- (also has line z11-, pathtext z13-) +highway-footway-area::border # line::border z15- (also has line z11-, area z14-, pathtext z13-) +highway-footway-bicycle::border # line::border z15- (also has line z11-, line::cycleline z13-, pathtext z13-) +highway-footway-crossing::border # line::border z16- (also has line z16-) +highway-footway-sidewalk::border # line::border z16- (also has line z13-) +highway-ford::border # line::border z14- (also has line z13-, icon z14-, pathtext z16-) +highway-ladder::border # line::border z15- (also has line z12-, icon z16-, pathtext z17-) +highway-pedestrian::border # line::border z14- (also has line z13-, pathtext z14-) +highway-pedestrian-area::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +highway-pedestrian-square::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +highway-steps::border # line::border z15- (also has line z12-, pathtext z13-) +=== 149 + +highway-busway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-living_street-bridge::border # line::border z14- (also has line z12-, pathtext z14-) +highway-residential-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-road-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +highway-service-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-tertiary_link-bridge::border # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +highway-unclassified-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +=== 148 + +highway-footway-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +highway-pedestrian-bridge::border # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +highway-steps-bridge::border # line::border z15- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +=== 147 + +highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +highway-living_street-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-) +highway-residential-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +highway-road-tunnel::border # line::border z14- (also has line z12-, pathtext z14-) +highway-service-tunnel::border # line::border z15- (also has line z13-, line(casing) z15-, pathtext z16-) +highway-tertiary-tunnel::border # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-) +highway-tertiary_link-tunnel::border # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-) +highway-unclassified-tunnel::border # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-) +=== 146 + +highway-footway-tunnel::border # line::border z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +highway-pedestrian-tunnel::border # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-) +highway-steps-tunnel::border # line::border z15- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +=== 145 highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) +highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::border z15-, line::bridgeblack z17-, pathtext z13-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) +highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-) highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) +highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-) -highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) -highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) +highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::border z15-, line::bridgeblack z17-, pathtext z13-) +highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) +highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) @@ -369,30 +427,30 @@ railway-rail-spur-bridge::bridgewhite # line::bridgewhite z14- (al railway-rail-tourism-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-, pathtext z14-) railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (also has line z12-, line::bridgeblack z16-, line::dash z16-) railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) -=== 150 +=== 135 highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::border z15-, line::bridgewhite z15-, pathtext z13-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) +highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-) highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) +highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-) -highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) -highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) +highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::border z15-, line::bridgewhite z15-, pathtext z13-) +highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) +highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) @@ -406,14 +464,14 @@ railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (al railway-rail-tourism-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-, pathtext z14-) railway-rail-utility-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z13-, line::dash z16-) railway-subway-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) -=== 140 +=== 130 building # area z14- (also has caption z17-) building-garage # area z14- (also has caption z17-) building-guardhouse # area z14- (also has icon z16-, caption(optional) z18-) building-has_parts # area z14- (also has caption z17-) building-train_station # area z14- (also has icon z17-, caption(optional) z17-) -=== 130 +=== 120 piste:type-connection # line z15- piste:type-downhill # line z12- (also has pathtext z15-) @@ -427,38 +485,36 @@ piste:type-hike # line z12- (also has pathte piste:type-nordic # line z12- (also has pathtext z13-) piste:type-skitour # line z12- (also has pathtext z13-) piste:type-sled # line z12- (also has pathtext z15-) -=== 120 +=== 110 building:part # area z16- -=== 110 +=== 100 barrier-retaining_wall # line z16- man_made-embankment # line z16- (also has pathtext z18-) natural-cliff # line z12- (also has pathtext z14-) natural-earth_bank # line z12- -=== 100 +=== 90 boundary-administrative-2 # line z2- boundary-administrative-3 # line z4 boundary-administrative-4 # line z5- -=== 90 +=== 80 man_made-cutline # line z13- route-ferry # line z7- (also has pathtext z10-) -=== 80 +=== 70 aeroway-runway # line z12- aeroway-taxiway # line z14- barrier-ditch # line z15- -=== 70 - isoline-step_10 # line z15- (also has pathtext z16-) isoline-step_100 # line z11- (also has pathtext z13-) isoline-step_1000 # line z10- (also has pathtext z10-) isoline-step_50 # line z13- (also has pathtext z15-) isoline-step_500 # line z10- (also has pathtext z11-) isoline-zero # line z15- (also has pathtext z15-) -=== 60 +=== 50 man_made-breakwater # line z14- and area z12- (also has caption z17-) man_made-pier # line z14- and area z12- (also has caption z17-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 520d9cab6..eae28d5d6 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -581,14 +581,14 @@ shop-supermarket # icon z16- (also has captio === 3200 area:highway-pedestrian # caption z15- (also has area z14-) -highway-pedestrian # pathtext z14- (also has line z13-) -highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-) -highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-) -highway-pedestrian-square # pathtext z14- (also has line z13-, area z14-) -highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-) -highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-) -highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-) +highway-pedestrian # pathtext z14- (also has line z13-, line::border z14-) +highway-pedestrian-area # pathtext z14- (also has line z13-, line::border z14-, area z14-) +highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-) +highway-pedestrian-square # pathtext z14- (also has line z13-, line::border z14-, area z14-) +highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-) +highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-) +highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-) natural-strait # caption z13- (also has line z11-) natural-water # caption z10- (also has area z1-) natural-water-pond # caption z10- (also has area z1-) @@ -600,10 +600,10 @@ waterway-dam # pathtext z15- (also has li waterway-river # pathtext z11- (also has line z10-) === 3150 -highway-unclassified # pathtext z13- (also has line z11-) -highway-unclassified-area # pathtext z13- (also has line z11-) -highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-) +highway-unclassified # pathtext z13- (also has line z11-, line::border z13-) +highway-unclassified-area # pathtext z13- (also has line z11-, line::border z13-) +highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-) === 3100 amenity-water_point # icon z12- (also has caption(optional) z14-) @@ -635,13 +635,13 @@ aerialway-mixed_lift # pathtext z15- (also has li aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) -highway-residential # pathtext z13- (also has shield::shield z15-, line z12-) -highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-) -highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-) -highway-road # pathtext z14- (also has line z12-) -highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-) -highway-road-tunnel # pathtext z14- (also has line z12-) +highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-) +highway-road # pathtext z14- (also has line z12-, line::border z14-) +highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-) +highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-) highway-secondary_link # pathtext z16- (also has line z13-) highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-) highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-) @@ -662,19 +662,19 @@ highway-secondary-bridge::shield # shield::shield z12- (also highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-) === 2965 -highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-) -highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-) +highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-) +highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-) === 2960 barrier-city_wall # pathtext z16- (also has line z14-) historic-citywalls # pathtext z16- (also has line z14-) === 2957 -highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-) -highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-) -highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) +highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-) +highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-) +highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-) === 2955 highway-cycleway # pathtext z13- (also has line z11-) @@ -683,14 +683,14 @@ highway-cycleway-tunnel # pathtext z13- (also has li === 2953 area:highway-footway # caption z15- (also has area z14-) -highway-footway # pathtext z13- (also has line z11-) -highway-footway-area # pathtext z13- (also has line z11-, area z14-) -highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) -highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-tertiary_link # pathtext z18- (also has line z14-) -highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-) +highway-footway # pathtext z13- (also has line z11-, line::border z15-) +highway-footway-area # pathtext z13- (also has line z11-, line::border z15-, area z14-) +highway-footway-bicycle # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-) +highway-footway-bridge # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-footway-tunnel # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) === 2950 natural-water-basin # caption z10- (also has area z1-) @@ -707,7 +707,7 @@ waterway-stream-intermittent # pathtext z13- (also has li waterway-weir # pathtext z15- (also has line z14-) === 2900 -highway-ford # icon z14- and pathtext z16- (also has line z13-) +highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-) natural-rock # icon z14- (also has caption(optional) z17-) === 2850 @@ -723,9 +723,9 @@ highway-path-horse # pathtext z13- (also has li highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 -highway-steps # pathtext z13- (also has line z12-) -highway-steps-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-steps-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) +highway-steps # pathtext z13- (also has line z12-, line::border z15-) +highway-steps-bridge # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-) +highway-steps-tunnel # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2810 highway-track # pathtext z13- (also has line z11-) @@ -735,12 +735,12 @@ highway-track-no-access # pathtext z13- (also has li highway-track-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2780 -highway-service # pathtext z16- (also has line z13-) -highway-service-area # pathtext z16- (also has line z13-) -highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-service-driveway # pathtext z16- (also has line z16-) -highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line z13-, line(casing) z15-) +highway-service # pathtext z16- (also has line z13-, line::border z15-) +highway-service-area # pathtext z16- (also has line z13-, line::border z15-) +highway-service-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-service-driveway # pathtext z16- (also has line z16-, line::border z16-) +highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) +highway-service-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-) piste:type-downhill # pathtext z15- (also has line z12-) piste:type-downhill-advanced # pathtext z15- (also has line z12-) piste:type-downhill-easy # pathtext z15- (also has line z12-) @@ -823,9 +823,9 @@ attraction-historic # icon z17- (also has captio attraction-maze # icon z17- (also has caption(optional) z17-) attraction-roller_coaster # icon z17- (also has caption(optional) z17-) highway-construction # pathtext z15- (also has line z11-) -highway-living_street # pathtext z14- (also has line z12-) -highway-living_street-bridge # pathtext z14- (also has line z12-) -highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) +highway-living_street # pathtext z14- (also has line z12-, line::border z14-) +highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z14-) +highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-) landuse-plant_nursery # icon z17- (also has caption(optional) z17-, area z12-) leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) @@ -892,9 +892,9 @@ barrier-yes # icon z16- (also has captio leisure-dog_park # icon z16- (also has caption(optional) z16-, area z15-) === 2300 -highway-busway # pathtext z16- (also has line z15-) -highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) +highway-busway # pathtext z16- (also has line z15-, line::border z15-) +highway-busway-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-busway-tunnel # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-) === 2250 amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) @@ -1163,7 +1163,7 @@ amenity-nursing_home # icon z17- (also has captio amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-) amenity-waste_transfer_station # icon z17- (also has caption(optional) z18-, area z13-) -highway-ladder # icon z16- and pathtext z17- (also has line z12-) +highway-ladder # icon z16- and pathtext z17- (also has line z12-, line::border z15-) landuse-farmland # caption z15- (also has area z10-) landuse-garages # caption z15- (also has area z13-) landuse-orchard # caption z15- (also has area z12-)