diff --git a/data/drules_proto.bin b/data/drules_proto.bin index d85eda5b39..011bc1d7c5 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index ffc3064811..97d786d7a4 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -16289,6 +16289,22 @@ cont { } priority: 170 } + lines { + width: 5.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 6.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -16309,6 +16325,22 @@ cont { } priority: 170 } + lines { + width: 7.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 8.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16329,6 +16361,22 @@ cont { } priority: 170 } + lines { + width: 9.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -17196,6 +17244,22 @@ cont { color: 16746413 priority: 330 } + lines { + width: 5.6 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 6.6 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -17212,6 +17276,22 @@ cont { color: 16746413 priority: 330 } + lines { + width: 8.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -17228,6 +17308,22 @@ cont { color: 16746413 priority: 330 } + lines { + width: 9.4 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.4 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -30678,6 +30774,22 @@ cont { } priority: 180 } + lines { + width: 6.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 7.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -30698,6 +30810,22 @@ cont { } priority: 180 } + lines { + width: 8.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -30718,6 +30846,22 @@ cont { } priority: 180 } + lines { + width: 10.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 11.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index fd468983c3..d2b33147e2 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 1d870f55c3..04d0445f34 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -16028,6 +16028,22 @@ cont { } priority: 170 } + lines { + width: 5.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 6.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -16048,6 +16064,22 @@ cont { } priority: 170 } + lines { + width: 7.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 8.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16068,6 +16100,22 @@ cont { } priority: 170 } + lines { + width: 9.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16935,6 +16983,22 @@ cont { color: 16746413 priority: 330 } + lines { + width: 5.6 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 6.6 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -16951,6 +17015,22 @@ cont { color: 16746413 priority: 330 } + lines { + width: 8.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16967,6 +17047,22 @@ cont { color: 16746413 priority: 330 } + lines { + width: 9.4 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.4 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -30251,6 +30347,22 @@ cont { } priority: 180 } + lines { + width: 6.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 7.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -30271,6 +30383,22 @@ cont { } priority: 180 } + lines { + width: 8.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -30291,6 +30419,22 @@ cont { } priority: 180 } + lines { + width: 10.0 + color: 15592411 + priority: 50 + cap: BUTTCAP + } + lines { + width: 11.0 + color: 8421504 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 9d7381df97..9ce396fa39 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index bc805bbee1..e0ba8eb7c2 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -16028,6 +16028,22 @@ cont { } priority: 170 } + lines { + width: 5.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 6.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -16048,6 +16064,22 @@ cont { } priority: 170 } + lines { + width: 7.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 8.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16068,6 +16100,22 @@ cont { } priority: 170 } + lines { + width: 9.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16935,6 +16983,22 @@ cont { color: 7224647 priority: 330 } + lines { + width: 5.6 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 6.6 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -16951,6 +17015,22 @@ cont { color: 7224647 priority: 330 } + lines { + width: 8.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -16967,6 +17047,22 @@ cont { color: 7224647 priority: 330 } + lines { + width: 9.4 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 10.4 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -30359,6 +30455,22 @@ cont { } priority: 180 } + lines { + width: 6.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 7.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 9 @@ -30379,6 +30491,22 @@ cont { } priority: 180 } + lines { + width: 8.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 9.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -30399,6 +30527,22 @@ cont { } priority: 180 } + lines { + width: 10.0 + color: 2894874 + priority: 50 + cap: BUTTCAP + } + lines { + width: 11.0 + color: 5263440 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 40 + cap: BUTTCAP + } path_text { primary { height: 10 diff --git a/data/patterns.txt b/data/patterns.txt index 1ec0350fe4..f737b994ba 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -20,6 +20,7 @@ 4.5 1.8 7.2 2.7 9.0 3.6 +2.0 2.0 10.8 4.5 13.5 5.4 18.0 6.2 @@ -28,7 +29,6 @@ 8.0 3.0 10.0 3.5 3.5 2.0 -2.0 2.0 2.0 1.0 3.6 1.6 5.0 2.2 diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index a43430bc89..88c06b14b6 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -663,7 +663,7 @@ highway-secondary_link-tunnel # pathtext z16- (also has li highway-cycleway # pathtext z15- (also has line z13-) highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-) highway-cycleway-permissive # pathtext z15- (also has line z13-) -highway-cycleway-tunnel # pathtext z15- (also has line z13-) +highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-footway # pathtext z15- (also has line z15-) highway-footway-area # pathtext z15- (also has line z15-, area z14-) highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) @@ -691,7 +691,7 @@ tourism-information # icon z16- (also has captio highway-bridleway # pathtext z15- (also has line z14-) highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-permissive # pathtext z15- (also has line z14-) -highway-bridleway-tunnel # pathtext z15- (also has line z14-) +highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-footway-alpine_hiking # pathtext z15- (also has line z14-) highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z14-) highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z14-) @@ -731,7 +731,7 @@ highway-track-grade4 # pathtext z15- (also has li highway-track-grade5 # pathtext z15- (also has line z14-) highway-track-no-access # pathtext z15- (also has line z14-) highway-track-permissive # pathtext z15- (also has line z14-) -highway-track-tunnel # pathtext z15- (also has line z14-) +highway-track-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2800 tourism-hotel # icon z16- (also has caption(optional) z16-)