From 1c8a1e759592b01e05f64c88cdd16b2e5fb3b4af Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 12 Jun 2025 02:01:57 +0200
Subject: [PATCH] Regenerated files for improved distinguishability of the
 different bicycle paths

---
 data/colors.txt                      |  11 +-
 data/drules_proto.bin                | Bin 434625 -> 434617 bytes
 data/drules_proto.txt                | 254 +++++++++++++--------------
 data/drules_proto_default_dark.bin   | Bin 416879 -> 416875 bytes
 data/drules_proto_default_dark.txt   |  96 +++++-----
 data/drules_proto_default_light.bin  | Bin 418245 -> 418241 bytes
 data/drules_proto_default_light.txt  | 164 ++++++++---------
 data/drules_proto_outdoors_dark.bin  | Bin 437023 -> 436903 bytes
 data/drules_proto_outdoors_dark.txt  |  24 ---
 data/drules_proto_outdoors_light.bin | Bin 438500 -> 438380 bytes
 data/drules_proto_outdoors_light.txt |  24 ---
 data/patterns.txt                    |  15 +-
 12 files changed, 273 insertions(+), 315 deletions(-)

diff --git a/data/colors.txt b/data/colors.txt
index c73e35f58..7abdccabf 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -148,7 +148,6 @@
 6247213
 6272197
 6291544
-6315774
 6381914
 6381921
 6510384
@@ -164,6 +163,7 @@
 6967599
 7105644
 7224647
+7302655
 7353344
 7434609
 7542806
@@ -344,10 +344,10 @@
 441199131
 441272132
 441403975
-442523390
 442905727
 443115881
 443432263
+443510271
 446405263
 451800027
 452107824
@@ -397,11 +397,11 @@
 861690961
 861690972
 861885229
-861953790
 862076287
 862148400
 862348902
 862862663
+862940671
 863203947
 863664762
 863850275
@@ -424,6 +424,7 @@
 871811973
 872195170
 872215006
+872413941
 872414974
 872415231
 1074136576
@@ -560,11 +561,11 @@
 1717150383
 1717328977
 1717523245
-1717591806
 1717714303
 1717786416
 1717789532
 1718500679
+1718578687
 1719302778
 1719488291
 1720223880
@@ -605,10 +606,10 @@
 2153536593
 2153755845
 2153769774
-2153799422
 2153921919
 2153997148
 2154708295
