From a5573cc4989c7cd86887acedb6690c51af2b261b Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 24 Apr 2024 21:26:21 +0300 Subject: [PATCH] [styles] Regenerate for shared paths Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 1 + data/colors.txt | 13 +- data/drules_proto.bin | Bin 421922 -> 422936 bytes data/drules_proto.txt | 704 ++++++++++++----- data/drules_proto_clear.bin | Bin 408696 -> 409440 bytes data/drules_proto_clear.txt | 529 +++++++++---- data/drules_proto_dark.bin | Bin 407288 -> 408032 bytes data/drules_proto_dark.txt | 529 +++++++++---- data/drules_proto_outdoors_clear.bin | Bin 425251 -> 426263 bytes data/drules_proto_outdoors_clear.txt | 714 ++++++++++++------ data/drules_proto_outdoors_dark.bin | Bin 423724 -> 424736 bytes data/drules_proto_outdoors_dark.txt | 666 +++++++++++----- data/drules_proto_vehicle_clear.bin | Bin 275945 -> 276105 bytes data/drules_proto_vehicle_clear.txt | 51 +- data/drules_proto_vehicle_dark.bin | Bin 276105 -> 276265 bytes data/drules_proto_vehicle_dark.txt | 39 + data/patterns.txt | 12 + .../clear/include/priorities_3_FG.prio.txt | 8 +- .../include/priorities_4_overlays.prio.txt | 4 +- .../outdoors/include/priorities_3_FG.prio.txt | 8 +- .../include/priorities_4_overlays.prio.txt | 4 +- .../vehicle/include/priorities_3_FG.prio.txt | 2 +- data/types.txt | 2 +- data/visibility.txt | 1 + 24 files changed, 2339 insertions(+), 948 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index dc5a1fb967..349c71f9d1 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -415,6 +415,7 @@ world + elevator - footway + area - + bicycle - bridge - crossing - sidewalk - diff --git a/data/colors.txt b/data/colors.txt index 0eaf151082..2b14268c0f 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -128,6 +128,7 @@ 5286655 5378955 5395026 +5459435 5592405 5666134 5717555 @@ -291,7 +292,6 @@ 16742950 16746278 16746306 -16746413 16747109 16748864 16749632 @@ -314,10 +314,8 @@ 441199131 441925171 442905727 -443432263 451800027 452764770 -452954029 452968274 452984831 609045837 @@ -350,6 +348,8 @@ 860111940 860571203 860629531 +861097451 +861295871 861355571 861690961 861690972 @@ -357,6 +357,7 @@ 862076287 862148400 862348902 +862862663 863203947 863664762 863850275 @@ -419,6 +420,7 @@ 1296977469 1297041991 1297109072 +1297305067 1297438037 1297563187 1297691427 @@ -467,7 +469,6 @@ 1308586790 1308588582 1308591910 -1308592045 1308594496 1308595264 1308601687 @@ -494,6 +495,7 @@ 1715771835 1716276300 1716868437 +1716933887 1717328977 1717523245 1717714303 @@ -512,7 +514,6 @@ 1724368575 1724500155 1724896680 -1728022445 1728053247 1931024665 1943327690 @@ -538,10 +539,12 @@ 2152483916 2152615485 2153076053 +2153141503 2153536593 2153769774 2153921919 2153997148 +2154708295 2154984050 2155510394 2155695907 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 6a7d5ab1bb5526f313336f80a554fdbc868a5582..451a23d004fba99824fcd901fe75dd743ac5fd70 100644 GIT binary patch delta 3143 zcmcgtZ)j6j6yM38_O*>^dXv7qq}nA`)3lA&wzx(|Y1*+NBC=IiMcmr7tV>0y?Ya$h zQW2@h80eRs&SEtYLHlVFSwQx|eRXr~K8+zl#V^7NE;vU8LC?GQz4XPrtd zgbQDT6K~$Kmf7jMXw9&8OBL8K3qHJf(^`bp6X0~2_QugIF)A#&hQSQ1!>L)2Bx9Qt zs^-SuZ&|f!_a57vI2i)Iq3EPa@%%T%i??fEO9TIhh^oW6@*#~gx28uo{}zvIfoA#? zwb(IE&HXzJb(?Z^C6)+Xt*0tJ5OrH9fP^cg)M3f%k!1`ip$eG z>tUaLELl|QO$>gT_%eQE!@$tcs2ckQ`;YV={DgH%W%(wZR%IAowC+OY!6TcWmAc;G z!xa;~D2WAbsLW3OIJ{)^#TsM6|4SB8-;shvUa^MBi!?pxs8?f1w@Q zzW@asnAs1?>TxgYGI_0N4GZD9&!MVVEOX!wJs`Ic{R5LHOr@{aG-!>vs9VL09amyP zX)a#E&r9ULbyNb+w!&JFF(`xV<1`cPO=Cw3tSJ^H{RXay&`h{^r4c@YNo;BW1*7eOhrikkyLIet(Q#$^cnh?FZ4y{L zz8`_Git6xe1ZoAEAw@%COhTFnJiYYJOXvZ;b(HR zLWJ;^R``m-k0N{@g6g`URQUZ~bwqUc0Z zi{ucKR1tT4%s+TxVJJQD4oQK8q2Oo_*8{0T#x@1s#`!)jB|h<1FMLQu5{rx}19ryw zyebRFdV0&To9pZg#Sfh*Xj8YNY9U0W;Vhl{3&ViQJ70vD)FzRrIIkDED;Jl emn~j=m*#amlEw1rsg#9&R{Gh}Qz`qYJ1+oNSy@d0 delta 1460 zcmd5+TSydP6z-c{YqfS=$JM=oE_m5i*D|k*T~>W4Fo>>3ZeeCtSazXYdMN54upr7v zI+_nc&=!P5urN?By+yWS(1VafAwor%MJNPOoquL`o2~7whYtLlZ_aoA|3BxOGc)+k zdFzeyd=&FV=N758OD~pg& z&_xgKA&(Y@4Hnwy#nKG*y{TduT1_&|-8VR?e;$kJ$|K~P^vXEUO5?RyX-(Xsm%_oj zZ8TAfinO$y#=Q8?r=_4WbxwGg<=pt-<*PFDfLF1~-gwYOtHLOzUA-`q)rU-X>NIKl zwU~#Rp29|zVN|&;+2uo~+~m7TsL1KmF@wz-|L4FZcx6)=+A=6sg*K`z=cx!*Bd8%t zqPZm6P?KOs1Pb_Jr}-M}pwj|%)M7g+0>uP+HpNBO)M2NJl#x0FfhfJMN4YTy*+>0; z_^7EKK8|(-P{!_Z0PDr|Zki3it1v1ARX3<9dm3<9TepKY&&!}QI z#|8!J5y;pjSb>graS6JkUmWC~bJ zDekAojSwB{MG>oUy%%TM<%AP%Ti6hE{y*Kcqh}h diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 4d522f0ad2..e62d187752 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -22594,8 +22594,8 @@ cont { element { scale: 11 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22603,8 +22603,8 @@ cont { element { scale: 12 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22612,8 +22612,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22621,8 +22621,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22630,8 +22630,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22647,8 +22647,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -22663,8 +22663,8 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -22679,8 +22679,8 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -22695,8 +22695,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22711,8 +22711,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22730,8 +22730,8 @@ cont { element { scale: 11 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22739,8 +22739,8 @@ cont { element { scale: 12 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22748,8 +22748,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22757,8 +22757,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22766,14 +22766,14 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 3.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22789,14 +22789,14 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -22811,20 +22811,20 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 5.6 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -22839,20 +22839,20 @@ cont { element { scale: 18 lines { - width: 9.0 + width: 8.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -22867,20 +22867,20 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22895,20 +22895,20 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -22926,8 +22926,8 @@ cont { element { scale: 11 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22935,8 +22935,8 @@ cont { element { scale: 12 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22944,8 +22944,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22953,8 +22953,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22962,8 +22962,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -22979,8 +22979,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -22995,18 +22995,18 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } lines { - width: 5.6 + width: 4.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 5.8 color: 1300267136 dashdot { dd: 2.0 @@ -23027,18 +23027,18 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } lines { - width: 8.0 + width: 7.2 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 8.2 color: 1300267136 dashdot { dd: 2.0 @@ -23059,18 +23059,18 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -23091,18 +23091,18 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -23536,6 +23536,237 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 11 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } + lines { + width: 2.0 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } + lines { + width: 2.4 + color: 16316664 + dashdot { + dd: 6.0 + dd: 4.2 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 5.5 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } +} cont { name: "highway-footway-bridge" element { @@ -23553,7 +23784,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23580,7 +23811,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23607,7 +23838,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23634,7 +23865,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23661,7 +23892,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23688,7 +23919,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -23720,7 +23951,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23752,7 +23983,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -23784,7 +24015,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23816,7 +24047,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23902,7 +24133,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } } element { @@ -23914,7 +24145,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } } element { @@ -23926,7 +24157,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } } element { @@ -23938,7 +24169,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -23950,7 +24181,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } } @@ -23965,7 +24196,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23986,7 +24217,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24007,7 +24238,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24028,7 +24259,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24049,7 +24280,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -24070,7 +24301,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -24090,7 +24321,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.8 @@ -24126,7 +24357,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } lines { width: 7.4 @@ -24162,7 +24393,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -24198,7 +24429,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -27060,7 +27291,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27073,7 +27304,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27086,7 +27317,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27099,7 +27330,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27112,7 +27343,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27133,7 +27364,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27153,7 +27384,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27173,7 +27404,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27193,7 +27424,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27213,7 +27444,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27229,12 +27460,18 @@ cont { name: "highway-path-bicycle" element { scale: 11 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27242,12 +27479,18 @@ cont { } element { scale: 12 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27255,12 +27498,18 @@ cont { } element { scale: 13 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27268,12 +27517,18 @@ cont { } element { scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27281,12 +27536,18 @@ cont { } element { scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 1.1 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -27302,12 +27563,17 @@ cont { } element { scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } lines { width: 1.5 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -27322,12 +27588,17 @@ cont { } element { scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } lines { width: 2.0 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -27342,12 +27613,17 @@ cont { } element { scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } lines { width: 2.8 color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.7 } priority: 180 } @@ -27362,12 +27638,17 @@ cont { } element { scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -27382,12 +27663,17 @@ cont { } element { scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -27412,7 +27698,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27425,7 +27711,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27438,7 +27724,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27451,7 +27737,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27470,7 +27756,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27497,7 +27783,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27529,7 +27815,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27561,7 +27847,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27593,7 +27879,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27625,7 +27911,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27648,7 +27934,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27661,7 +27947,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27674,7 +27960,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27687,7 +27973,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27700,7 +27986,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27721,7 +28007,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27741,7 +28027,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27761,7 +28047,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27781,7 +28067,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27801,7 +28087,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27824,7 +28110,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27837,7 +28123,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27850,7 +28136,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27863,7 +28149,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -27876,7 +28162,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27897,7 +28183,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27917,7 +28203,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27937,7 +28223,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27957,7 +28243,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27977,7 +28263,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28000,7 +28286,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28013,7 +28299,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28026,7 +28312,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28039,7 +28325,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28052,7 +28338,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28073,7 +28359,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28093,7 +28379,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28113,7 +28399,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28133,7 +28419,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28153,7 +28439,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28176,7 +28462,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28189,7 +28475,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28202,7 +28488,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28215,7 +28501,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28228,7 +28514,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28249,7 +28535,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28269,7 +28555,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28289,7 +28575,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28309,7 +28595,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28329,7 +28615,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28352,7 +28638,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28365,7 +28651,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28378,7 +28664,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28391,7 +28677,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28404,7 +28690,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28425,7 +28711,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28445,7 +28731,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28465,7 +28751,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28485,7 +28771,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28505,7 +28791,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28528,7 +28814,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28541,7 +28827,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28554,7 +28840,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28567,7 +28853,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28580,7 +28866,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28601,7 +28887,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28621,7 +28907,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28641,7 +28927,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28661,7 +28947,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28681,7 +28967,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28704,7 +28990,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28717,7 +29003,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28730,7 +29016,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28743,7 +29029,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -28756,7 +29042,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28777,7 +29063,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28797,7 +29083,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.0 @@ -28833,7 +29119,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 6.6 @@ -28869,7 +29155,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -28905,7 +29191,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -53967,7 +54253,7 @@ cont { lines { width: 1.5 color: 1305595303 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -53976,7 +54262,7 @@ cont { lines { width: 1.8 color: 1305595303 - priority: 180 + priority: 160 } caption { primary { @@ -53992,7 +54278,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54009,7 +54295,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54026,7 +54312,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54043,7 +54329,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index c405a640b0d034a7c35138dfebe048815c6d9836..5172840a03728d16b7949862b74de18b5c36e451 100644 GIT binary patch delta 2456 zcmcgtUu;ul6!&*;+ufEq?r!g0Z@aBrx>m*dy|%{^d7Ncuongy@5a1dV8n#F+3(7z>8XDB!u@z3tkqpvJ~8xjCob z`F+3hoqK-gc6QeM^}d-tiwb@HH<#^ovrT>Q=}(6g>yq>=G*hY4bpP>>?KM*rX;v0< zWTjYl<|1@53!Prq;jeP|eiN}XKDuYXqz`rYs&!}sU>U@lQ{V6}n7^Z%}*j)IC7(de*jD!Dh|RCU$BVpLMgVcGO@#HlGtS0+(I zdq!m+J$F>DQZ@g=`XT|1UzW2^pRY!o)}Dc)6cy_GAfyc_K^i?Fhiy8Y)*O} zf5py`k$tv(WB2y`+uz!ub(ETv32^C+bMrGhb7R^Q(E{pYVyQ`IviwQwtc@HfP+)$h zTn;|qL$_<+}0qqIu*@9ZSnt+ed7hXWk8bVv{FIh2nM>FZXa8*!51jWKp<%Gv-5#vEPSqszTGz%w|G4yQ%>M9(vTJ!)zwQ;Q3jCRL;LX=VxEC&<0NiS`!_q zL!*=dO<7pZ&|j9K$;W}^if&&p!CR|hc#(}rbtHyn_Rq)oe1`7DaDdIb4LD#^1j6X0 z&N!aT{m6b9$5x9G^*va@hAGa?$xhW>8 zU814f4O>ENO!~eHo7fjkS-Sz7bN)o$H|VRES!9jfNOJJM_n2;N6lu!9#22$KUk0XA zy<)h^z%<-1)L#as)>qJ7p6aB5hgJ9WfSAeai|{J-q|i{wABCX%v5bg+BKjzW*Z3MU zDI9dnrtyn|$X*zk4EC$jQZt*8_oNVQ=KY+1DDT&dpH55s O$ozP+r_Qgl z7`=RyhCL-1h0(%7;fqK@SV%7-5*qXtln{kMEqyb)UN(K{r4MHQGw00w|99p)3vqR6 zN$rkelN3lZYO&Jsv_JmUqP;Qgg{TU4QL^ne>RXCZB4n|0)~Fw=3VjShqBaRO`-A&> z{Y+}~TZT&g64LE&r}X-@R*;GWQ50>77SgKp7G^+Y!;r}#!zyO8nAi`0i^~V43KcTE z`~S^R^%_TZ8l8lkvCi1Ej4U|lt`n-&_)WU4?ewYB?4;4lNT*Pz*-mu|GFD|5M5^sF z=g@RHztA@Xr;y^%a$6CP)3Y(`q=!xjLW+@eT@)l59Yg5`GF?>Q{V$W-p(4F3b#fdL zF*_LnXO&}aCdRQT=hPG?Nf)(^!$aB@WO~>~WP=$e_DBp$qi`l9DLviM-qn8oOzcJg&q1Le z{JhIxkT+%zIW#YDdg4Ls)7w|*aBaefLN9g1O)FGT$7oJR_jKew$S7Wi`oxJea|De^ z$gD^c$554g?rVTQ2^*SLSXVO+CE3p>;3vItdeLII{Lq5y++SOS diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 8f8a5c1866..4355590aa5 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -21357,8 +21357,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21366,8 +21366,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21375,8 +21375,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21392,8 +21392,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -21408,8 +21408,8 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -21424,8 +21424,8 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -21440,8 +21440,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21456,8 +21456,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21475,8 +21475,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21484,8 +21484,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21493,14 +21493,14 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 3.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21516,14 +21516,14 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -21538,20 +21538,20 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 5.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 5.6 + width: 4.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } path_text { @@ -21566,20 +21566,20 @@ cont { element { scale: 18 lines { - width: 9.0 + width: 8.2 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 7.2 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } path_text { @@ -21594,20 +21594,20 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21622,20 +21622,20 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 9.6 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } path_text { @@ -21653,8 +21653,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1308592045 + width: 0.9 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21662,8 +21662,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1308592045 + width: 1.1 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21671,8 +21671,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1308592045 + width: 1.2 + color: 2153141503 priority: 330 cap: BUTTCAP } @@ -21688,8 +21688,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1308592045 + width: 1.3 + color: 1716933887 priority: 330 } path_text { @@ -21704,18 +21704,18 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1308592045 + width: 1.4 + color: 1716933887 priority: 330 } lines { - width: 5.6 + width: 4.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 5.8 color: 1300267136 dashdot { dd: 2.0 @@ -21736,18 +21736,18 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 452954029 + width: 1.6 + color: 861295871 priority: 330 } lines { - width: 8.0 + width: 7.2 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 8.2 color: 1300267136 dashdot { dd: 2.0 @@ -21768,18 +21768,18 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -21800,18 +21800,18 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 452954029 + width: 1.8 + color: 861295871 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1300267136 dashdot { dd: 2.0 @@ -22140,6 +22140,180 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } + lines { + width: 2.0 + color: 670628088 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } + lines { + width: 2.4 + color: 16316664 + dashdot { + dd: 6.0 + dd: 4.2 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } + lines { + width: 3.2 + color: 16316664 + dashdot { + dd: 8.0 + dd: 5.5 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } + lines { + width: 4.2 + color: 16316664 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } +} cont { name: "highway-footway-bridge" element { @@ -22157,7 +22331,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22184,7 +22358,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22216,7 +22390,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22248,7 +22422,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22280,7 +22454,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22312,7 +22486,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22398,7 +22572,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } } element { @@ -22410,7 +22584,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } } element { @@ -22422,7 +22596,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } } element { @@ -22434,7 +22608,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -22446,7 +22620,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } } @@ -22461,7 +22635,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22482,7 +22656,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22502,7 +22676,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.8 @@ -22538,7 +22712,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } lines { width: 7.4 @@ -22574,7 +22748,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -22610,7 +22784,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -25433,7 +25607,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25446,7 +25620,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25467,7 +25641,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25487,7 +25661,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25507,7 +25681,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25527,7 +25701,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25547,7 +25721,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25563,12 +25737,18 @@ cont { name: "highway-path-bicycle" element { scale: 14 + lines { + width: 1.1 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25576,12 +25756,18 @@ cont { } element { scale: 15 + lines { + width: 1.2 + color: 2153141503 + priority: 170 + cap: BUTTCAP + } lines { width: 1.1 color: 1721782290 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25597,12 +25783,17 @@ cont { } element { scale: 16 + lines { + width: 1.3 + color: 1716933887 + priority: 170 + } lines { width: 1.5 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25617,12 +25808,17 @@ cont { } element { scale: 17 + lines { + width: 1.4 + color: 1716933887 + priority: 170 + } lines { width: 2.0 color: 1721782290 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25637,12 +25833,17 @@ cont { } element { scale: 18 + lines { + width: 1.6 + color: 861295871 + priority: 170 + } lines { width: 2.8 color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.7 } priority: 180 } @@ -25657,12 +25858,17 @@ cont { } element { scale: 19 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25677,12 +25883,17 @@ cont { } element { scale: 20 + lines { + width: 1.8 + color: 861295871 + priority: 170 + } lines { width: 3.7 color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25707,7 +25918,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25726,7 +25937,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25753,7 +25964,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25785,7 +25996,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25817,7 +26028,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25849,7 +26060,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25881,7 +26092,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25904,7 +26115,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25917,7 +26128,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25938,7 +26149,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25958,7 +26169,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25978,7 +26189,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25998,7 +26209,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26018,7 +26229,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26041,7 +26252,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26054,7 +26265,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26075,7 +26286,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26095,7 +26306,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26115,7 +26326,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26135,7 +26346,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26155,7 +26366,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26178,7 +26389,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26191,7 +26402,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26212,7 +26423,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26232,7 +26443,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26252,7 +26463,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26272,7 +26483,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26292,7 +26503,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26315,7 +26526,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26328,7 +26539,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26349,7 +26560,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26369,7 +26580,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26389,7 +26600,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26409,7 +26620,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26429,7 +26640,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26452,7 +26663,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26465,7 +26676,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26486,7 +26697,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26506,7 +26717,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26526,7 +26737,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26546,7 +26757,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26566,7 +26777,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26589,7 +26800,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26602,7 +26813,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26623,7 +26834,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26643,7 +26854,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26663,7 +26874,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26683,7 +26894,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26703,7 +26914,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26726,7 +26937,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26739,7 +26950,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26760,7 +26971,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26780,7 +26991,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.0 @@ -26816,7 +27027,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 6.6 @@ -26852,7 +27063,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -26888,7 +27099,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -51342,7 +51553,7 @@ cont { lines { width: 1.5 color: 1305595303 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -51351,7 +51562,7 @@ cont { lines { width: 1.8 color: 1305595303 - priority: 180 + priority: 160 } caption { primary { @@ -51367,7 +51578,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -51384,7 +51595,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -51401,7 +51612,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -51418,7 +51629,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index e192979ec85f1692f982f2feec5117a682350df9..600cc27347f84c03847b77582827d6b0e21d8024 100644 GIT binary patch delta 2512 zcmcImU1%It6wbG^o6IEXW-|LTv)Sxq(lkj^Qj9+jf3p>5(pSH))MLmSD?q8%hB1;)pn`!PPBxv@SQcHC+ ziVG|c(^@mG8k{J(;?P_hV)Vh+f>x%rBzQU>M+gzRcvA70|JtvF>1GV!fR`T^qS4Yx zB`%LH2h^G9{J*NXV8ZSz4U?5(L_8%#()#IdFZ>X69%Auydrp%U8}J|{EognEG0Uy8 zVy&fH{eb#$c>Yv^YSp-0MfQG9%RDTh>NhkJa1L+dNm)&1ivv*2{BFZ9u;C(hjtwixw#jTm}brbSCTOD=M} zNR)nWIUWaZu=%^!uQSQzK!GHh7F;!rbTx(K<72A6(j~rfnZxMPB&;UADnXjAs)#-L zrfFo$9IX>$Y-db`M8F4&>@ zc>Om)$~+A-v8p&}VFameslw2|sgST4sX7nrs?AEw$BoK@qvb)^sxNO>Se7|fSyi-c z6sa<3CGmhxFw|3qK^I0@Lu0FG=+MLp((;j&HB^E;RL@VlH3&EBQ-gR)*1)2V2hr~r zLK`Yb>1An)LVT$41ATi4BMcOd;jIEF>=#`@E^kGe7yo;4>C~{0a21&NV$W3PPFpf8 zkg7x%-XStyh3IbV#Bg=)^#1s2(H+<&8gsS*Q}o$pe%^AFn82$%(aN;rcy|~&K zeR9!#>wAjcY5rFy_sKl}dM?uWxxfZ2(#^R*FHh4)193|6AKxAl_Hp*}r|=idPah4@ F(%)z=TpIuY delta 1185 zcmcIiT}V@581^}5jx((_x4E6|Vx76UQYLCf22uV5UWBvdUrr5KQYv&2C4`hrNfWx! zZhTQB@;;)A!J->2qM(!@AtETc&8P%HT6EF-?VQO*-E`3lhxa+p^M2p^J>UC%+E#yj zRVR{Iax@oYVynUS;^(6;Chetk6n0gy+MSlVOl;>VVPzjH7c;SADD=?*&APZCBAw;- zIN`IduZj4T!+Gr-7QJUdqv*K-nsdTycQCK-fgIjv?3>HEX~T&?^}ijwnZgP@^lery zF3dQkwo-(Awnp3HyN3(1HV^ilJwdJuRqj?wC_XBCXf`67>HSsNN_%h0ijwO~RN3j3 zsIo<1rp;xzlw5qqr+9_M+V0RFI}LCc2w#$^Q~y&jhb6=k`gWK<8CYa;L|(l zt%4I&9f4Q>Jr_Zbu;8Qz7Fg&_1gGgr5nNQ?#_xuan|j(|r`ag0D{ZLP8_;+Zod#sR z-GH^7Xfj~B3ylU`J&RKYyc0tc2^$paMFk~_(MKP8`96|_K8$lp?52*HXg^ZXekpvA x`SB^q!)bY1Dy92VQYqu7Q&O0dc1v=TnfWZP+r_S#foX|9nLkr%V7hQJ`5WmqikSca diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 194869f280..e864e69816 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -21357,8 +21357,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1299070279 + width: 0.9 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21366,8 +21366,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1299070279 + width: 1.1 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21375,8 +21375,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1299070279 + width: 1.2 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21392,8 +21392,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1299070279 + width: 1.3 + color: 1718500679 priority: 330 } path_text { @@ -21408,8 +21408,8 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1299070279 + width: 1.4 + color: 1718500679 priority: 330 } path_text { @@ -21424,8 +21424,8 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 443432263 + width: 1.6 + color: 862862663 priority: 330 } path_text { @@ -21440,8 +21440,8 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21456,8 +21456,8 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21475,8 +21475,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1299070279 + width: 0.9 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21484,8 +21484,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1299070279 + width: 1.1 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21493,14 +21493,14 @@ cont { element { scale: 15 lines { - width: 3.8 + width: 3.4 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.4 - color: 1299070279 + width: 1.2 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21516,14 +21516,14 @@ cont { element { scale: 16 lines { - width: 4.2 + width: 3.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 1299070279 + width: 1.3 + color: 1718500679 priority: 330 } path_text { @@ -21538,20 +21538,20 @@ cont { element { scale: 17 lines { - width: 6.6 + width: 5.8 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 5.6 + width: 4.8 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.8 - color: 1299070279 + width: 1.4 + color: 1718500679 priority: 330 } path_text { @@ -21566,20 +21566,20 @@ cont { element { scale: 18 lines { - width: 9.0 + width: 8.2 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.0 + width: 7.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 - color: 443432263 + width: 1.6 + color: 862862663 priority: 330 } path_text { @@ -21594,20 +21594,20 @@ cont { element { scale: 19 lines { - width: 10.4 + width: 9.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21622,20 +21622,20 @@ cont { element { scale: 20 lines { - width: 10.4 + width: 9.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.4 + width: 8.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } path_text { @@ -21653,8 +21653,8 @@ cont { element { scale: 13 lines { - width: 1.0 - color: 1299070279 + width: 0.9 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21662,8 +21662,8 @@ cont { element { scale: 14 lines { - width: 1.2 - color: 1299070279 + width: 1.1 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21671,8 +21671,8 @@ cont { element { scale: 15 lines { - width: 1.4 - color: 1299070279 + width: 1.2 + color: 2154708295 priority: 330 cap: BUTTCAP } @@ -21688,8 +21688,8 @@ cont { element { scale: 16 lines { - width: 1.6 - color: 1299070279 + width: 1.3 + color: 1718500679 priority: 330 } path_text { @@ -21704,18 +21704,18 @@ cont { element { scale: 17 lines { - width: 1.8 - color: 1299070279 + width: 1.4 + color: 1718500679 priority: 330 } lines { - width: 5.6 + width: 4.8 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 6.6 + width: 5.8 color: 1297109072 dashdot { dd: 2.0 @@ -21736,18 +21736,18 @@ cont { element { scale: 18 lines { - width: 2.0 - color: 443432263 + width: 1.6 + color: 862862663 priority: 330 } lines { - width: 8.0 + width: 7.2 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 9.0 + width: 8.2 color: 1297109072 dashdot { dd: 2.0 @@ -21768,18 +21768,18 @@ cont { element { scale: 19 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1297109072 dashdot { dd: 2.0 @@ -21800,18 +21800,18 @@ cont { element { scale: 20 lines { - width: 2.2 - color: 443432263 + width: 1.8 + color: 862862663 priority: 330 } lines { - width: 9.4 + width: 8.6 color: 1294740506 priority: 50 cap: BUTTCAP } lines { - width: 10.4 + width: 9.6 color: 1297109072 dashdot { dd: 2.0 @@ -22140,6 +22140,180 @@ cont { } } } +cont { + name: "highway-footway-bicycle" + element { + scale: 14 + lines { + width: 1.1 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1296778819 + dashdot { + dd: 4.0 + dd: 3.2 + } + priority: 180 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 659244611 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 8 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.3 + color: 1718500679 + priority: 170 + } + lines { + width: 2.0 + color: 659244611 + dashdot { + dd: 5.0 + dd: 3.5 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 1718500679 + priority: 170 + } + lines { + width: 2.4 + color: 4933187 + dashdot { + dd: 6.0 + dd: 4.2 + } + priority: 180 + } + path_text { + primary { + height: 9 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 1.6 + color: 862862663 + priority: 170 + } + lines { + width: 3.2 + color: 4933187 + dashdot { + dd: 8.0 + dd: 5.5 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } + lines { + width: 4.2 + color: 4933187 + dashdot { + dd: 10.0 + dd: 6.7 + } + priority: 180 + } + path_text { + primary { + height: 10 + color: 7829367 + stroke_color: 856032768 + } + priority: 2950 + } + } +} cont { name: "highway-footway-bridge" element { @@ -22157,7 +22331,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22184,7 +22358,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22216,7 +22390,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22248,7 +22422,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22280,7 +22454,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22312,7 +22486,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -22398,7 +22572,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } } element { @@ -22410,7 +22584,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } } element { @@ -22422,7 +22596,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } } element { @@ -22434,7 +22608,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -22446,7 +22620,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } } } @@ -22461,7 +22635,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -22482,7 +22656,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 180 + priority: 155 } path_text { primary { @@ -22502,7 +22676,7 @@ cont { dd: 6.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.8 @@ -22538,7 +22712,7 @@ cont { dd: 8.0 dd: 3.0 } - priority: 180 + priority: 155 } lines { width: 7.4 @@ -22574,7 +22748,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -22610,7 +22784,7 @@ cont { dd: 10.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 9.4 @@ -25499,7 +25673,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25512,7 +25686,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25533,7 +25707,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25553,7 +25727,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25573,7 +25747,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25593,7 +25767,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25613,7 +25787,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25629,12 +25803,18 @@ cont { name: "highway-path-bicycle" element { scale: 14 + lines { + width: 1.1 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } lines { width: 0.9 color: 1720994322 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25642,12 +25822,18 @@ cont { } element { scale: 15 + lines { + width: 1.2 + color: 2154708295 + priority: 170 + cap: BUTTCAP + } lines { width: 1.1 color: 1720994322 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.7 } priority: 180 cap: BUTTCAP @@ -25663,12 +25849,17 @@ cont { } element { scale: 16 + lines { + width: 1.3 + color: 1718500679 + priority: 170 + } lines { width: 1.5 color: 1720994322 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25683,12 +25874,17 @@ cont { } element { scale: 17 + lines { + width: 1.4 + color: 1718500679 + priority: 170 + } lines { width: 2.0 color: 1720994322 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.2 } priority: 180 } @@ -25703,12 +25899,17 @@ cont { } element { scale: 18 + lines { + width: 1.6 + color: 862862663 + priority: 170 + } lines { width: 2.8 color: 865356306 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.7 } priority: 180 } @@ -25723,12 +25924,17 @@ cont { } element { scale: 19 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } lines { width: 3.7 color: 865356306 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25743,12 +25949,17 @@ cont { } element { scale: 20 + lines { + width: 1.8 + color: 862862663 + priority: 170 + } lines { width: 3.7 color: 865356306 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.2 } priority: 180 } @@ -25773,7 +25984,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25792,7 +26003,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -25819,7 +26030,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25851,7 +26062,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25883,7 +26094,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25915,7 +26126,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25947,7 +26158,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -25970,7 +26181,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -25983,7 +26194,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26004,7 +26215,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26024,7 +26235,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26044,7 +26255,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26064,7 +26275,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26084,7 +26295,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26107,7 +26318,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26120,7 +26331,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26141,7 +26352,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26161,7 +26372,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26181,7 +26392,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26201,7 +26412,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26221,7 +26432,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26244,7 +26455,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26257,7 +26468,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26278,7 +26489,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26298,7 +26509,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26318,7 +26529,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26338,7 +26549,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26358,7 +26569,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26381,7 +26592,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26394,7 +26605,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26415,7 +26626,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26435,7 +26646,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26455,7 +26666,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26475,7 +26686,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26495,7 +26706,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26518,7 +26729,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26531,7 +26742,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26552,7 +26763,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26572,7 +26783,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26592,7 +26803,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26612,7 +26823,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26632,7 +26843,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26655,7 +26866,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26668,7 +26879,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26689,7 +26900,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26709,7 +26920,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26729,7 +26940,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26749,7 +26960,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26769,7 +26980,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26792,7 +27003,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } } @@ -26805,7 +27016,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26826,7 +27037,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26846,7 +27057,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 } lines { width: 5.0 @@ -26882,7 +27093,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } lines { width: 6.6 @@ -26918,7 +27129,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -26954,7 +27165,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 8.4 @@ -51606,7 +51817,7 @@ cont { lines { width: 1.5 color: 1294016795 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -51615,7 +51826,7 @@ cont { lines { width: 1.8 color: 1294016795 - priority: 180 + priority: 160 } caption { primary { @@ -51631,7 +51842,7 @@ cont { lines { width: 3.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -51648,7 +51859,7 @@ cont { lines { width: 3.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -51665,7 +51876,7 @@ cont { lines { width: 4.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { @@ -51682,7 +51893,7 @@ cont { lines { width: 4.0 color: 857809179 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index dbc8651c662783b4f8df1dc957129db87bc663e5..64366b1e55d130488c07664f09ba737633ae0100 100644 GIT binary patch delta 3208 zcmcImTWl0%6z-W_wzF-w%+B7XyR@CUu+r_lMkOX?wxW>m0Bz|7G*)W0EyjizNemCA zVvNLu2l3?~o3>ksf{lqF#MK9)ebI!=LwP`>sM+u)2CVS`FQ8}sx$NxjlorWOvNi4FW}(WlqCZSmpu8gP3aVb9;X zeNhIJzubxnnP%p-z?hwhLWjJyjK3fOgtpS&QgpuH_1qlvgycX(;+`K@|cT)3y zy%zz!Gmb#1bp~pP!VBg+z4-3|2$WjJ5ia+d1=b)WAb=Aap%QNGmaTSvkXY@`}tiiJr5JcfPxFD*XX7Pr>kEbV~%GS>&cM3nREBfUA4{YSoLf8<8?MW9>V{bFHrY;9W*pfnLZSpW zT?H?mzXG1e-wug=d?mdFGhF4fQA3;apNf!Q13RyRtgz&Q?O`Nqmn9D5B};l6A|4q5 z=}{`uO%yX0ht4f3BF6MfISWhRLJaDj=(d3r%Nt=&SwWtxA1&d0D^vx$Z16P)m}!QG zzziu^U39g)kV3TNgh&{T!&8vNyKAADL{~qt|Km7RkxuV1p^5=At!aQxLw`-vJKJa( zTx@_|vNQd$#;iVT(JPu%dwQq|wgbhUX@)q7Yb0Dr5bJrLdgXOo5>RP|dU8G20#B1z z=1K#t&_Ge_dPg;#t|8&IR)~>35`b>(ZDTR>C{1 zSh(n++^%lmmHQ;nd#Qs{RsyNu_i6NbE4U*1*j11fmb^TD@{)7t6KP+bJNfxI-?Jj_ zXhFo$Ft0-0tr9V^rcUGAe>^;Afs=w%73<-byBSI9m8xv6|4N&ml*Af zRet>#Y`rIt9^};y+;3%qVi14#)6&z|8STP0OQf{-X^ClN-g!c_?o)Iz#%?t9}KHHg3qmwUeNoOACv-#v6gy8k;c zUc|K;JfQ0}kPe+KtuJZEqp4Nd9C{xA!eh}%;dh(uw0YWUVer zzcd7BbOB~WHjQxqJ))%KEIkizwUYlaJARt4g*nD`Qng`I%Vg)2RQe1y$w~GX4P`z1 zULiqKbugvG^@GE+`Nz~%W^*z^TDDDnR~1{I8QCnep`2+-Z5Y^p%$A4t;I)Yc_u*hJ zf@d_)f)4r|L4f8It9=RXTnqzrsvbTXi6O(S4`r)6&N;6<7smmhNXrQ{3Pn&jfhdFN zBpS^{h*7JX@>d|`qOemgiSDNnHqa!tVlRv87)2lLXoZQUTTxHbUi5QVy}trZYEU+` zVJXCFw#dU7v4&!Ari6X$q&YPGW$(5dt8x`-n> zcyDAaI0^EMYKmP|bjncmWkk6(san|y+Zbfqn9v<#+VFcLI2?yZJ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index a5bd3005b8..1b7ac43ba1 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -22148,8 +22148,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1728022445 + width: 0.9 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22158,8 +22158,8 @@ cont { element { scale: 12 lines { - width: 0.8 - color: 1308592045 + width: 1.0 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22169,7 +22169,7 @@ cont { scale: 13 lines { width: 1.1 - color: 16746413 + color: 861097451 priority: 330 cap: BUTTCAP } @@ -22185,8 +22185,8 @@ cont { element { scale: 14 lines { - width: 1.4 - color: 16746413 + width: 1.3 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22202,8 +22202,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 16746413 + width: 1.5 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22219,8 +22219,8 @@ cont { element { scale: 16 lines { - width: 1.9 - color: 16746413 + width: 1.7 + color: 5459435 priority: 330 } path_text { @@ -22235,8 +22235,8 @@ cont { element { scale: 17 lines { - width: 2.3 - color: 16746413 + width: 2.0 + color: 5459435 priority: 330 } path_text { @@ -22251,8 +22251,8 @@ cont { element { scale: 18 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22267,8 +22267,8 @@ cont { element { scale: 19 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22283,8 +22283,8 @@ cont { element { scale: 20 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22302,8 +22302,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1728022445 + width: 0.9 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22312,8 +22312,8 @@ cont { element { scale: 12 lines { - width: 0.8 - color: 1308592045 + width: 1.0 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22323,7 +22323,7 @@ cont { scale: 13 lines { width: 1.1 - color: 16746413 + color: 861097451 priority: 330 cap: BUTTCAP } @@ -22339,8 +22339,8 @@ cont { element { scale: 14 lines { - width: 1.4 - color: 16746413 + width: 1.3 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22356,14 +22356,14 @@ cont { element { scale: 15 lines { - width: 4.2 + width: 4.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.6 - color: 16746413 + width: 1.5 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22379,14 +22379,14 @@ cont { element { scale: 16 lines { - width: 4.8 + width: 4.4 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 1.9 - color: 16746413 + width: 1.7 + color: 5459435 priority: 330 } path_text { @@ -22401,20 +22401,20 @@ cont { element { scale: 17 lines { - width: 7.6 + width: 7.0 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 6.6 + width: 6.0 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.3 - color: 16746413 + width: 2.0 + color: 5459435 priority: 330 } path_text { @@ -22429,20 +22429,20 @@ cont { element { scale: 18 lines { - width: 10.6 + width: 9.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 9.6 + width: 8.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22457,20 +22457,20 @@ cont { element { scale: 19 lines { - width: 11.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22485,20 +22485,20 @@ cont { element { scale: 20 lines { - width: 11.6 + width: 10.8 color: 1300267136 priority: 140 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 871230427 priority: 150 cap: BUTTCAP } lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } path_text { @@ -22516,8 +22516,8 @@ cont { element { scale: 11 lines { - width: 0.7 - color: 1728022445 + width: 0.9 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22526,8 +22526,8 @@ cont { element { scale: 12 lines { - width: 0.8 - color: 1308592045 + width: 1.0 + color: 1297305067 priority: 330 join: BEVELJOIN cap: BUTTCAP @@ -22537,7 +22537,7 @@ cont { scale: 13 lines { width: 1.1 - color: 16746413 + color: 861097451 priority: 330 cap: BUTTCAP } @@ -22553,8 +22553,8 @@ cont { element { scale: 14 lines { - width: 1.4 - color: 16746413 + width: 1.3 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22570,8 +22570,8 @@ cont { element { scale: 15 lines { - width: 1.6 - color: 16746413 + width: 1.5 + color: 5459435 priority: 330 cap: BUTTCAP } @@ -22587,8 +22587,8 @@ cont { element { scale: 16 lines { - width: 1.9 - color: 16746413 + width: 1.7 + color: 5459435 priority: 330 } path_text { @@ -22603,18 +22603,18 @@ cont { element { scale: 17 lines { - width: 2.3 - color: 16746413 + width: 2.0 + color: 5459435 priority: 330 } lines { - width: 6.6 + width: 6.0 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 7.6 + width: 7.0 color: 1300267136 dashdot { dd: 2.0 @@ -22635,18 +22635,18 @@ cont { element { scale: 18 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } lines { - width: 9.6 + width: 8.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 10.6 + width: 9.8 color: 1300267136 dashdot { dd: 2.0 @@ -22667,18 +22667,18 @@ cont { element { scale: 19 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } lines { - width: 10.6 + width: 9.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 11.6 + width: 10.8 color: 1300267136 dashdot { dd: 2.0 @@ -22699,18 +22699,18 @@ cont { element { scale: 20 lines { - width: 2.8 - color: 16746413 + width: 2.4 + color: 5459435 priority: 330 } lines { - width: 10.6 + width: 9.8 color: 1307438043 priority: 50 cap: BUTTCAP } lines { - width: 11.6 + width: 10.8 color: 1300267136 dashdot { dd: 2.0 @@ -23177,7 +23177,7 @@ cont { } } cont { - name: "highway-footway-bridge" + name: "highway-footway-bicycle" element { scale: 11 lines { @@ -23192,6 +23192,250 @@ cont { cap: BUTTCAP } } + element { + scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 170 + join: BEVELJOIN + cap: BUTTCAP + } + lines { + width: 1.1 + color: 1308162296 + dashdot { + dd: 3.5 + dd: 2.5 + } + priority: 180 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 871954680 + dashdot { + dd: 4.0 + dd: 3.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 14 + lines { + width: 1.3 + color: 5459435 + priority: 170 + cap: BUTTCAP + } + lines { + width: 1.6 + color: 871954680 + dashdot { + dd: 4.0 + dd: 3.0 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 15 + lines { + width: 1.5 + color: 5459435 + priority: 170 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 871954680 + dashdot { + dd: 6.0 + dd: 4.5 + } + priority: 180 + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 4473924 + stroke_color: 871230427 + } + priority: 2950 + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 5459435 + priority: 170 + } + lines { + width: 2.6 + color: 871954680 + dashdot { + dd: 6.0 + dd: 4.5 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 5459435 + priority: 170 + } + lines { + width: 3.3 + color: 871954680 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 18 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } + lines { + width: 4.0 + color: 16316664 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 19 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } + lines { + width: 4.0 + color: 16316664 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } + element { + scale: 20 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } + lines { + width: 4.0 + color: 16316664 + dashdot { + dd: 8.0 + dd: 6.0 + } + priority: 180 + } + path_text { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + } + priority: 2950 + } + } +} +cont { + name: "highway-footway-bridge" + element { + scale: 11 + lines { + width: 1.0 + color: 16316664 + dashdot { + dd: 3.5 + dd: 2.0 + } + priority: 155 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 12 lines { @@ -23201,7 +23445,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23215,7 +23459,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23236,7 +23480,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23263,7 +23507,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23290,7 +23534,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23322,7 +23566,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23354,7 +23598,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23386,7 +23630,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23418,7 +23662,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23504,7 +23748,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } } element { @@ -23516,7 +23760,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23528,7 +23772,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23540,7 +23784,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } element { @@ -23552,7 +23796,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } } } @@ -23567,7 +23811,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23581,7 +23825,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -23595,7 +23839,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23616,7 +23860,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23637,7 +23881,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -23658,7 +23902,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -23678,7 +23922,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 7.6 @@ -23714,7 +23958,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -23750,7 +23994,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -23786,7 +24030,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -26674,7 +26918,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -26688,7 +26932,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -26702,7 +26946,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26723,7 +26967,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26744,7 +26988,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -26765,7 +27009,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26785,7 +27029,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26805,7 +27049,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26825,7 +27069,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26845,7 +27089,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -26875,12 +27119,19 @@ cont { } element { scale: 12 + lines { + width: 1.0 + color: 1297305067 + priority: 170 + join: BEVELJOIN + cap: BUTTCAP + } lines { width: 1.1 color: 1302351890 dashdot { dd: 3.5 - dd: 2.0 + dd: 2.5 } priority: 180 join: BEVELJOIN @@ -26889,12 +27140,18 @@ cont { } element { scale: 13 + lines { + width: 1.1 + color: 861097451 + priority: 170 + cap: BUTTCAP + } lines { width: 1.3 - color: 10506258 + color: 866144274 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.0 } priority: 180 cap: BUTTCAP @@ -26910,12 +27167,18 @@ cont { } element { scale: 14 + lines { + width: 1.3 + color: 5459435 + priority: 170 + cap: BUTTCAP + } lines { width: 1.6 - color: 10506258 + color: 866144274 dashdot { dd: 4.0 - dd: 2.5 + dd: 3.0 } priority: 180 cap: BUTTCAP @@ -26931,12 +27194,18 @@ cont { } element { scale: 15 + lines { + width: 1.5 + color: 5459435 + priority: 170 + cap: BUTTCAP + } lines { width: 2.0 - color: 10506258 + color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.5 } priority: 180 cap: BUTTCAP @@ -26952,12 +27221,17 @@ cont { } element { scale: 16 + lines { + width: 1.7 + color: 5459435 + priority: 170 + } lines { width: 2.6 - color: 10506258 + color: 866144274 dashdot { dd: 6.0 - dd: 3.5 + dd: 4.5 } priority: 180 } @@ -26972,12 +27246,17 @@ cont { } element { scale: 17 + lines { + width: 2.0 + color: 5459435 + priority: 170 + } lines { width: 3.3 - color: 10506258 + color: 866144274 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -26992,12 +27271,17 @@ cont { } element { scale: 18 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } lines { width: 4.0 color: 10506258 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27012,12 +27296,17 @@ cont { } element { scale: 19 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } lines { width: 4.0 color: 10506258 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27032,12 +27321,17 @@ cont { } element { scale: 20 + lines { + width: 2.4 + color: 5459435 + priority: 170 + } lines { width: 4.0 color: 10506258 dashdot { dd: 8.0 - dd: 4.5 + dd: 6.0 } priority: 180 } @@ -27062,7 +27356,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27076,7 +27370,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27090,7 +27384,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27111,7 +27405,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27138,7 +27432,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27165,7 +27459,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27197,7 +27491,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27229,7 +27523,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27261,7 +27555,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27293,7 +27587,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27316,7 +27610,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27330,7 +27624,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27344,7 +27638,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27365,7 +27659,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27386,7 +27680,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27407,7 +27701,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27427,7 +27721,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27447,7 +27741,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27467,7 +27761,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27487,7 +27781,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27510,7 +27804,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27524,7 +27818,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27538,7 +27832,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27559,7 +27853,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27580,7 +27874,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27601,7 +27895,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27621,7 +27915,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27641,7 +27935,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27661,7 +27955,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27681,7 +27975,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27704,7 +27998,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27718,7 +28012,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27732,7 +28026,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27753,7 +28047,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27774,7 +28068,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27795,7 +28089,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27815,7 +28109,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27835,7 +28129,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27855,7 +28149,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27875,7 +28169,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -27898,7 +28192,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27912,7 +28206,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -27926,7 +28220,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27947,7 +28241,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27968,7 +28262,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -27989,7 +28283,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28009,7 +28303,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28029,7 +28323,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28049,7 +28343,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28069,7 +28363,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28092,7 +28386,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28106,7 +28400,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28120,7 +28414,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28141,7 +28435,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28162,7 +28456,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28183,7 +28477,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28203,7 +28497,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28223,7 +28517,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28243,7 +28537,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28263,7 +28557,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28286,7 +28580,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28300,7 +28594,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28314,7 +28608,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28335,7 +28629,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28356,7 +28650,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28377,7 +28671,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28397,7 +28691,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28417,7 +28711,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28437,7 +28731,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28457,7 +28751,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28480,7 +28774,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28494,7 +28788,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 155 join: BEVELJOIN cap: BUTTCAP } @@ -28508,7 +28802,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28529,7 +28823,7 @@ cont { dd: 4.0 dd: 2.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28550,7 +28844,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 cap: BUTTCAP } path_text { @@ -28571,7 +28865,7 @@ cont { dd: 6.0 dd: 3.5 } - priority: 180 + priority: 155 } path_text { primary { @@ -28591,7 +28885,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 7.6 @@ -28627,7 +28921,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -28663,7 +28957,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -28699,7 +28993,7 @@ cont { dd: 8.0 dd: 4.5 } - priority: 180 + priority: 155 } lines { width: 9.0 @@ -53926,7 +54220,7 @@ cont { lines { width: 1.5 color: 1305595303 - priority: 180 + priority: 160 cap: BUTTCAP } } @@ -53935,7 +54229,7 @@ cont { lines { width: 1.8 color: 1305595303 - priority: 180 + priority: 160 } caption { primary { @@ -53951,7 +54245,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -53968,7 +54262,7 @@ cont { lines { width: 3.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -53985,7 +54279,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { @@ -54002,7 +54296,7 @@ cont { lines { width: 4.0 color: 869387687 - priority: 180 + priority: 160 } caption { primary { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index b228f6d43a73627638e02ddc6001af0db16e1f23..a3f607f97f164c37b16db1ca0ec8840335cb2086 100644 GIT binary patch delta 3001 zcmcIkZA@Eb6yDPocA)~7+Yee0dZDAN6uJUtQ)0L!(HV7%!eE)O2#5lU2wSpfmY9f% zI)BU&%0HIOgv77J_+$H{*<$=LT@=hTe#Gdx@4am=ZP{Q+Z*p@^ zp7%WGeb0H%^Pd03pZLQ+a{;c}kq_;q^2D+6i5EsrwT_+|oqUEJrCM?--jc7r)V~{= zy!!X@&kpr-TMYMt*Y4uA9pYQdT5FNY6nDw&yZW~-*5>R~xq>RXKY)^*M#7u)W&mng zM5<6+W}ZIJ@h z``Rrdvkl%o$=`$ctf=Ob;?k;=md2*1PwJX_>X=X!eIG(BvOk}879e!hoYBptGavm# z-9vC`j<|ZkSU#LbTIzx>$laz;Z)!3VXYJKWsch&)rjM^c-S=9R(l3>BdrkcbVcJt< zqmh5*A+Ir66J(20Ha3+g+2@(haL zjft-`ho_qR`e>;Ue(&Sfm%_Zz1<<)D8judLyd0Z_SdwBry> zv?0v6@P8D3l6|d#vB&zbhYj~YZ$(>gs(c?^9TLfS6TKrR`q9N^=@8$9b_Ai6e|0$J z>&tM#Yg;U)R}bT%np?<++J+F^u3X-J=bN*+a(TtOCAs8~gunijN*0 zNDYdY5(7dJJTzW%4rcu4E&h2057Ww^NT81o9XN{KTW)!$gGt{$DUPstF?XE#=t!Z? z{KKetcnWalC&q-Z3y}Hi2|QAm8$9^zwz{!2DQ1!1!x#BH{N(kJ>_HJ-dQLoA86ZBD z22L+eA-Ozd8;c=9fq9#s&3*H>W;RdH+gjMXl{S95Ja2OukoPnaHvaAWJCaBgMK1pj D2IXI6Mf7S@XG&Rj+{iz5cq9Bln zpk6$s;U+8SLx|k?#dlxq>b}-CRMtM!-rLC(A>WiK*v%JY`4Z$8f4-PAy5Dhr)PP~T z88-Szk`)>IrdP32Q#~`}zgOzFvVa`ytOwxlwxU))4IqB#hvMam9#0!>G z;om{>xKNmBNqab&aKTB3UC2o7WRyMGLWwCi9kuDRZuPlvmtMQzIrfiXl`6*rSdwMIE9=uD`K(;))ZkEO|-y9Q4w}1RI`PMNnm)jEMBt2bT$-` zr;cr@(4?3f8FV?Ovy(ffGs3F{^(@^={V`qMcF=_>sTtPDm8;QcXYc=X<<3AC>xw!C zTu7QfX^z;iC^wfM;zvKtuISxWY#xi#-Mck_N}AsTbA=LS)MhFzEZUl>_EpNPx#JMJ zv}3eA+xxfdVv_6LE83~<4w+)I2yYCuegJhNK6aOn_u?6?mZ6ruMqsBi{)$bvfj+C281~~3kf0lt@EH?ezllJe0K8lRwCqO-gEkn%KE5g( zk;;p#d?jeA8vB{|V>Pa`Pul?MY5X8cRlOjP*2RYbta;>AK7w+N`>v;#XK+-MEm}K^ zuuO}Y&*>G9YH~Lti&i6WP_TuuWZWEd$%5lF+ks4plY=%|(4=TR=Tz;fpb4>4uoaD) zRcY}&nl$FAPBduDr7q7B;>;k|;V(!?Z>IFD31;O*_!Z>G7H+fQO;A~!lX~Ae$vLPm&e@p0JjvN< aEY8_g{cT!z3@76pTROJ%Vlr;;*vLlRuVtavo< delta 111 zcmeBtEAaBQz=o@(GHd()ZD&(xViXeN5Ec^RWB`K?_5vXB$sbEaSilUA8$t;u)Fg8RdzUx@r0OB_KK}Gr2N3C$+huti7R(5r~<#H