From 7dd59379a2a539140280c70239605e9d7eff2f35 Mon Sep 17 00:00:00 2001 From: map per Date: Sat, 26 Aug 2023 17:22:35 +0200 Subject: [PATCH] [styles] Regenerated Signed-off-by: map per --- data/drules_proto.bin | Bin 350956 -> 351496 bytes data/drules_proto.txt | 144 ++++++++++++++++++ data/drules_proto_clear.bin | Bin 351316 -> 351856 bytes data/drules_proto_clear.txt | 144 ++++++++++++++++++ data/drules_proto_dark.bin | Bin 349802 -> 350342 bytes data/drules_proto_dark.txt | 144 ++++++++++++++++++ data/patterns.txt | 2 +- .../include/priorities_4_overlays.prio.txt | 6 +- 8 files changed, 436 insertions(+), 4 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index d85eda5b39dc6a6a73d866e2ebd1b6ecbcd4111f..011bc1d7c56fc102ef5d932d758f73a85bdb1d54 100644 GIT binary patch delta 351 zcmaE}RkUN5=!WpiOgmU6M_xWL{Y45R&*V4fVvh2&*JebVIC?0qQoG?kCU4KfMa5802A2QG9OVot}`&$U6N& gDkIl)n;NK&$w41o+v}ScftU%1nYY(BvE<$W03L*S1ONa4 delta 80 zcmeC!CHiKo=!Wpi(;qZ2@=Q*?yl?V@b9*;Wx|+txw1jE$uX{@-*WPa2eEGqYh12~i j8HJ`-HZg7iD&d)~P{p{heO?PA5HkTW^Y(cyELk@I!v841 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 fd468983c3ad7cd6f1107ac649f2e7b5ba254f23..d2b33147e2fe060e65d5ea1fcb5c601f4652a9d1 100644 GIT binary patch delta 341 zcmcbzL-fNQ(GAfTn0ByCj=gYV`u})Fp2@4u%S~sIVN96(=DhUudJseVg7oxXGK_(n zA6-o2WV*pT+3WTa#?;C0Z;Q$a32~-@ftZ89?d#jw6^twxh18&8Qj12)gR zn8?X^V>06nk;(kGCo-l^UU*wnPDqF|4GhE_1ZLgXz^Gtk!6>8#6_c9&Uxrb6ve#Py zlT;2NAwff{Tzz*e0-0|H7YiXmbu zV8xr|?&K_F+QKrurKTEU35c1ubJepXTn7L>5NLk@ delta 90 zcmZqMDEexR=my~n)3a+Cc_zzW*f)KGI3xe$Hy5NQH=Lim+3!*UC({z9$s2AjnXG%e sadYS0%!SkMS1<}qXQ^l00#eH}U9W<1W4mS}BM>tIG4poKMwZy?08WA?r2qf` 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-)