+2154786303
 2154984050
 2155510394
 2155695907
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b3bdbb5df404edde08e1b90f002f0ab697a247f6..cdbe5d39c84564a2646414309adf8828ea6c1bc1 100644
GIT binary patch
delta 1243
zcmX?jSZe2CsfI0#X6Ca0Z|`m9P`Jft!6+ob!6PKX$p8i)>;-@_)9+a@iZg>4@z#vu
zAhny>AZm3u_~B}QK-4ZYXVeC(J!s7+HT|VIBR_&CYQf0Q2Gq{1aBKQSCr07vwm|z(
z1TxSCCR;G-k>WZ&B-c4{@J~0~#w^JL@eIO&GSlNM8C4PPT42d&jo|$N@=zS*W5sBP
zBCr@;;FlF?t|TE0HNg&hYt5JmW<=UBW`G&`wu}+eWo#J*K)mfh-VWC2=WJZ!8JX!B
z<%yNLY5DmjAUY{CxiUE?RVb8$TS%BQ4Gf-vql#JKHYmO|pm7Zhp08j3&u5kr;u3%a
zn1lm_R&r3dGrho$QPinR9B2*?mCWI#k~w@-GKZgHbEJXc6UZSTB*-~yCJ4NQhqI8{
zbo~HEMHUrMP#W3*lYW9LBde7lT<J%IQdLf4Fkp57MF=}0K2)Ibp@wV-JJ1M7tbT(V
zG5w-FqZE%GRJk5V`A1hq2@zqST1b>KIDj%XC<RP+^arXnfvPous+A&IrRequH^x{<
zmKP{u^q5w}$O}%OKu#!(;W2#!O!xpyIM<m`e7b%yV-PFQC6^hepLbytoj$vm(GRRi
q(G@7mTmt2VlrW}%g?A${LfXqp8G)Dyh?#+y1&CR<mzA=4>i_^E{)u7$

delta 1235
zcmdmaSnA+msfI0#X6Ca0_BJ+iDBNPSU=)(z;1LqxWB`K?_5whe>Gv!c#hF2jcxy&+
zklM{`5VblS{BX5DAZizyGirm?9<*kZn*P$9ksrYmwP56D18QehxHbKv6Ql5STcCX?
z0vYH6lPwtaNO2t>lIxr}_^0Q)F^W&Gxy;PLhH#(E^f*gKRfMw^STb58ct3zV6gT-;
zG1{RBEJhdjWks4JNeDtsu*2S3GiHJrkv5DOV1~XeW5jeBTSfs8Z#$5;gH`W68<%)S
zW_m_>Vx?|cetrpvPRdNKOwLIa3gh4w(tyS)G$aIy8O6o#fTA20-9U-2U;j^MQn)?+
zgEON9P!kV1ns~|4#7B-Mev&oW1#t)nsX+sR!2y)KXERF)aS1>Yyqp7sR(4Rh!zd(#
zPzMVaLmNh6$1ZW9APzyGF~(rP3^wL6Bf=O3hqGruKnZFLTpiGu>x{tQ1sP)xG$w#U
zNJy1))=UuK1RI0o7)1w&1jH0UgfgHh>_9_6SqNf?FwhW)jRNR~C^@8o0n8A%G7LjR
zC^KZcpBrO5B<pV|WDEtTQXs=)dO#5)FPN85gb;R{{;vpHGyu~fByraiGp2$SK7lcO
mN*GhXB2uM{A=BAQA<4ZR$OB>~AZ7+)79eKbE>+4lUk3mwD3Q_t

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 94f643b9b..1e3bc8083 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -24044,7 +24044,7 @@ cont {
     scale: 11
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24053,7 +24053,7 @@ cont {
     scale: 12
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24062,7 +24062,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24071,7 +24071,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -24080,7 +24080,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -24097,7 +24097,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24113,7 +24113,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24129,7 +24129,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24145,7 +24145,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24161,7 +24161,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24180,7 +24180,7 @@ cont {
     scale: 11
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24189,7 +24189,7 @@ cont {
     scale: 12
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24198,7 +24198,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24207,7 +24207,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -24222,7 +24222,7 @@ cont {
     }
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -24245,7 +24245,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24273,7 +24273,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24301,7 +24301,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24329,7 +24329,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24357,7 +24357,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24376,7 +24376,7 @@ cont {
     scale: 11
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24385,7 +24385,7 @@ cont {
     scale: 12
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24394,7 +24394,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24403,7 +24403,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -24412,7 +24412,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -24429,7 +24429,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24445,7 +24445,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     lines {
@@ -24477,7 +24477,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -24509,7 +24509,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -24541,7 +24541,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -24990,19 +24990,19 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25017,19 +25017,19 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25044,19 +25044,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25071,19 +25071,19 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25098,19 +25098,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25125,18 +25125,18 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
-      color: 861953790
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
-      priority: 220
+      width: 0.8
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.0
-      color: 587201269
-      priority: 219
+      color: 452983541
+      dashdot {
+        dd: 8.0
+        dd: 10.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25150,18 +25150,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.4
-      color: 442523390
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
-      priority: 220
+      width: 1.1
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.4
-      color: 452983541
-      priority: 219
+      color: 16775925
+      dashdot {
+        dd: 10.0
+        dd: 11.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25175,18 +25175,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 6315774
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
-      priority: 220
+      width: 1.4
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 3.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 15.0
+        dd: 15.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25200,18 +25200,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25225,18 +25225,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -28880,7 +28880,7 @@ cont {
     scale: 11
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28903,7 +28903,7 @@ cont {
     scale: 12
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28926,7 +28926,7 @@ cont {
     scale: 13
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28949,7 +28949,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28972,7 +28972,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -29003,7 +29003,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 7.5
         dd: 9.5
@@ -29032,7 +29032,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 8.0
         dd: 9.4
@@ -29061,7 +29061,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 8.5
         dd: 9.3
@@ -29090,7 +29090,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
@@ -29119,7 +29119,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 36b79fc6649dda81e07e739edf767de8f6add1ae..df219ffa339b6d4ae9d152dd37ffa8384b811493 100644
GIT binary patch
delta 393
zcmaFAL-O?w$%ZYA{<@6a(*txFrR_sG_=SWy)4<@Fy}<EbJD3%2Gg>eTX>c-t!4G?Z
z!#!(fF-r+?2|z?793ZrkgTkHZf@c{;9lFGY0yzYP1UYBT1c8@ubA;5OrZ6~wOu58}
zFhv1siVDaSMm<I`n*a_$xDg)_MyPTcg8?(x2quIHDo_*DU?zwKa0mfSfOzH`+=S`z
zI*d|0dQjDRAk~WEjKY#YR|jwi12sUr19T$P_tP15ff`Jp8ca|%h!C%#Jx-qyh?#(x
Q8Hibcn00%cKAWH}0IOPC9smFU

delta 290
zcmaF8L-PF&$%ZYA{<@6)(*txFr5VGfe~n<&5WmA{!6+oc$p8jF>;(?@tewQ9aC`a#
zO-512E^(nC4gn!Gs5FCv!0}%@W;06(aS1>)$T>i0We0^jj6y;PbueQB^%%t%gQlO1
zWYiD^t1t!wW(SZ(ml%N-0aZv%H;H0Y5dq2za?Y9w0-RuZkUJE`8HL$^?g-!zp3WG}
ts0vYa_6!IJpr~R2sha*jicuZ6n)WDtMj&PaVrC#_0b<teQTl9xx&R!wQU3q{

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 7384b07a5..54902adb8 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -23341,19 +23341,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 862862663
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7224647
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 575358531
-      priority: 219
+      color: 860571203
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -23368,18 +23368,18 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
-      color: 862862663
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
-      priority: 220
+      width: 0.8
+      color: 7224647
+      priority: 219
     }
     lines {
       width: 2.0
-      color: 575358531
-      priority: 219
+      color: 441140803
+      dashdot {
+        dd: 8.0
+        dd: 10.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23393,18 +23393,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.4
-      color: 443432263
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
-      priority: 220
+      width: 1.1
+      color: 7224647
+      priority: 219
     }
     lines {
       width: 2.4
-      color: 441140803
-      priority: 219
+      color: 4933187
+      dashdot {
+        dd: 10.0
+        dd: 11.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23418,18 +23418,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
+      width: 1.4
       color: 7224647
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
-      priority: 220
+      priority: 219
     }
     lines {
       width: 3.2
       color: 4933187
-      priority: 219
+      dashdot {
+        dd: 15.0
+        dd: 15.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23443,18 +23443,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 4.2
+      width: 2.0
       color: 7224647
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      priority: 219
     }
     lines {
       width: 4.2
       color: 4933187
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23468,18 +23468,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 4.2
+      width: 2.0
       color: 7224647
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      priority: 219
     }
     lines {
       width: 4.2
       color: 4933187
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index febaf8de38b5d758d44ae6f045abec3d7c6e108a..4f3c667c0ba406a692a1ae8314a0945c66bfb440 100644
GIT binary patch
delta 818
zcmX?lSn}Xu$%ZYA@0HE}-`?BIp>T`Qf>B6<gHK3=(-;gs+Y10?HnTxwbU65dG7Mnw
z11vLrgF2%&Gf>I&1{FrB>3J%Q{4ky-m~l^yQF8iGm@t_40f{FuT}qWvM}sKaojCZX
zE3RM^=fiY@%=GoDjH)o3rKW#WWwb`{Jk_8)p!L$z7pXB?!kiWYV@OQ*RcF+pQYidT
zhlT=|24g1JhB6Jt3^3y%5+h>!5=}-i7RK)ByLB0*?L&cqE6kY&2G78O%dBu46dxLh
z5dZr1|9oaCAua((97s4oXe9@QJJSuN8AYYL#DxMm1cU@RXUznGmvD20)TZ-iGb*yE
zfRt|3VHDN?Dh=Qege(1sP^t=zd}ap$poP;9_A?8!sKN9}fb|Ih^+BBa4W@6pz9FMD
zj~>)XdLZ==)fj~(!Rm#9>LG4rZ~&z!kk_UQ7&A)om_Rj{plT2yUc>g2`iu@5;Nazn
zU<_pi8b6zPI$s2%%yiXgV4|E8!DtAUy%52e3T9YDLKzDp8B@R_c~OiZ)1#vp1wg!Z
WAP<O{fS4JGS%8>zdtMY<I6DAC0u1K>

delta 889
zcmX?jSn}v$$%ZYA@0HE}?QLx4P`Jft!6+ob!6zibX$%IR?FE1`o7o^TIvo5!83r);
z0hXD*L7h>X8K`7>g9@Y6^gI<tei%;^%($n<C^`KoOc>1jfW(uSE~Uz-qd}DIP8|Hx
z6QUW#r`PUd<X}VCFEf3;Dx)gQTB+$DRT-@jJWn+!4`{da^hIinmN0jPz!(zKebpIt
zs1yW0)S*GZrNNj9wxLXeF$2tah{TB4zC@EzjD@j(`fgoDX`wJ+$ZDX5Y(fO1xcD7V
zgdhd^*RTJlGb!AjZYa$t>ewYN6vQDQqz2W;-~fuN+00TxTmq0dl5>F2$_@&57=?ro
z>R`rf)L|5c7$XQY1`_4WU}G*bB8*XRIC};Jl%U4I)d7vU&Ioi3$e8Kp^%&VLR5@qO
z1OZO4AxKV9bbv@e%n(E<1De4OG~%Heqp&^DLjfGZLaLk)`vlMpQF2HF1DGLjWf+Et
zP-e*Xqxy^v8sJFdh+qr_Gl1~{iO(|;jHzG|lSn9IP9$RrSR^ZoF=Tpp6r%u$*AC<X
UF%u9o12GE_vu@9dVhd*n081<-+5i9m

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index c2c2ce340..05e3acc25 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -22554,7 +22554,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -22563,7 +22563,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -22572,7 +22572,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -22589,7 +22589,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22605,7 +22605,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22621,7 +22621,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22637,7 +22637,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22653,7 +22653,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22672,7 +22672,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -22681,7 +22681,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -22696,7 +22696,7 @@ cont {
     }
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -22719,7 +22719,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22747,7 +22747,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22775,7 +22775,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22803,7 +22803,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22831,7 +22831,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22850,7 +22850,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -22859,7 +22859,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -22868,7 +22868,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -22885,7 +22885,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22901,7 +22901,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     lines {
@@ -22933,7 +22933,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -22965,7 +22965,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -22997,7 +22997,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -23341,19 +23341,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -23368,18 +23368,18 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
-      color: 861953790
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
-      priority: 220
+      width: 0.8
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.0
-      color: 587201269
-      priority: 219
+      color: 452983541
+      dashdot {
+        dd: 8.0
+        dd: 10.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23393,18 +23393,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.4
-      color: 442523390
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
-      priority: 220
+      width: 1.1
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.4
-      color: 452983541
-      priority: 219
+      color: 16775925
+      dashdot {
+        dd: 10.0
+        dd: 11.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23418,18 +23418,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 6315774
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
-      priority: 220
+      width: 1.4
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 3.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 15.0
+        dd: 15.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23443,18 +23443,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23468,18 +23468,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -26876,7 +26876,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -26899,7 +26899,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -26930,7 +26930,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 7.5
         dd: 9.5
@@ -26959,7 +26959,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 8.0
         dd: 9.4
@@ -26988,7 +26988,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 8.5
         dd: 9.3
@@ -27017,7 +27017,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
@@ -27046,7 +27046,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 8117c5cb7089566703f0f574b643acbc40ae342c..a5e2bb5e6b5d12999d1490e058bcec22eae90474 100644
GIT binary patch
delta 231
zcmbP#O=|g7sfI0#Z8l5`*|vAsFlsW2gmLf-iEuK2!4G?Z<G*&yW}bf2meEBdh(ka~
zh|?Ghe#2y3?HC<^GJ-%Eh#m$9sGhYz8Sy|4A-Eo9sEooY#_5hOj7rn%@)*UX+Qfwd
fIfRK(B!XX2ySxJ<5HkTWGZ3=?G3#=92exbg?3z9n

delta 243
zcmZ2}Rcih<sfI0#Z8l6Z*|&GtFlsUiXL0ZgX>c-t!4G?Z<G*&yp01I@C_8;a4kPFE
zYqpHW!f6}=LTa4GVDKBN<X;Y>%5)t&Mnj;iAW#-!0D}X>fYe-|Yy(I(l|u-wml-O1
y1|)mdiBW9&1baqF5usELVGK1h^3c_Y;8xQPGzW;8fS4JGS%8>z`viM7@oWIAFG*?u

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 514256648..1f737ed0c 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -24671,10 +24671,6 @@ cont {
     lines {
       width: 1.5
       color: 862862663
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
       priority: 170
       cap: BUTTCAP
     }
@@ -24702,10 +24698,6 @@ cont {
     lines {
       width: 1.7
       color: 862862663
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
       priority: 170
     }
     lines {
@@ -24731,10 +24723,6 @@ cont {
     lines {
       width: 2.0
       color: 862862663
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
       priority: 170
     }
     lines {
@@ -24760,10 +24748,6 @@ cont {
     lines {
       width: 2.4
       color: 862862663
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
       priority: 170
     }
     lines {
@@ -24789,10 +24773,6 @@ cont {
     lines {
       width: 2.4
       color: 862862663
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
@@ -24818,10 +24798,6 @@ cont {
     lines {
       width: 2.4
       color: 862862663
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 8cba39370a85d645eb05f546507b50b793ba547b..a0af841fa30db1cc088285d051f34853b84c3ba6 100644
GIT binary patch
delta 202
zcmaFzQ0mPCsfI0#A8nWxvTgrt!>Gw962`$VB*Mu620!ctUe7)|i+Q?>9ixj#5Ql(}
z5T`L1{D#SFuw!%p$_N5wAbJ=apn4?ifii&{LU29IFqsB>Mth))Fisf}tTJ}(Jr0aO
T%ml>DK+FQftlN7W*dhu5(mFXs

delta 232
zcmaF!K<ddusfI0#A8nXsvTy%v!>Gw9lEuL<q`}Dm20!ctUe7)|i+TFHY(~}Tj&_X3
zB551~LTa4GVDK9z9ht+ZJbk(yqajdQ5GW1N&ENpleE=l=8YG>{Aq3aW43k#R1xnl7
nGa3M;g)yajk)%a%OY66bI4}Y+6A&{4F$)m0ZWnQ2izom9LVrOk

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 217dba025..c348309c8 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -24671,10 +24671,6 @@ cont {
     lines {
       width: 1.5
       color: 861097451
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
       priority: 170
       cap: BUTTCAP
     }
@@ -24702,10 +24698,6 @@ cont {
     lines {
       width: 1.7
       color: 861097451
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
       priority: 170
     }
     lines {
@@ -24731,10 +24723,6 @@ cont {
     lines {
       width: 2.0
       color: 861097451
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
       priority: 170
     }
     lines {
@@ -24760,10 +24748,6 @@ cont {
     lines {
       width: 2.4
       color: 861097451
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
       priority: 170
     }
     lines {
@@ -24789,10 +24773,6 @@ cont {
     lines {
       width: 2.4
       color: 861097451
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
@@ -24818,10 +24798,6 @@ cont {
     lines {
       width: 2.4
       color: 861097451
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
diff --git a/data/patterns.txt b/data/patterns.txt
index 8eda91dba..0328ce2ef 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -28,11 +28,11 @@
 6.0 1.8
 8.0 2.3
 10.0 2.7
-7.0 9.6
-7.5 9.5
-8.0 9.4
-8.5 9.3
-9.0 9.2
+6.0 9.0
+8.0 10.0
+10.0 11.0
+15.0 15.0
+20.0 20.0
 4.0 1.0
 6.0 1.3
 8.0 1.5
@@ -45,9 +45,14 @@
 4.0 2.5
 6.0 3.5
 8.0 4.5
+7.0 9.6
 3.5 2.7
+7.5 9.5
 4.0 3.2
+8.0 9.4
+8.5 9.3
 6.0 4.7
+9.0 9.2
 8.0 6.2
 1.0 2.0
 1.8 2.5