From 41b4e6801d679f22fb02c0f39ca5e77fea59a877 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Tue, 13 Jan 2026 14:45:33 +0100 Subject: [PATCH] [styles] Removed road borders to major roads on low zoom levels Signed-off-by: Yannik Bloscheck --- data/styles/default/dark/colors.mapcss | 3 - data/styles/default/include/Roads.mapcss | 264 +++++++----------- .../default/include/priorities_3_FG.prio.txt | 144 +++++----- .../include/priorities_4_overlays.prio.txt | 90 +++--- data/styles/default/light/colors.mapcss | 3 - .../outdoors/include/priorities_3_FG.prio.txt | 144 +++++----- .../include/priorities_4_overlays.prio.txt | 90 +++--- 7 files changed, 335 insertions(+), 403 deletions(-) diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 7903f5b21..a84747cd7 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -162,11 +162,8 @@ @path: #944A12; @path_expert: #523E33; @bridleway: #2B2827; -@motorway0_border: #7A4006; @motorway1_border: #784606; -@trunk0_border: #794D11; @trunk1_border: #79511D; -@primary0_border: #7A5C2A; @primary1_border: #7C5E24; @primary2_border: #7C622F; @secondary0_border: #7F6730; diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 7bcb451de..80f3b4dbc 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -139,17 +139,17 @@ line|z12[highway=motorway], line|z13[highway=motorway], {width: 4.0;} line|z14[highway=motorway], -{width: 4.4;} +{width: 3.4;} line|z15[highway=motorway], -{width: 5.6;} +{width: 4.6;} line|z16[highway=motorway], -{width: 7.8;} +{width: 6.8;} line|z17[highway=motorway], -{width: 9.0;} +{width: 8.0;} line|z18[highway=motorway], -{width: 12.0;} +{width: 11.0;} line|z19-[highway=motorway], -{width: 16.0;} +{width: 15.0;} line|z6[highway=motorway], line|z6[highway=trunk], @@ -172,17 +172,17 @@ line|z12[highway=trunk], line|z13[highway=trunk], {width: 3.6;} line|z14[highway=trunk], -{width: 4.0;} +{width: 3.0;} line|z15[highway=trunk], -{width: 4.8;} +{width: 3.8;} line|z16[highway=trunk], -{width: 6.2;} +{width: 5.2;} line|z17[highway=trunk], -{width: 8.2;} +{width: 7.2;} line|z18[highway=trunk], -{width: 11;} +{width: 10;} line|z19-[highway=trunk], -{width: 13.5;} +{width: 12.5;} line|z10[highway=motorway_link], line|z10[highway=trunk_link] @@ -198,22 +198,22 @@ line|z13[highway=trunk_link] {width: 1.9;} line|z14[highway=motorway_link], line|z14[highway=trunk_link] -{width: 2.7;} +{width: 1.7;} line|z15[highway=motorway_link], line|z15[highway=trunk_link] -{width: 3.7;} +{width: 2.7;} line|z16[highway=motorway_link], line|z16[highway=trunk_link] -{width: 5.1;} +{width: 4.1;} line|z17[highway=motorway_link], line|z17[highway=trunk_link] -{width: 6.7;} +{width: 5.7;} line|z18[highway=motorway_link], line|z18[highway=trunk_link] -{width: 9.5;} +{width: 8.5;} line|z19-[highway=motorway_link], line|z19-[highway=trunk_link] -{width: 11.7;} +{width: 10.7;} /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */ @@ -302,23 +302,23 @@ line|z9[highway=primary], line|z10[highway=primary], {width: 1.8;} line|z11[highway=primary], -{width: 2.3;} +{width: 1.3;} line|z12[highway=primary], -{width: 2.7;} +{width: 1.7;} line|z13[highway=primary], -{width: 3.0;} +{width: 2.0;} line|z14[highway=primary], -{width: 3.8;} +{width: 2.8;} line|z15[highway=primary], -{width: 4.4;} +{width: 3.4;} line|z16[highway=primary], -{width: 5.4;} +{width: 4.4;} line|z17[highway=primary], -{width: 7;} +{width: 6;} line|z18[highway=primary], -{width: 10;} +{width: 9;} line|z19-[highway=primary], -{width: 12;} +{width: 11;} line|z11[highway=primary_link], @@ -330,15 +330,15 @@ line|z13[highway=primary_link], line|z14[highway=primary_link], {width: 1.8;} line|z15[highway=primary_link], -{width: 2.5;} +{width: 1.5;} line|z16[highway=primary_link], -{width: 3.2;} +{width: 2.2;} line|z17[highway=primary_link], -{width: 4.7;} +{width: 3.7;} line|z18[highway=primary_link], -{width: 6.4;} +{width: 5.4;} line|z19-[highway=primary_link], -{width: 8.2;} +{width: 7.2;} /* 4.2 Primary tunnel 14-22 ZOOM */ @@ -396,38 +396,38 @@ line|z14-[highway=secondary_link][bridge?]::bridgeblack, line|z10[highway=secondary], {width: 1.4;} line|z11[highway=secondary], -{width: 2.2;} +{width: 1.2;} line|z12[highway=secondary], -{width: 2.5;} +{width: 1.5;} line|z13[highway=secondary], -{width: 2.7;} +{width: 1.7;} line|z14[highway=secondary], -{width: 3.2;} +{width: 2.2;} line|z15[highway=secondary], -{width: 3.8;} +{width: 2.8;} line|z16[highway=secondary], -{width: 5;} +{width: 4;} line|z17[highway=secondary], -{width: 6.6;} +{width: 5.6;} line|z18[highway=secondary], -{width: 9.4;} +{width: 8.4;} line|z19-[highway=secondary], -{width: 11.6;} +{width: 10.6;} line|z13[highway=secondary_link], {width: 1.3;} line|z14[highway=secondary_link], {width: 1.8;} line|z15[highway=secondary_link], -{width: 2.5;} +{width: 1.5;} line|z16[highway=secondary_link], -{width: 3.2;} +{width: 2.2;} line|z17[highway=secondary_link], -{width: 4.7;} +{width: 3.7;} line|z18[highway=secondary_link], -{width: 6.4;} +{width: 5.4;} line|z19-[highway=secondary_link], -{width: 8.2;} +{width: 7.2;} /* 5.2 Secondary tunnel 16-22 ZOOM */ @@ -1142,18 +1142,6 @@ line|z17-[highway=bridleway][bridge?]::bridgeblack /* 8.10 Major road borders */ -line|z6-9[highway=motorway]::border, -line|z6-9[highway=trunk]::border, -{color: @trunk0_border; opacity: 1;} - -line|z10-13[highway=motorway]::border, -line|z10-13[highway=motorway_link]::border, -{color: @motorway0_border; opacity: 1;} - -line|z10-13[highway=trunk]::border, -line|z10-13[highway=trunk_link]::border, -{color: @trunk1_border; opacity: 1;} - line|z14-[highway=motorway]::border, line|z14-[highway=motorway_link]::border, {color: @motorway1_border; opacity: 1;} @@ -1162,8 +1150,6 @@ line|z14-[highway=trunk]::border, line|z14-[highway=trunk_link]::border, {color: @trunk1_border; opacity: 1;} -line|z8-10[highway=primary]::border, -{color: @primary0_border; opacity: 1;} line|z11-13[highway=primary]::border, line|z11-13[highway=primary_link]::border, {color: @primary1_border; opacity: 1;} @@ -1171,7 +1157,7 @@ line|z14-[highway=primary]::border, line|z14-[highway=primary_link]::border, {color: @primary2_border; opacity: 1;} -line|z10-13[highway=secondary]::border, +line|z11-13[highway=secondary]::border, line|z13[highway=secondary_link]::border, {color: @secondary0_border; opacity: 1;} line|z14-[highway=secondary]::border, @@ -1180,170 +1166,122 @@ line|z14-[highway=secondary_link]::border, /* 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|z10[highway=motorway]::border, -{width: 3.6;} -line|z11[highway=motorway]::border, -{width: 4.0;} -line|z12[highway=motorway]::border, -{width: 4.6;} -line|z13[highway=motorway]::border, -{width: 5.0;} line|z14[highway=motorway]::border, -{width: 5.4;} +{width: 4.4;} line|z15[highway=motorway]::border, -{width: 6.6;} +{width: 5.6;} line|z16[highway=motorway]::border, -{width: 8.8;} +{width: 7.8;} line|z17[highway=motorway]::border, -{width: 10.0;} +{width: 9.0;} line|z18[highway=motorway]::border, -{width: 13.0;} +{width: 12.0;} line|z19-[highway=motorway]::border, -{width: 17.0;} +{width: 16.0;} -line|z6[highway=motorway]::border, -line|z6[highway=trunk]::border, -{width: 0;} -line|z7[highway=motorway]::border, -line|z7[highway=trunk]::border, -{width: 0;} -line|z8[highway=motorway]::border, -line|z8[highway=trunk]::border, -{width: 1.7;} -line|z9[highway=motorway]::border, -line|z9[highway=trunk]::border, -{width: 1.8;} -line|z10[highway=trunk]::border, -{width: 3.2;} -line|z11[highway=trunk]::border, -{width: 3.5;} -line|z12[highway=trunk]::border, -{width: 4.0;} -line|z13[highway=trunk]::border, -{width: 4.6;} line|z14[highway=trunk]::border, -{width: 5.0;} +{width: 4.0;} line|z15[highway=trunk]::border, -{width: 5.8;} +{width: 4.8;} line|z16[highway=trunk]::border, -{width: 7.2;} +{width: 6.2;} line|z17[highway=trunk]::border, -{width: 9.2;} +{width: 8.2;} line|z18[highway=trunk]::border, -{width: 12;} +{width: 11;} line|z19-[highway=trunk]::border, -{width: 14.5;} +{width: 13.5;} -line|z10[highway=motorway_link]::border, -line|z10[highway=trunk_link]::border, -{width: 0;} -line|z11[highway=motorway_link]::border, -line|z11[highway=trunk_link]::border, -{width: 1.6;} -line|z12[highway=motorway_link]::border, -line|z12[highway=trunk_link]::border, -{width: 1.9;} -line|z13[highway=motorway_link]::border, -line|z13[highway=trunk_link]::border, -{width: 2.4;} line|z14[highway=motorway_link]::border, line|z14[highway=trunk_link]::border, -{width: 3.7;} +{width: 2.2;} line|z15[highway=motorway_link]::border, line|z15[highway=trunk_link]::border, -{width: 4.7;} +{width: 3.7;} line|z16[highway=motorway_link]::border, line|z16[highway=trunk_link]::border, -{width: 6.1;} +{width: 5.1;} line|z17[highway=motorway_link]::border, line|z17[highway=trunk_link]::border, -{width: 7.7;} +{width: 6.7;} line|z18[highway=motorway_link]::border, line|z18[highway=trunk_link]::border, -{width: 10.5;} +{width: 9.5;} line|z19-[highway=motorway_link]::border, line|z19-[highway=trunk_link]::border, -{width: 12.7;} +{width: 11.7;} -line|z8[highway=primary]::border, -{width: 0;} -line|z9[highway=primary]::border, -{width: 0;} -line|z10[highway=primary]::border, -{width: 2.3;} line|z11[highway=primary]::border, -{width: 3.3;} +{width: 1.8;} line|z12[highway=primary]::border, -{width: 3.7;} +{width: 2.2;} line|z13[highway=primary]::border, -{width: 4.0;} +{width: 3.0;} line|z14[highway=primary]::border, -{width: 4.8;} +{width: 3.8;} line|z15[highway=primary]::border, -{width: 5.4;} +{width: 4.4;} line|z16[highway=primary]::border, -{width: 6.4;} +{width: 5.4;} line|z17[highway=primary]::border, -{width: 8;} +{width: 7;} line|z18[highway=primary]::border, -{width: 11;} +{width: 10;} line|z19-[highway=primary]::border, -{width: 13;} +{width: 12;} line|z11[highway=primary_link]::border, {width: 0;} line|z12[highway=primary_link]::border, {width: 0;} line|z13[highway=primary_link]::border, -{width: 1.8;} +{width: 0;} line|z14[highway=primary_link]::border, -{width: 2.3;} +{width: 0;} line|z15[highway=primary_link]::border, -{width: 3.5;} +{width: 2;} line|z16[highway=primary_link]::border, -{width: 4.2;} -line|z17[highway=primary_link]::border, -{width: 5.7;} -line|z18[highway=primary_link]::border, -{width: 7.4;} -line|z19-[highway=primary_link]::border, -{width: 9.2;} - -line|z10[highway=secondary]::border, -{width: 1.9;} -line|z11[highway=secondary]::border, {width: 3.2;} +line|z17[highway=primary_link]::border, +{width: 4.7;} +line|z18[highway=primary_link]::border, +{width: 6.4;} +line|z19-[highway=primary_link]::border, +{width: 8.2;} + +line|z11[highway=secondary]::border, +{width: 1.7;} line|z12[highway=secondary]::border, -{width: 3.5;} +{width: 2;} line|z13[highway=secondary]::border, -{width: 3.7;} +{width: 2.2;} line|z14[highway=secondary]::border, -{width: 4.2;} +{width: 3.2;} line|z15[highway=secondary]::border, -{width: 4.8;} +{width: 3.8;} line|z16[highway=secondary]::border, -{width: 6;} +{width: 5;} line|z17[highway=secondary]::border, -{width: 7.6;} +{width: 6.6;} line|z18[highway=secondary]::border, -{width: 10.4;} +{width: 9.4;} line|z19-[highway=secondary]::border, -{width: 12.6;} +{width: 11.6;} line|z13[highway=secondary_link]::border, -{width: 1.8;} +{width: 0;} line|z14[highway=secondary_link]::border, -{width: 2.3;} +{width: 0;} line|z15[highway=secondary_link]::border, -{width: 3.5;} +{width: 2;} line|z16[highway=secondary_link]::border, -{width: 4.2;} +{width: 3.2;} line|z17[highway=secondary_link]::border, -{width: 5.7;} +{width: 4.7;} line|z18[highway=secondary_link]::border, -{width: 7.4;} +{width: 6.4;} line|z19-[highway=secondary_link]::border, -{width: 9.2;} +{width: 8.2;} /* 8.11 Minor road borders */ diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index fe284bfd1..412095eef 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -73,23 +73,23 @@ railway-tram-bridge # line z13- railway-tram-tunnel # line z13- === 320 -highway-motorway # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) highway-world_level # line z4-9 highway-world_towns_level # line z6-9 === 310 -# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-) -# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) # === 309 -highway-primary # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-) -highway-primary-bridge # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-primary-tunnel # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-primary # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-) +highway-primary-bridge # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-primary-tunnel # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-) railway-rail-branch::dash # line::dash z16- (also has line z11-) railway-rail-branch-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail-branch-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) @@ -104,7 +104,7 @@ railway-rail-tourism-bridge::dash # line::dash z16- (also has railway-rail-tourism-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-) === 290 -# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-) +# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-) # === 289 railway-rail-branch # line z11- (also has line::dash z16-) @@ -127,12 +127,12 @@ railway-rail-tourism-tunnel # line z10- (also has line:: # railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-) # === 279 -highway-secondary # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-) -highway-secondary-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary-tunnel # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +highway-secondary # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-) +highway-secondary-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +highway-secondary-tunnel # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-) === 270 -# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-) +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z12-) # === 269 highway-tertiary # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-) @@ -164,32 +164,32 @@ highway-road-tunnel # line z12- (also has line:: # 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 line::border z11-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-motorway_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-motorway_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-trunk_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) === 228 -# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-) -# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) # === 227 -highway-primary_link # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-) -highway-primary_link-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-primary_link-tunnel # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-) +highway-primary_link # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-) +highway-primary_link-bridge # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +highway-primary_link-tunnel # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-) === 226 -# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-) # === 225 -highway-secondary_link # line z13- (also has line::border z13-, pathtext z16-) -highway-secondary_link-bridge # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) -highway-secondary_link-tunnel # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-) +highway-secondary_link # line z13- (also has line::border z15-, pathtext z16-) +highway-secondary_link-bridge # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-tunnel # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-) === 224 -# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-) +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-) 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-) @@ -332,64 +332,64 @@ highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (a highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) === 168 -highway-motorway::border # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-) -highway-trunk::border # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-) +highway-motorway::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +highway-trunk::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) === 163 -highway-primary::border # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-) +highway-primary::border # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-) === 162 -highway-secondary::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-) +highway-secondary::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-) === 161 -highway-motorway_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-) -highway-trunk_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-) +highway-motorway_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +highway-trunk_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) === 160 -highway-primary_link::border # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-) +highway-primary_link::border # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-) === 159 -highway-secondary_link::border # line::border z13- (also has line z13-, pathtext z16-) +highway-secondary_link::border # line::border z15- (also has line z13-, pathtext z16-) === 158 -highway-motorway-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) === 157 -highway-primary-bridge::border # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-primary-bridge::border # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) === 156 -highway-secondary-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +highway-secondary-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) === 155 -highway-motorway_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) === 154 -highway-primary_link-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +highway-primary_link-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) === 153 -highway-secondary_link-bridge::border # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) === 152 -highway-motorway-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) === 151 -highway-primary-tunnel::border # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-primary-tunnel::border # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) === 150 -highway-secondary-tunnel::border # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +highway-secondary-tunnel::border # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) === 149 -highway-motorway_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) === 148 -highway-primary_link-tunnel::border # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +highway-primary_link-tunnel::border # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) === 147 -highway-secondary_link-tunnel::border # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-) +highway-secondary_link-tunnel::border # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-) === 146 highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) @@ -454,23 +454,23 @@ highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (al 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::border z15-, line::bridgeblack z17-, pathtext z15-) -highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, 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::border z14-, line::bridgeblack z14-, pathtext z14-) -highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) 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::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-) +highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-) 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::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) railway-disused-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-) @@ -491,23 +491,23 @@ highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (al 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::border z15-, line::bridgewhite z15-, pathtext z15-) -highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, 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::border z14-, line::bridgewhite z13-, pathtext z14-) -highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) 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::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-) +highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-) 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::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) railway-disused-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-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index ba10ff176..6ce0f5a9f 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -78,20 +78,20 @@ amenity-ferry_terminal # icon z11- (also has captio railway-station # icon z12- (also has caption(optional) z12-) === 6800 -highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-) +highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) === 6750 -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-) +highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) === 6740 boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) @@ -259,31 +259,31 @@ railway-station-subway-yerevan # icon z13- (also has captio railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-) === 6250 -highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-) -highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-) +highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-) +highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-) route-ferry # pathtext z10- (also has line z7-) === 6200 -highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-) -highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-) -highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-) -highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-) +highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) === 6150 -highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-) -highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-) -highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-) -highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-) +highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) === 6140 -highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-) -highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-) +highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-) +highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-) === 6100 barrier-border_control # icon z14- (also has caption(optional) z14-) @@ -302,9 +302,9 @@ place-locality # caption z13- place-neighbourhood # caption z13- === 5700 -highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-) -highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-) +highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-) +highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-) === 5600 man_made-communications_tower # icon z14- (also has caption(optional) z15-) @@ -652,24 +652,24 @@ highway-residential-tunnel # pathtext z13- (also has sh 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-, line::border z13-) -highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-) +highway-secondary_link # pathtext z16- (also has line z13-, line::border z15-) +highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-) === 3000 -highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-) -highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-) +highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-) +highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-) === 2975 -highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-) -highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-) +highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-) +highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-) === 2970 -highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-) -highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-) +highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-) +highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-) === 2965 highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 9fb170c62..19ed3dff3 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -161,11 +161,8 @@ @path: #8E4E1D; @path_expert: #3D2617; @bridleway: #3D361E; -@motorway0_border: #C26E00; @motorway1_border: #D87A00; -@trunk0_border: #DA8816; @trunk1_border: #DA8F2B; -@primary0_border: #DDA546; @primary1_border: #E1A93A; @primary2_border: #E1AF4E; @secondary0_border: #E6BA51; diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 30b16e50c..6ca4f46d8 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -75,23 +75,23 @@ railway-tram-bridge # line z13- railway-tram-tunnel # line z13- === 320 -highway-motorway # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) highway-world_level # line z4-9 highway-world_towns_level # line z6-9 === 310 -# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-) -# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) # === 309 -highway-primary # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-) -highway-primary-bridge # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-primary-tunnel # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-primary # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-) +highway-primary-bridge # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-primary-tunnel # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-) railway-rail-branch::dash # line::dash z15- (also has line z10-) railway-rail-branch-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail-branch-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) @@ -106,7 +106,7 @@ railway-rail-tourism-bridge::dash # line::dash z15- (also has railway-rail-tourism-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-) === 290 -# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-) +# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-) # === 289 railway-rail-branch # line z10- (also has line::dash z15-) @@ -129,12 +129,12 @@ railway-rail-tourism-tunnel # line z10- (also has line:: # railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z15-, pathtext z14-) # === 279 -highway-secondary # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-) -highway-secondary-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary-tunnel # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +highway-secondary # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-) +highway-secondary-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +highway-secondary-tunnel # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-) === 270 -# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-) +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z12-) # === 269 highway-tertiary # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-) @@ -166,32 +166,32 @@ highway-road-tunnel # line z12- (also has line:: # 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 line::border z11-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-motorway_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-motorway_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-trunk_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) === 228 -# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-) -# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) # === 227 -highway-primary_link # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-) -highway-primary_link-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-primary_link-tunnel # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-) +highway-primary_link # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-) +highway-primary_link-bridge # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +highway-primary_link-tunnel # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-) === 226 -# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-) # === 225 -highway-secondary_link # line z13- (also has line::border z13-, pathtext z16-) -highway-secondary_link-bridge # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) -highway-secondary_link-tunnel # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-) +highway-secondary_link # line z13- (also has line::border z15-, pathtext z16-) +highway-secondary_link-bridge # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-tunnel # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-) === 224 -# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-) +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-) 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-) @@ -334,64 +334,64 @@ highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (a highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) === 168 -highway-motorway::border # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-) -highway-trunk::border # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-) +highway-motorway::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +highway-trunk::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) === 163 -highway-primary::border # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-) +highway-primary::border # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-) === 162 -highway-secondary::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-) +highway-secondary::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-) === 161 -highway-motorway_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-) -highway-trunk_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-) +highway-motorway_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +highway-trunk_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) === 160 -highway-primary_link::border # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-) +highway-primary_link::border # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-) === 159 -highway-secondary_link::border # line::border z13- (also has line z13-, pathtext z16-) +highway-secondary_link::border # line::border z15- (also has line z13-, pathtext z16-) === 158 -highway-motorway-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) === 157 -highway-primary-bridge::border # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-primary-bridge::border # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) === 156 -highway-secondary-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +highway-secondary-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) === 155 -highway-motorway_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) === 154 -highway-primary_link-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +highway-primary_link-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) === 153 -highway-secondary_link-bridge::border # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +highway-secondary_link-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) === 152 -highway-motorway-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) === 151 -highway-primary-tunnel::border # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-primary-tunnel::border # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) === 150 -highway-secondary-tunnel::border # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +highway-secondary-tunnel::border # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) === 149 -highway-motorway_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) === 148 -highway-primary_link-tunnel::border # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +highway-primary_link-tunnel::border # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) === 147 -highway-secondary_link-tunnel::border # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-) +highway-secondary_link-tunnel::border # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-) === 146 highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) @@ -456,23 +456,23 @@ highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (al 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::border z15-, line::bridgeblack z17-, pathtext z13-) -highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, 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::border z14-, line::bridgeblack z14-, pathtext z14-) -highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) 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::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-) +highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-) 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::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) railway-disused-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-) @@ -493,23 +493,23 @@ highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (al 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::border z15-, line::bridgewhite z15-, pathtext z13-) -highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, 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::border z14-, line::bridgewhite z13-, pathtext z14-) -highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) 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::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-) +highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-) 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::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) railway-disused-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-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5ad04b8ba..8b4a389e1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -78,20 +78,20 @@ amenity-ferry_terminal # icon z11- (also has captio railway-station # icon z12- (also has caption(optional) z12-) === 6800 -highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-) +highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) === 6750 -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-) +highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) === 6740 boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) @@ -259,31 +259,31 @@ railway-station-subway-yerevan # icon z13- (also has captio railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-) === 6250 -highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-) -highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-) +highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-) +highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-) route-ferry # pathtext z10- (also has line z7-) === 6200 -highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-) -highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-) -highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-) -highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-) +highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) === 6150 -highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-) -highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-) -highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-) -highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-) +highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) === 6140 -highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-) -highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-) +highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-) +highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-) === 6100 barrier-border_control # icon z12- (also has caption(optional) z14-) @@ -302,9 +302,9 @@ place-locality # caption z13- place-neighbourhood # caption z13- === 5700 -highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-) -highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-) +highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-) +highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-) === 5600 man_made-communications_tower # icon z12- (also has caption(optional) z13-) @@ -652,24 +652,24 @@ highway-residential-tunnel # pathtext z13- (also has sh 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-, line::border z13-) -highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-) +highway-secondary_link # pathtext z16- (also has line z13-, line::border z15-) +highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-) === 3000 -highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-) -highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-) +highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-) +highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-) === 2975 -highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-) -highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-) +highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-) +highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-) === 2970 -highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-) -highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-) +highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-) +highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-) === 2965 highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)