From 0d1506cde92c6c84dfb12fe24c9d4df6934f3a02 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Mon, 10 Jul 2023 14:10:40 -0300 Subject: [PATCH] [styles] Regenerated. Signed-off-by: Viktor Govako --- data/drules_proto.bin | Bin 333865 -> 334073 bytes data/drules_proto.txt | 135 ++++++++++++++--- data/drules_proto_clear.bin | Bin 334602 -> 334682 bytes data/drules_proto_clear.txt | 86 +++++++---- data/drules_proto_dark.bin | Bin 332928 -> 333008 bytes data/drules_proto_dark.txt | 86 +++++++---- data/drules_proto_vehicle_clear.bin | Bin 251347 -> 251948 bytes data/drules_proto_vehicle_clear.txt | 227 ++++++++++++++++++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 250382 -> 250983 bytes data/drules_proto_vehicle_dark.txt | 227 ++++++++++++++++++++++++++++ data/visibility.txt | 4 +- 11 files changed, 686 insertions(+), 79 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index f217a6de4477334f06917b9cf15e3ad97b5a2e2d..165cc33c9766c168b424426a2be54f4e9c413d6e 100644 GIT binary patch delta 337 zcmZ3vLFDH~k%ldd`MQk1rx)lliZZKl@J*lfmqneCA4IA0s&EJ>@o{k!WG3fjCQpBO zno$xcB#0>_gd`*w%A~*s(J`6PR&u+d9%H?v)+;71fsD-bjPk@v-Qv`uvdrYvVj(RK z9wiYjp5(+L-J;Zj#LObyVu`<#KiY{%OsxV+^5T=^!!9Wd*2#||Ik_QQW_tZ67Pjfn z-5L3&KRL}PHr>CMg^e4@X0Yc3H8_NngpeIH9q1cLps+BiFvw%=ogR!p%ml>D+dDm2 H7MuqF=jLfk delta 266 zcmeylQDo%?k%ldd`MQkjrx)lliZZHBclgI5Vr9k8#mT`XaHL}*lLn*2-$q6uRSrQV z0WOY$%;dbxWZhhlm;x6TWz#1B^;=+(;1DK4|Mna`#s*2DXN+6|8JX!B<%yNL#i>PQ znaR`V%wo}>zR`nGWb&3RVuBh#*9dX(BqtW>7Nr&>W)@A}xJ7cZz&3U+R3V^3VGM;5 U?Gc`gK+FWh%-bV8Sr(oL0M49HU;qFB diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 37f729644a922..6d4b74918dbf1 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -25226,67 +25226,101 @@ cont { cont { name: "highway-rest_area" element { - scale: 16 + scale: 14 symbol { name: "picnic-m" priority: 16637 min_distance: 10 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 16637 + priority: 15637 } } element { - scale: 17 + scale: 15 symbol { name: "picnic-m" priority: 16637 min_distance: 10 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } + priority: 15637 + } + } + element { + scale: 16 + symbol { + name: "picnic-m" priority: 16637 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15637 + } } element { - scale: 18 + scale: 17 symbol { name: "picnic-m" priority: 16637 - min_distance: 10 } - path_text { + caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } + priority: 15637 + } + } + element { + scale: 18 + symbol { + name: "picnic-m" priority: 16637 } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15637 + } } element { scale: 19 symbol { name: "picnic-m" priority: 16637 - min_distance: 10 } - path_text { + caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 + is_optional: true } - priority: 16637 + priority: 15637 } } } @@ -27497,10 +27531,10 @@ cont { cont { name: "highway-services" element { - scale: 15 + scale: 12 symbol { name: "car-repair-s" - priority: 16656 + priority: 16637 min_distance: 20 } caption { @@ -27510,14 +27544,65 @@ cont { offset_y: 1 is_optional: true } - priority: 15656 + priority: 15637 + } + } + element { + scale: 13 + symbol { + name: "car-repair-s" + priority: 16637 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15637 + } + } + element { + scale: 14 + symbol { + name: "car-repair-s" + priority: 16637 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15637 + } + } + element { + scale: 15 + symbol { + name: "car-repair-m" + priority: 16637 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15637 } } element { scale: 16 symbol { name: "car-repair-m" - priority: 16656 + priority: 16637 } caption { primary { @@ -27526,14 +27611,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15656 + priority: 15637 } } element { scale: 17 symbol { name: "car-repair-m" - priority: 16656 + priority: 16637 } caption { primary { @@ -27542,39 +27627,39 @@ cont { offset_y: 1 is_optional: true } - priority: 15656 + priority: 15637 } } element { scale: 18 symbol { name: "car-repair-m" - priority: 16656 + priority: 16637 } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true } - priority: 15656 + priority: 15637 } } element { scale: 19 symbol { name: "car-repair-m" - priority: 16656 + priority: 16637 } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true } - priority: 15656 + priority: 15637 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index efae3562d0edc9d1a91b6607f86c9c72b518f68a..549bbdadc68cf63a14fbb704094af8f3cb7d8f9b 100644 GIT binary patch delta 256 zcmeC$CUR?=NW&J!4sFTHj9h{lnduqjiIuuVsl_GniAAZ2LTViR(;0uTsPd|C2q^J! zaTH`G=Vc~OFFe602^12<6cR!bS{TTrzy{GVnbB5qyOj>(WC^B8Ow-T1Fp3KEDT#3L zBqtUDZ7WF3EYdBO_&fQdoe0y^s_7417=@>Q{KP0Fr~$NA2w54}>gfV+S=hLdG($v_ jTp2~CF9~E418NgS)dsS^eVZ#I5HkTW^Y(47EFo6`ZYodX delta 316 zcmcb$O{8m^NW&J!4(iA9xHg+oAzkBg%qGdV9adHTXrjFLbh zK};bbgwSM0TZ!ofeoP!}5M4mN3>@;UFTU z#ledv0|_A!u-~~+9HIpbNmNsi)j~pZdcg)})_P!YY5{{2n__H1uf-uiv|0@gK_wv+ tuYer^b}lS*BOx)W!6AfGDQXaFa0nBpve|N5yX7`UAZFTbxs7?2JOIbgsTu$P delta 31 mcmZ3pf&cPq{tf45Z$33AN2+=9j`qnr7=f5+`{W(WGvxseG7sYb diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 9bb284054562c..3a81f754e79b5 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -12817,6 +12817,106 @@ cont { } } } +cont { + name: "highway-rest_area" + element { + scale: 14 + symbol { + name: "picnic-m" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 17 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 13 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 18 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 19 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } +} cont { name: "highway-road" element { @@ -15070,6 +15170,133 @@ cont { } } } +cont { + name: "highway-services" + element { + scale: 12 + symbol { + name: "car-repair-s" + priority: 16878 + min_distance: 20 + } + } + element { + scale: 13 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 20 + } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 16 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 12 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 17 + symbol { + name: "car-repair-m" + priority: 16878 + } + caption { + primary { + height: 13 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 18 + symbol { + name: "car-repair-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 19 + symbol { + name: "car-repair-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } +} cont { name: "highway-speed_camera" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 51ed5098cb277ae559484d9ba7337dff5428b317..bca1fa71d527362f35a4449a4985fa4c534c5cd6 100644 GIT binary patch delta 563 zcmeBM!vA~){|23T8b2Ai1T!+zGs+Vyb&FDqOX3rYQWJ&LIQWzVxHt+jlk+l@b#o=& zHBUasAza^9Bc#H?uf&HU!>A>|#m&JZ@a)V?W(`IQMhUPg0isk1VpYY9W|k0Cl_ShC z5G(o6lnG-s3`Nyu?Rih7Ty8OO3BdeZoLW?tnVecIB*DR>B*Mj$oLB@5hl0e+BHd!3 zw;2^ggtRz#(PV%DGFib~L=xyzEnrBYY6FLspr9~BmLHoeFf1Xm0ytzrA+5n7s3e5q rAdtxrucL;L28R$%l_=f^nkh__O2(RI{+;doI~jqPX*>T;=Km4^E1RFB delta 31 mcmaF9g1>JG{|23Tn>FS?k!sG|-JZFd5r~<#XYOYHCjkKSC=SK| diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 9ee80136d457e..03befa5fcdf85 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -12996,6 +12996,106 @@ cont { } } } +cont { + name: "highway-rest_area" + element { + scale: 14 + symbol { + name: "picnic-m" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 17 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 13 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 18 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 19 + symbol { + name: "picnic-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } +} cont { name: "highway-road" element { @@ -15289,6 +15389,133 @@ cont { } } } +cont { + name: "highway-services" + element { + scale: 12 + symbol { + name: "car-repair-s" + priority: 16878 + min_distance: 20 + } + } + element { + scale: 13 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 14 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 20 + } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 15 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 16 + symbol { + name: "car-repair-m" + priority: 16878 + min_distance: 10 + } + caption { + primary { + height: 12 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 17 + symbol { + name: "car-repair-m" + priority: 16878 + } + caption { + primary { + height: 13 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 18 + symbol { + name: "car-repair-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } + element { + scale: 19 + symbol { + name: "car-repair-m" + priority: 16878 + } + caption { + primary { + height: 14 + color: 6710886 + offset_y: 1 + is_optional: true + } + priority: 15878 + } + } +} cont { name: "highway-speed_camera" element { diff --git a/data/visibility.txt b/data/visibility.txt index 98387e15cd945..102fd760b09cc 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -448,7 +448,7 @@ world 00000000000000000000 + bridge 00000000000011111111 - tunnel 00000000000011111111 - {} - rest_area 00000000000000000000 - + rest_area 00000000000000111111 - road 00000000000011111111 + bridge 00000000000011111111 - tunnel 00000000000011111111 - @@ -469,7 +469,7 @@ world 00000000000000000000 + parking_aisle 00000000000000111111 - tunnel 00000000000000111111 - {} - services 00000000000000000000 - + services 00000000000011111111 - speed_camera 00000000000001111111 - steps 00000000000000000011 + bridge 00000000000000000011 -