From c3b39411e8f0430e7cb96d5b2badc495491f5766 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Thu, 12 Jun 2025 11:52:04 +0200 Subject: [PATCH] Regenerated files for adjusted bicycle paths in the outdoor style to be more in sync with the default style --- data/drules_proto_outdoors_dark.bin | Bin 436903 -> 436870 bytes data/drules_proto_outdoors_dark.txt | 231 +++++++++++++-------------- data/drules_proto_outdoors_light.bin | Bin 438380 -> 438347 bytes data/drules_proto_outdoors_light.txt | 231 +++++++++++++-------------- data/patterns.txt | 3 + 5 files changed, 227 insertions(+), 238 deletions(-) diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index a5e2bb5e6b5d12999d1490e058bcec22eae90474..54911ff9353525b5f1a43c16569c433e7fb609f7 100644 GIT binary patch delta 1232 zcmbVMOK1~O6wRHPG!xBlCKDT@iPI*=*rqXwF(@Wvvd?{Rs>O+hAssWy3t~> zy7Q{*f^J+Cg>>OYL@FkA*Nv-6L6D%J_`xpJJM*TK1Q(TFc!br2VEvbo$A)Hhrjj)R;O-Lm3bZRzz5-(}#Cg8_fx*(|7@VbLr5oiBS_BacZ4q}>l<0^@jf&#HD?Wgqp7I|2{gp6=Tpc45hDjR2N)rN*!1oLE zW5|y{75BB^2!3854r}pMQNeHvM!K3|bmVq=kpCNX1iiZHhQaHzCtIntmwwG!zNHF6Mm=*-{sW5cmnG9q=Cn=JUBz9k=tM!%XxTfhx<5J zfKjf+p%f>d)(hapWFAB{sHrU$$tp#1D{|{bTzR$0VXz2cm#DGb_7fT}tU_S#e7{^3 zJw#vzZ*&MVML1|z_1EH36cmQk)69nVp@V#_BL^*Hg5Fs%GS05TM++&(w_>mPUfzC! zOV>dWV!D>fciyk>Fiv5UoZWZL5I=hgLavx8KHf{v{b7=RSR3Js(?m#_gj6q~W01`p zI*rF5kEjmIUpF${~Cnu0R^xeRgqS)j~M6k!jBi{QkKDL7$$CGON< z5YN=0%-J-&TZ4-t`^B&13Xyi@( zEX8{zQ5aS2XOXg54DA=$iH7QpgqWw29sD&q%yv@bZ{@*IIZqUW)s zlnTcx#S|t)(;G~f0TPqQ9lH~huJtCl7q3Y^tcJgCjWrd?lX{)Sd+0p{@i$#lZ#zAq z(&@}Ngp6J}yQ8)j$MM02M>LzqN&0#f{q#8x58ag!67^P4+vGkMYk`6VL@8f|pX%#y z*&9LWJnyE5GAo4}1;l7oW<__l3RgtE@|bFE_BeT4K!ToE5guWnbF6HZ3UAhOWyPbr{2@C8PXj*wm{S zrjaTpl&)o)%e*;XR;#$^FlI}!hD+wacwA#Q#`JL3w{9-XcIsfu!WPGtl`UJlQ@1Z2 F{|!QsfL;Iq diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 1f737ed0c..8793412b1 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -23564,7 +23564,7 @@ cont { element { scale: 12 lines { - width: 1.0 + width: 1.1 color: 1299070279 priority: 330 join: BEVELJOIN @@ -23574,7 +23574,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 862862663 priority: 330 cap: BUTTCAP @@ -23591,7 +23591,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 7224647 priority: 330 cap: BUTTCAP @@ -23608,7 +23608,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 2.0 color: 7224647 priority: 330 cap: BUTTCAP @@ -23625,7 +23625,7 @@ cont { element { scale: 16 lines { - width: 1.7 + width: 2.6 color: 7224647 priority: 330 } @@ -23641,7 +23641,7 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 7224647 priority: 330 } @@ -23657,7 +23657,7 @@ cont { element { scale: 18 lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } @@ -23673,7 +23673,7 @@ cont { element { scale: 19 lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } @@ -23689,7 +23689,7 @@ cont { element { scale: 20 lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } @@ -23718,7 +23718,7 @@ cont { element { scale: 12 lines { - width: 1.0 + width: 1.1 color: 1299070279 priority: 330 join: BEVELJOIN @@ -23728,7 +23728,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 862862663 priority: 330 cap: BUTTCAP @@ -23745,7 +23745,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 7224647 priority: 330 cap: BUTTCAP @@ -23762,13 +23762,13 @@ cont { element { scale: 15 lines { - width: 4.0 + width: 5.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.5 + width: 2.0 color: 7224647 priority: 330 cap: BUTTCAP @@ -23785,13 +23785,13 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 6.2 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 1.7 + width: 2.6 color: 7224647 priority: 330 } @@ -23807,19 +23807,19 @@ cont { element { scale: 17 lines { - width: 7.0 + width: 9.6 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 8.6 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.0 + width: 3.3 color: 7224647 priority: 330 } @@ -23835,19 +23835,19 @@ cont { element { scale: 18 lines { - width: 9.8 + width: 13.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 12.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } @@ -23863,19 +23863,19 @@ cont { element { scale: 19 lines { - width: 10.8 + width: 14.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.8 + width: 13.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } @@ -23891,19 +23891,19 @@ cont { element { scale: 20 lines { - width: 10.8 + width: 14.0 color: 1297109072 priority: 140 cap: BUTTCAP } lines { - width: 9.8 + width: 13.0 color: 858532890 priority: 150 cap: BUTTCAP } lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } @@ -23932,7 +23932,7 @@ cont { element { scale: 12 lines { - width: 1.0 + width: 1.1 color: 1299070279 priority: 330 join: BEVELJOIN @@ -23942,7 +23942,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 862862663 priority: 330 cap: BUTTCAP @@ -23959,7 +23959,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 7224647 priority: 330 cap: BUTTCAP @@ -23976,7 +23976,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 2.0 color: 7224647 priority: 330 cap: BUTTCAP @@ -23993,7 +23993,7 @@ cont { element { scale: 16 lines { - width: 1.7 + width: 2.6 color: 7224647 priority: 330 } @@ -24009,18 +24009,18 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 7224647 priority: 330 } lines { - width: 6.0 + width: 8.6 color: 1294740506 priority: 154 cap: BUTTCAP } lines { - width: 7.0 + width: 9.6 color: 1297109072 dashdot { dd: 2.0 @@ -24041,18 +24041,18 @@ cont { element { scale: 18 lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } lines { - width: 8.8 + width: 12.0 color: 1294740506 priority: 154 cap: BUTTCAP } lines { - width: 9.8 + width: 13.0 color: 1297109072 dashdot { dd: 2.0 @@ -24073,18 +24073,18 @@ cont { element { scale: 19 lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } lines { - width: 9.8 + width: 13.0 color: 1294740506 priority: 154 cap: BUTTCAP } lines { - width: 10.8 + width: 14.0 color: 1297109072 dashdot { dd: 2.0 @@ -24105,18 +24105,18 @@ cont { element { scale: 20 lines { - width: 2.4 + width: 4.0 color: 7224647 priority: 330 } lines { - width: 9.8 + width: 13.0 color: 1294740506 priority: 154 cap: BUTTCAP } lines { - width: 10.8 + width: 14.0 color: 1297109072 dashdot { dd: 2.0 @@ -24593,7 +24593,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 332 join: BEVELJOIN cap: BUTTCAP } @@ -24604,10 +24604,10 @@ cont { width: 1.1 color: 1296778819 dashdot { - dd: 3.5 - dd: 2.5 + dd: 2.0 + dd: 6.0 } - priority: 180 + priority: 332 join: BEVELJOIN cap: BUTTCAP } @@ -24615,19 +24615,19 @@ cont { element { scale: 13 lines { - width: 1.1 - color: 862862663 - priority: 170 + width: 0.5 + color: 7224647 + priority: 331 cap: BUTTCAP } lines { width: 1.3 color: 860571203 dashdot { - dd: 4.0 dd: 3.0 + dd: 7.0 } - priority: 180 + priority: 332 cap: BUTTCAP } path_text { @@ -24636,15 +24636,15 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 2950 + priority: 2954 } } element { scale: 14 lines { - width: 1.3 - color: 862862663 - priority: 170 + width: 0.6 + color: 7224647 + priority: 331 cap: BUTTCAP } lines { @@ -24652,9 +24652,9 @@ cont { color: 860571203 dashdot { dd: 4.0 - dd: 3.0 + dd: 8.0 } - priority: 180 + priority: 332 cap: BUTTCAP } path_text { @@ -24663,15 +24663,15 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 2950 + priority: 2954 } } element { scale: 15 lines { - width: 1.5 - color: 862862663 - priority: 170 + width: 0.7 + color: 7224647 + priority: 331 cap: BUTTCAP } lines { @@ -24679,9 +24679,9 @@ cont { color: 860571203 dashdot { dd: 6.0 - dd: 4.5 + dd: 9.0 } - priority: 180 + priority: 332 cap: BUTTCAP } path_text { @@ -24690,24 +24690,24 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 2950 + priority: 2954 } } element { scale: 16 lines { - width: 1.7 - color: 862862663 - priority: 170 + width: 0.8 + color: 7224647 + priority: 331 } lines { width: 2.6 - color: 860571203 + color: 441140803 dashdot { - dd: 6.0 - dd: 4.5 + dd: 8.0 + dd: 10.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24715,24 +24715,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 17 lines { - width: 2.0 - color: 862862663 - priority: 170 + width: 1.1 + color: 7224647 + priority: 331 } lines { width: 3.3 - color: 860571203 + color: 4933187 dashdot { - dd: 8.0 - dd: 6.0 + dd: 10.0 + dd: 11.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24740,24 +24740,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 18 lines { - width: 2.4 - color: 862862663 - priority: 170 + width: 1.4 + color: 7224647 + priority: 331 } lines { width: 4.0 color: 4933187 dashdot { - dd: 8.0 - dd: 6.0 + dd: 15.0 + dd: 15.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24765,24 +24765,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 19 lines { - width: 2.4 - color: 862862663 - priority: 170 + width: 2.0 + color: 7224647 + priority: 331 } lines { width: 4.0 color: 4933187 dashdot { - dd: 8.0 - dd: 6.0 + dd: 20.0 + dd: 20.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24790,24 +24790,24 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } element { scale: 20 lines { - width: 2.4 - color: 862862663 - priority: 170 + width: 2.0 + color: 7224647 + priority: 331 } lines { width: 4.0 color: 4933187 dashdot { - dd: 8.0 - dd: 6.0 + dd: 20.0 + dd: 20.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24815,7 +24815,7 @@ cont { color: 7829367 stroke_color: 856032768 } - priority: 2950 + priority: 2954 } } } @@ -28494,13 +28494,6 @@ cont { } element { scale: 12 - lines { - width: 1.0 - color: 1299070279 - priority: 170 - join: BEVELJOIN - cap: BUTTCAP - } lines { width: 1.1 color: 1301563922 @@ -28516,7 +28509,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 862862663 priority: 170 cap: BUTTCAP @@ -28543,7 +28536,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 7224647 dashdot { dd: 7.0 @@ -28574,7 +28567,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 2.0 color: 7224647 dashdot { dd: 7.0 @@ -28605,7 +28598,7 @@ cont { element { scale: 16 lines { - width: 1.7 + width: 2.6 color: 7224647 dashdot { dd: 7.5 @@ -28634,7 +28627,7 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 7224647 dashdot { dd: 8.0 @@ -28663,7 +28656,7 @@ cont { element { scale: 18 lines { - width: 2.4 + width: 4.0 color: 7224647 dashdot { dd: 8.5 @@ -28692,7 +28685,7 @@ cont { element { scale: 19 lines { - width: 2.4 + width: 4.0 color: 7224647 dashdot { dd: 9.0 @@ -28721,7 +28714,7 @@ cont { element { scale: 20 lines { - width: 2.4 + width: 4.0 color: 7224647 dashdot { dd: 9.0 diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index a0af841fa30db1cc088285d051f34853b84c3ba6..a61fb5068762cee38fd5596965cd26ba50781bf9 100644 GIT binary patch delta 1251 zcmb_cO=uHQ5bn3TCY!{jn@viaVB3vNOANK7Bv!%1rWHj`ZNNZJwI`uXqvG8kyePeS z>1aK8Q1BwygHZ7x>P2f4_25m=Ktb@QV5JBiB+l;JY!jq-(1Ewh&ilUEnfJ|`uhqzE zHFD_z&Lk6yH%!|Y(Z1ZQd{&H?QW6KC52&qr$WtkswrTAx%A~ELgO-x;xCQAaJxO9f zYRS>lBzkCkA6#xhQRwUt3|~MGcura76%L&pEtYAfBj#@SFnpor-7Z=i!pJ`-Xke5A zqX^UEx3Z6(CDGkFqH0ccopfyh?NDeU1p@(kT|ju@z3igthq9mix1qvo?$vWm&_;~$ zamr8fOS5QHS-~JpO)^$E5TaKr*jsmTsaOfVG^x%_Z`LC7#+&?XEv6N1hS zYOxQV|6mc)HX+?i*i!1R1ZBR%`-bvI5M17q!&Cxy=;|zvQ6`Hvx^M8~-f5`hFG91Y zz$Wz-k#~m0`66b`VR4~|D0$~FrrN_IMOEY@}x4hy~a28TVJRpUA)d#w48Fy8IHdhd#X9|4Y)w(X@+-L&X8S|Zf0@BACf{o(|!ldWFh+{J}@DIevtCE{K)?B-rEGNXQBSHgR(Fp2I$pY z_WkK8h?cu4RSY^2h6=%V>)#dxd0vm*c9Ekf=8P!9RuqS6D}`=E>3)v44jRuPMca$$ zq4$#r`)ox)zmWZ1j{P*fnM8La`P*kKbhuqK^Om4n1OI`UKc_AsPm3+dE9k}H;@V&z z&3r~_WP>SSLIyE#Mw%8|GTVwaE9j^Z_@-N~>iqUub(J)fX>1T)#j1l}RZY%*R!uwa zw$x19%1_v74<6HY9_Oi6;`Ch_LV!M$5KZnad3nin*s6Cm*l08sNG>B2pNmMB#e+MG6#hF1bIY9t z-0sH(fGg_{eQQ}_Zt(P{+7;TQ0 wTm@59D|0_DRxoalka-PL_BYivT%ng5y!OdGKH=r!CGc|d+P7TSJhP)e07_St!vFvP diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index c348309c8..a419c6c1d 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -23564,7 +23564,7 @@ cont { element { scale: 12 lines { - width: 1.0 + width: 1.1 color: 1297305067 priority: 330 join: BEVELJOIN @@ -23574,7 +23574,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 861097451 priority: 330 cap: BUTTCAP @@ -23591,7 +23591,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 5459435 priority: 330 cap: BUTTCAP @@ -23608,7 +23608,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 2.0 color: 5459435 priority: 330 cap: BUTTCAP @@ -23625,7 +23625,7 @@ cont { element { scale: 16 lines { - width: 1.7 + width: 2.6 color: 5459435 priority: 330 } @@ -23641,7 +23641,7 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 5459435 priority: 330 } @@ -23657,7 +23657,7 @@ cont { element { scale: 18 lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } @@ -23673,7 +23673,7 @@ cont { element { scale: 19 lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } @@ -23689,7 +23689,7 @@ cont { element { scale: 20 lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } @@ -23718,7 +23718,7 @@ cont { element { scale: 12 lines { - width: 1.0 + width: 1.1 color: 1297305067 priority: 330 join: BEVELJOIN @@ -23728,7 +23728,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 861097451 priority: 330 cap: BUTTCAP @@ -23745,7 +23745,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 5459435 priority: 330 cap: BUTTCAP @@ -23762,13 +23762,13 @@ cont { element { scale: 15 lines { - width: 4.0 + width: 5.0 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 1.5 + width: 2.0 color: 5459435 priority: 330 cap: BUTTCAP @@ -23785,13 +23785,13 @@ cont { element { scale: 16 lines { - width: 4.4 + width: 6.2 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 1.7 + width: 2.6 color: 5459435 priority: 330 } @@ -23807,19 +23807,19 @@ cont { element { scale: 17 lines { - width: 7.0 + width: 9.6 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 6.0 + width: 8.6 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.0 + width: 3.3 color: 5459435 priority: 330 } @@ -23835,19 +23835,19 @@ cont { element { scale: 18 lines { - width: 9.8 + width: 13.0 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 8.8 + width: 12.0 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } @@ -23863,19 +23863,19 @@ cont { element { scale: 19 lines { - width: 10.8 + width: 14.0 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 9.8 + width: 13.0 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } @@ -23891,19 +23891,19 @@ cont { element { scale: 20 lines { - width: 10.8 + width: 14.0 color: 1306645694 priority: 140 cap: BUTTCAP } lines { - width: 9.8 + width: 13.0 color: 872215006 priority: 150 cap: BUTTCAP } lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } @@ -23932,7 +23932,7 @@ cont { element { scale: 12 lines { - width: 1.0 + width: 1.1 color: 1297305067 priority: 330 join: BEVELJOIN @@ -23942,7 +23942,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 861097451 priority: 330 cap: BUTTCAP @@ -23959,7 +23959,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 5459435 priority: 330 cap: BUTTCAP @@ -23976,7 +23976,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 2.0 color: 5459435 priority: 330 cap: BUTTCAP @@ -23993,7 +23993,7 @@ cont { element { scale: 16 lines { - width: 1.7 + width: 2.6 color: 5459435 priority: 330 } @@ -24009,18 +24009,18 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 5459435 priority: 330 } lines { - width: 6.0 + width: 8.6 color: 1308422622 priority: 154 cap: BUTTCAP } lines { - width: 7.0 + width: 9.6 color: 1306645694 dashdot { dd: 2.0 @@ -24041,18 +24041,18 @@ cont { element { scale: 18 lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } lines { - width: 8.8 + width: 12.0 color: 1308422622 priority: 154 cap: BUTTCAP } lines { - width: 9.8 + width: 13.0 color: 1306645694 dashdot { dd: 2.0 @@ -24073,18 +24073,18 @@ cont { element { scale: 19 lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } lines { - width: 9.8 + width: 13.0 color: 1308422622 priority: 154 cap: BUTTCAP } lines { - width: 10.8 + width: 14.0 color: 1306645694 dashdot { dd: 2.0 @@ -24105,18 +24105,18 @@ cont { element { scale: 20 lines { - width: 2.4 + width: 4.0 color: 5459435 priority: 330 } lines { - width: 9.8 + width: 13.0 color: 1308422622 priority: 154 cap: BUTTCAP } lines { - width: 10.8 + width: 14.0 color: 1306645694 dashdot { dd: 2.0 @@ -24593,7 +24593,7 @@ cont { dd: 3.5 dd: 2.0 } - priority: 180 + priority: 332 join: BEVELJOIN cap: BUTTCAP } @@ -24604,10 +24604,10 @@ cont { width: 1.1 color: 1308622847 dashdot { - dd: 3.5 - dd: 2.5 + dd: 2.0 + dd: 6.0 } - priority: 180 + priority: 332 join: BEVELJOIN cap: BUTTCAP } @@ -24615,19 +24615,19 @@ cont { element { scale: 13 lines { - width: 1.1 - color: 861097451 - priority: 170 + width: 0.5 + color: 5459435 + priority: 331 cap: BUTTCAP } lines { width: 1.3 color: 872415231 dashdot { - dd: 4.0 dd: 3.0 + dd: 7.0 } - priority: 180 + priority: 332 cap: BUTTCAP } path_text { @@ -24636,15 +24636,15 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 2950 + priority: 2954 } } element { scale: 14 lines { - width: 1.3 - color: 861097451 - priority: 170 + width: 0.6 + color: 5459435 + priority: 331 cap: BUTTCAP } lines { @@ -24652,9 +24652,9 @@ cont { color: 872415231 dashdot { dd: 4.0 - dd: 3.0 + dd: 8.0 } - priority: 180 + priority: 332 cap: BUTTCAP } path_text { @@ -24663,15 +24663,15 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 2950 + priority: 2954 } } element { scale: 15 lines { - width: 1.5 - color: 861097451 - priority: 170 + width: 0.7 + color: 5459435 + priority: 331 cap: BUTTCAP } lines { @@ -24679,9 +24679,9 @@ cont { color: 872415231 dashdot { dd: 6.0 - dd: 4.5 + dd: 9.0 } - priority: 180 + priority: 332 cap: BUTTCAP } path_text { @@ -24690,24 +24690,24 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 2950 + priority: 2954 } } element { scale: 16 lines { - width: 1.7 - color: 861097451 - priority: 170 + width: 0.8 + color: 5459435 + priority: 331 } lines { width: 2.6 - color: 872415231 + color: 452984831 dashdot { - dd: 6.0 - dd: 4.5 + dd: 8.0 + dd: 10.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24715,24 +24715,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 17 lines { - width: 2.0 - color: 861097451 - priority: 170 + width: 1.1 + color: 5459435 + priority: 331 } lines { width: 3.3 - color: 872415231 + color: 16777215 dashdot { - dd: 8.0 - dd: 6.0 + dd: 10.0 + dd: 11.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24740,24 +24740,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 18 lines { - width: 2.4 - color: 861097451 - priority: 170 + width: 1.4 + color: 5459435 + priority: 331 } lines { width: 4.0 color: 16777215 dashdot { - dd: 8.0 - dd: 6.0 + dd: 15.0 + dd: 15.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24765,24 +24765,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 19 lines { - width: 2.4 - color: 861097451 - priority: 170 + width: 2.0 + color: 5459435 + priority: 331 } lines { width: 4.0 color: 16777215 dashdot { - dd: 8.0 - dd: 6.0 + dd: 20.0 + dd: 20.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24790,24 +24790,24 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } element { scale: 20 lines { - width: 2.4 - color: 861097451 - priority: 170 + width: 2.0 + color: 5459435 + priority: 331 } lines { width: 4.0 color: 16777215 dashdot { - dd: 8.0 - dd: 6.0 + dd: 20.0 + dd: 20.0 } - priority: 180 + priority: 332 } path_text { primary { @@ -24815,7 +24815,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 2950 + priority: 2954 } } } @@ -28428,13 +28428,6 @@ cont { } element { scale: 12 - lines { - width: 1.0 - color: 1297305067 - priority: 170 - join: BEVELJOIN - cap: BUTTCAP - } lines { width: 1.1 color: 1301171741 @@ -28450,7 +28443,7 @@ cont { element { scale: 13 lines { - width: 1.1 + width: 1.3 color: 861097451 priority: 170 cap: BUTTCAP @@ -28477,7 +28470,7 @@ cont { element { scale: 14 lines { - width: 1.3 + width: 1.6 color: 5459435 dashdot { dd: 7.0 @@ -28508,7 +28501,7 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 2.0 color: 5459435 dashdot { dd: 7.0 @@ -28539,7 +28532,7 @@ cont { element { scale: 16 lines { - width: 1.7 + width: 2.6 color: 5459435 dashdot { dd: 7.5 @@ -28568,7 +28561,7 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 3.3 color: 5459435 dashdot { dd: 8.0 @@ -28597,7 +28590,7 @@ cont { element { scale: 18 lines { - width: 2.4 + width: 4.0 color: 5459435 dashdot { dd: 8.5 @@ -28626,7 +28619,7 @@ cont { element { scale: 19 lines { - width: 2.4 + width: 4.0 color: 5459435 dashdot { dd: 9.0 @@ -28655,7 +28648,7 @@ cont { element { scale: 20 lines { - width: 2.4 + width: 4.0 color: 5459435 dashdot { dd: 9.0 diff --git a/data/patterns.txt b/data/patterns.txt index 0328ce2ef..3d59004ca 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -93,6 +93,9 @@ 7.0 1.2 9.0 1.7 12.0 2.2 +2.0 6.0 +3.0 7.0 +4.0 8.0 3.5 2.5 4.0 3.0 6.0 4.5