From e8eb741a95058e780dcd7db295fadb6a2c0d404f Mon Sep 17 00:00:00 2001 From: IsiGebauer Date: Tue, 17 Dec 2024 22:00:07 +0100 Subject: [PATCH] redefined the roads and pattern, removed debug commands --- data/colors.txt | 16 ++ data/drules_proto.bin | Bin 425199 -> 424959 bytes data/drules_proto.txt | 202 ++++++++------------ data/drules_proto_default_dark.bin | Bin 409522 -> 409442 bytes data/drules_proto_default_dark.txt | 170 ++++++++-------- data/drules_proto_default_light.bin | Bin 410880 -> 410800 bytes data/drules_proto_default_light.txt | 170 ++++++++-------- data/drules_proto_outdoors_dark.bin | Bin 426567 -> 426487 bytes data/drules_proto_outdoors_dark.txt | 128 ++++++------- data/drules_proto_outdoors_light.bin | Bin 428036 -> 427956 bytes data/drules_proto_outdoors_light.txt | 128 ++++++------- data/patterns.txt | 23 ++- data/styles/default/dark/colors.mapcss | 2 + data/styles/default/include/Roads.mapcss | 53 ++++- data/styles/default/light/colors.mapcss | 2 + drape_frontend/rule_drawer.cpp | 21 -- generator/generator_tool/generator_tool.cpp | 104 ++-------- 17 files changed, 439 insertions(+), 580 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index d6161ebd6b..146a490a83 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -340,6 +340,8 @@ 671057702 671061056 671088639 +855703636 +855900794 856032768 856756480 856756497 @@ -377,10 +379,12 @@ 865356306 865871792 866144274 +867856511 868514559 868862139 869387687 869585866 +869892242 870704341 871230427 871954680 @@ -492,6 +496,8 @@ 1545508592 1560281087 1711276032 +1711341652 +1711538810 1711670784 1711677478 1712264192 @@ -524,14 +530,18 @@ 1720994322 1721144710 1721782290 +1723494527 1724152575 1724368575 1724500155 1724896680 +1725530258 1728053247 1931024665 1943327690 2147483648 +2147549268 +2147746426 2147812613 2147878400 2147885094 @@ -572,9 +582,11 @@ 2157739365 2159194530 2159483932 +2159702143 2160246963 2160360191 2160707771 +2161737874 2162418130 2162506037 2163123456 @@ -585,6 +597,8 @@ 2370396489 2371253590 2566914048 +2566979668 +2567176826 2567571981 2567645179 2567902208 @@ -606,9 +620,11 @@ 2576111654 2576201856 2576782726 +2579132543 2579790591 2580006591 2580534696 +2581168274 2582553856 2583230712 2583432731 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 498098164f930908e0bf534fa3e4c13fdfbd9201..9894c46f6443bb6c9b2fe40ddb3e1f5af5588b7e 100644 GIT binary patch delta 707 zcmaF=Q}X|J$%ZYAKH7}4ru%9$%1tj&XY`x?RhyBY^;gS;6P(i-3mHYH7wIvIumJfD zlLeWD85yPr7&B@~0Qno(q=dKxX3YeFpY{-%bNT~4Mh)Du3i=S)8O$KPX<)$S0HMXE zGoEG?n|{WSQ3zxJ9wj_Rgp^2kigQh6;S$ZrOwTA!tkg}eOwLIKF;WwYr{}3N27r7i zH~m&FBR9x@$`DqNF{AnPGZjFwM|zB=5SEfYkhLlwC^qvrqX@`#($kmZGYUeuK$jqK zS%9`qpZ-f9D252hD-A8ckZdf5g(Q#<2}uEPNU{L=8>Y*Z0DTU$R1Jv>v>D8uF?}9L zmiaWqdLfV!WHC@^poxJTGIx4_5u+l)A(G%I1qC|;7<{mY(bEg{7)9YR%=E#2dZ00* zCP+ObiqD<_fj{;zdip~>Ms+;Wiu#P|0_ZU~z5h5cz(J9VLki>#>{9J3Oc;Tf35c12 Pm<5Pgx34f^bN2uMEeHBn delta 985 zcmezWUGn`;$%ZYAKH7}eru%9$%8BT3a0_X0o;?EsZ|nvBue>>nd-}vGMp4OAOcsnn zIvhOsrFpSSPd}r}s62gk6(jfbN7{@c)A{rm`5{~<14fPM0dQ`R4x`%i32^Qt5cdL{ zt9=Zp_n#i4B1A8kYp0LQHS84Uy2!#Mnvt2FQJz?-n_QWklL}&_CKgu$ojcr*#?S_+eH->FE!& z8O1=+&WR!8V8EyaN&%QM0Xo360Za^-G7~^Dz;waM4l`fz7^560X-K1r08 iZ%&_M$f!8v(|Y?3V@4om0%B$$W&vW>?K_Ow+&utYdTmz# diff --git a/data/drules_proto.txt b/data/drules_proto.txt index edbf48e1ee..bbcab95a8a 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -23139,10 +23139,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23152,10 +23148,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23165,10 +23157,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23177,10 +23165,10 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -23190,10 +23178,10 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -23211,10 +23199,10 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.6 + dd: 3.2 } priority: 330 } @@ -23231,10 +23219,10 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.6 + dd: 3.2 } priority: 330 } @@ -23251,10 +23239,10 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -23271,10 +23259,10 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -23291,10 +23279,10 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -23315,10 +23303,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23328,10 +23312,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23341,10 +23321,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23355,8 +23331,8 @@ cont { width: 1.1 color: 2572571903 dashdot { - dd: 5.0 - dd: 2.2 + dd: 3.5 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -23368,8 +23344,8 @@ cont { width: 1.2 color: 2153141503 dashdot { - dd: 5.0 - dd: 2.2 + dd: 3.5 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -23389,8 +23365,8 @@ cont { width: 1.3 color: 1716933887 dashdot { - dd: 5.0 - dd: 2.2 + dd: 4.0 + dd: 2.5 } priority: 330 } @@ -23409,8 +23385,8 @@ cont { width: 1.4 color: 1716933887 dashdot { - dd: 5.0 - dd: 2.2 + dd: 4.0 + dd: 2.5 } priority: 330 } @@ -23429,8 +23405,8 @@ cont { width: 1.6 color: 861295871 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23449,8 +23425,8 @@ cont { width: 1.8 color: 861295871 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23469,8 +23445,8 @@ cont { width: 1.8 color: 861295871 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23491,10 +23467,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 2.2 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23504,10 +23476,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 2.2 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23517,10 +23485,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 2.2 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23529,10 +23493,10 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2566979668 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.0 + dd: 4.0 } priority: 330 cap: BUTTCAP @@ -23542,10 +23506,10 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147549268 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.0 + dd: 4.0 } priority: 330 cap: BUTTCAP @@ -23563,10 +23527,10 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711341652 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.6 + dd: 6.0 } priority: 330 } @@ -23583,10 +23547,10 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711341652 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.6 + dd: 6.0 } priority: 330 } @@ -23603,10 +23567,10 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855703636 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -23623,10 +23587,10 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855703636 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -23643,10 +23607,10 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855703636 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -23667,10 +23631,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23680,10 +23640,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23693,10 +23649,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23705,10 +23657,10 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 1.0 } priority: 330 cap: BUTTCAP @@ -23718,10 +23670,10 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 1.0 } priority: 330 cap: BUTTCAP @@ -23739,10 +23691,10 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.8 + dd: 1.8 } priority: 330 } @@ -23759,10 +23711,10 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.8 + dd: 1.8 } priority: 330 } @@ -23779,10 +23731,10 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } @@ -23799,10 +23751,10 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } @@ -23819,10 +23771,10 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index d650977593ca7249f51c0ee36476a3036fca2cd3..5053aa417e1ee02add7813fa08b738eb689f1abb 100644 GIT binary patch delta 805 zcmdn=U*gd}iH0qVZBmTSrngHm%1sv%XOxLP4XE~*WxC9u$;DbGcW^hnA z#bm)K=c^0%^qbkCXz0zd5`G^fLKK1oK2 z>D97~{Djo(2C9(&nlqOfWKJ3wusJ|zvFQueGKx);VHCozV!8uCCDNVZTo0MKL^Cqe zGs+Vyb(1TTb5cQ!)WqWH0^*D^(~l|u1Lk!oBlq-o3XIASmXa)^`E;uwpcua-qd3Sv za!6dD)8(e`0?FQ5%_stNrXqp|auO1k1!(=_={0hU(ulBUoz(d39Ov|aC`M5UY=I4w zZUYCl064H&fc$OK_eU{`!5zboE(Qurkl4KG_R&Cfi`IgjC4?pf4lXn?kON;%FH-iHP~LXF%YOJ&eYdI$&}z8lnc|AyBGANgdNKtY(x0r3&ma dVDDjgo;?EsZ|nt*|JpH|d-}yBM$zd73XCGG zK>le?2!E3tqsa6JGK~DwZznNwPk$iCr~#7R%m$HGl4n#y<|je}&qES=(9U#AzyFiH+4SGfaS^_`hZJR>tbqdc)vH@Px7Cl$mDiOjK zfKozS0<&g<0HXtpo}RD3C@KLCPb|{YH^?!HfkKy)AEp6HProO}s0GrunGKsh1$jmd z+_DKkS#X>(Bk7%fcMYQ)C@Q4cVRnE;fU$up0*a8o)2$R36$ev5F;fsEiE&-G^b>GjX0z9bTe5- ze%4dKl{m#@!6@Xw!7rr2X$%IR?FE3+4U+|#g;^OK6izWsPvl}0nLbyZ zQAiRfv4KrWh)ZDBOc3~K51~07reBm~l$icNo{^uB8U+PLehHvCGnhfBFykC$as2D6ypep6&r zocg* zMS;rG_?<%n=D**ua Cnk6&< delta 730 zcmdncDcR5^*|3H2qm=P4W-h6W%=C=%#7f=d%H*6>5F;fsEiE&-G^a#Jhl5v0gY)be z5O`xR@PFmaS=`ebjTl9zbILL*PwzHj>g82p6q@dfD&~tR#?mRy^>zAf8AeHw!RD;*)A!3UN^4+qmXr{e zz^s`dz~}&@r*p_M%JIW^PZKXAKtYNra}X5Rz|h5%VUz*N00Wwn z9cF&tDn>bYSfdHUf*VyB6ykrUFI8Yv98@9R-mAn2#7scU48$xz%(}f-iA`Av03>DX AasU7T diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index e289c6aef5..87e439cead 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -21882,10 +21882,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -21894,10 +21890,10 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -21907,10 +21903,10 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -21928,10 +21924,10 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.6 + dd: 3.2 } priority: 330 } @@ -21948,10 +21944,10 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.6 + dd: 3.2 } priority: 330 } @@ -21968,10 +21964,10 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -21988,10 +21984,10 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -22008,10 +22004,10 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -22032,10 +22028,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -22046,8 +22038,8 @@ cont { width: 1.1 color: 2572571903 dashdot { - dd: 5.0 - dd: 2.2 + dd: 3.5 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -22059,8 +22051,8 @@ cont { width: 1.2 color: 2153141503 dashdot { - dd: 5.0 - dd: 2.2 + dd: 3.5 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -22080,8 +22072,8 @@ cont { width: 1.3 color: 1716933887 dashdot { - dd: 5.0 - dd: 2.2 + dd: 4.0 + dd: 2.5 } priority: 330 } @@ -22100,8 +22092,8 @@ cont { width: 1.4 color: 1716933887 dashdot { - dd: 5.0 - dd: 2.2 + dd: 4.0 + dd: 2.5 } priority: 330 } @@ -22120,8 +22112,8 @@ cont { width: 1.6 color: 861295871 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -22140,8 +22132,8 @@ cont { width: 1.8 color: 861295871 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -22160,8 +22152,8 @@ cont { width: 1.8 color: 861295871 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -22182,10 +22174,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 2.2 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -22194,10 +22182,10 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2566979668 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.0 + dd: 4.0 } priority: 330 cap: BUTTCAP @@ -22207,10 +22195,10 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147549268 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.0 + dd: 4.0 } priority: 330 cap: BUTTCAP @@ -22228,10 +22216,10 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711341652 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.6 + dd: 6.0 } priority: 330 } @@ -22248,10 +22236,10 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711341652 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.6 + dd: 6.0 } priority: 330 } @@ -22268,10 +22256,10 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855703636 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -22288,10 +22276,10 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855703636 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -22308,10 +22296,10 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855703636 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -22332,10 +22320,6 @@ cont { lines { width: 0.9 color: 3008779519 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -22344,10 +22328,10 @@ cont { scale: 14 lines { width: 1.1 - color: 2572571903 + color: 2567176826 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 1.0 } priority: 330 cap: BUTTCAP @@ -22357,10 +22341,10 @@ cont { scale: 15 lines { width: 1.2 - color: 2153141503 + color: 2147746426 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 1.0 } priority: 330 cap: BUTTCAP @@ -22378,10 +22362,10 @@ cont { scale: 16 lines { width: 1.3 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.8 + dd: 1.8 } priority: 330 } @@ -22398,10 +22382,10 @@ cont { scale: 17 lines { width: 1.4 - color: 1716933887 + color: 1711538810 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.8 + dd: 1.8 } priority: 330 } @@ -22418,10 +22402,10 @@ cont { scale: 18 lines { width: 1.6 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } @@ -22438,10 +22422,10 @@ cont { scale: 19 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } @@ -22458,10 +22442,10 @@ cont { scale: 20 lines { width: 1.8 - color: 861295871 + color: 855900794 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index a0ad6815adc5155ac8f5f744c6c8e2574929970e..96f9d8879784989af6a7875cdad038fd84522dab 100644 GIT binary patch delta 704 zcmX@!BK5sls$mP`Srx|p)6c0ehE2b(z^FH!ON&u_`Z;w*w&{}DjNH?UwHPI*dxOOI zHIT&2IDgvDnh64&(?4o4N>4uvBv8c+_|w3E%>hD-K@@sxGm2uD>B1o+!Nj#|x{5ku zAi4vklQ10!6Em0|0CI1)Jy6MKkRN~!6rJ9WET%X89Ef|`1gJ#(D5J>q1YJhf=^*!E zl>j*pO@gIUoNLeYQccESG^cTXux9`Rf$4>y(18aas)PkF#31SABEl delta 703 zcmey~EOop^s$mP`Srx|1)6c0ehKV?E@Cs>g&YB4VAMFK>|JpH|dAdLaqv-U&1B_zR z1#}n{rb|^Ya!;QG;!aRS;qqy~xWNY*MWzd=F-lDrsbCbG4&myea@81Fr(e)ul!llG z)4@8OUlUo3rBj^i+;jnT#=ybpwhPmJH5r4|v4xwI5SIWXBpDr`^mP9Nj1r(wl;TI1 znE;Xj1}F|0VAx8r!%Xo!$S4O2UIj+R=@2$BY%yfP!7GYI7#PB+!k|FDHoZriF>>$) Za{F0bMj&PaVrC#_0b6WUDVbkyHG3re}r^6^aIY*R(kzxA8eT)**6EqkVkof^> zj8fD2v>Dkrf7;KQ2?CtcC+=qyoBlw9QHmcTf+@o~{emu|D1RClusJ|zF}Oz7>HK=Q zq(5i_&BdmXrBj@1*YtjM#z2J2r(2mba!;SU59l6{!;!c^cPmWaZ3U9u&nN zMCs|Ptbs~S9D*nTy9-$i4W|BMrB5s={vL-MJK0;@<9cp zrU&RUiVK`Q0|I~SVf6HgN{r&u`*ay4a7bNHW0YWrM&9&&hZyBR0S|F8sxZi6WUDVImG3yh0kBvu1+8M|*+Sv(L_Ao*r1mC^}t8nNf0j zoerby^yn%^?&--IK<<8It{FsvWj~|HbQ@hpsp+9rjDpj_+-eXvK$DRTNy#oOVm~p( zSUSbI&P}gYXAB&iZo4pjhbCjN2DWgM655ocF=B@)`?Zfz4jjIyBA_5f6#)e>st71}QA9w2du{r6ZN|vK7r5;fdW=BK1jNih O%mT!$+b#6iY9axbVBz5a diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index aef59784e4..721744e5aa 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -22748,10 +22748,6 @@ cont { lines { width: 1.1 color: 861097451 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -22770,8 +22766,8 @@ cont { width: 1.3 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -22791,8 +22787,8 @@ cont { width: 1.5 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -22812,8 +22808,8 @@ cont { width: 1.7 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.6 + dd: 3.2 } priority: 330 } @@ -22832,8 +22828,8 @@ cont { width: 2.0 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.6 + dd: 3.2 } priority: 330 } @@ -22852,8 +22848,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -22872,8 +22868,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -22892,8 +22888,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 5.6 } priority: 330 } @@ -22934,10 +22930,6 @@ cont { lines { width: 1.1 color: 861097451 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -22956,8 +22948,8 @@ cont { width: 1.3 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 3.5 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -22977,8 +22969,8 @@ cont { width: 1.5 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 3.5 + dd: 2.0 } priority: 330 cap: BUTTCAP @@ -22998,8 +22990,8 @@ cont { width: 1.7 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 4.0 + dd: 2.5 } priority: 330 } @@ -23018,8 +23010,8 @@ cont { width: 2.0 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 4.0 + dd: 2.5 } priority: 330 } @@ -23038,8 +23030,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23058,8 +23050,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23078,8 +23070,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 6.0 + dd: 3.5 } priority: 330 } @@ -23120,10 +23112,6 @@ cont { lines { width: 1.1 color: 861097451 - dashdot { - dd: 2.2 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23142,8 +23130,8 @@ cont { width: 1.3 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.0 + dd: 4.0 } priority: 330 cap: BUTTCAP @@ -23163,8 +23151,8 @@ cont { width: 1.5 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.0 + dd: 4.0 } priority: 330 cap: BUTTCAP @@ -23184,8 +23172,8 @@ cont { width: 1.7 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.6 + dd: 6.0 } priority: 330 } @@ -23204,8 +23192,8 @@ cont { width: 2.0 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 1.6 + dd: 6.0 } priority: 330 } @@ -23224,8 +23212,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -23244,8 +23232,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -23264,8 +23252,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 2.2 - dd: 2.2 + dd: 2.8 + dd: 8.0 } priority: 330 } @@ -23306,10 +23294,6 @@ cont { lines { width: 1.1 color: 861097451 - dashdot { - dd: 5.0 - dd: 2.2 - } priority: 330 cap: BUTTCAP } @@ -23328,8 +23312,8 @@ cont { width: 1.3 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 1.0 } priority: 330 cap: BUTTCAP @@ -23349,8 +23333,8 @@ cont { width: 1.5 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.0 + dd: 1.0 } priority: 330 cap: BUTTCAP @@ -23370,8 +23354,8 @@ cont { width: 1.7 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.8 + dd: 1.8 } priority: 330 } @@ -23390,8 +23374,8 @@ cont { width: 2.0 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 1.8 + dd: 1.8 } priority: 330 } @@ -23410,8 +23394,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } @@ -23430,8 +23414,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } @@ -23450,8 +23434,8 @@ cont { width: 2.4 color: 5459435 dashdot { - dd: 5.0 - dd: 2.2 + dd: 2.8 + dd: 3.5 } priority: 330 } diff --git a/data/patterns.txt b/data/patterns.txt index 79a0f76c6b..30c8094804 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -24,8 +24,18 @@ 10.8 4.5 13.5 5.4 18.0 6.2 -5.0 2.2 -2.2 2.2 +1.0 2.0 +1.6 3.2 +2.8 5.6 +3.5 2.0 +4.0 2.5 +6.0 3.5 +1.0 4.0 +1.6 6.0 +2.8 8.0 +1.0 1.0 +1.8 1.8 +2.8 3.5 5.0 2.0 6.0 2.5 8.0 3.0 @@ -36,25 +46,18 @@ 10.0 6.7 2.0 1.0 3.6 1.6 +5.0 2.2 5.4 2.7 7.0 3.0 16.2 8.1 5.0 5.0 4.0 4.0 -3.5 2.0 -4.0 2.5 -6.0 3.5 8.0 4.5 3.5 2.7 4.0 3.2 6.0 4.7 8.0 6.2 -1.0 2.0 1.8 2.5 -2.8 3.5 -1.0 4.0 -1.6 6.0 -2.8 8.0 1.5 1.3 1.8 1.6 2.5 2.2 diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index e26c765052..ecba304bf8 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -113,6 +113,8 @@ @pedestrian: #4D4744; @footway: #4B4643; @cycleway: #6E3D47; +@cycleway_mtb: #BA707f; +@cycleway_mtbexpert: #D98092; @construction: #332F2D; @track: #5F532D; @path: #944A12; diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index de6bcbac66..22e7594db4 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -648,14 +648,51 @@ line|z13-[highway=cycleway][!_mtb_rating?], line|z14-[highway=path][bicycle=designated]::cycleline, line|z15-[highway=footway][bicycle=designated]::cycleline, {color: @cycleway;} -line|z13-[highway=cycleway][_mtb_rating=easy], -{color: @cycleway;width: 2;dashes: 5,2.2;} -line|z13-[highway=cycleway][_mtb_rating=intermediate], -{color: @cycleway;width: 1.5;dashes: 5,2.2;} -line|z13-[highway=cycleway][_mtb_rating=difficult], -{color: @cycleway;width: 1;dashes: 5,2.2;} -line|z13-[highway=cycleway][_mtb_rating=expert], -{color: @cycleway;width: 1;dashes: 2.2,2.2;} + +line|z14[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 2; dashes: 3.5,2;} +line|z15[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 2; dashes: 3.5,2;} +line|z16[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 2.5; dashes: 4,2.5;} +line|z17[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 3; dashes: 4,2.5;} +line|z18-[highway=cycleway][_mtb_rating=easy], +{color: @cycleway;width: 3; dashes: 6,3.5;} + +line|z14[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtb;width: 2; dashes: 1,1;} +line|z15[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtb;width: 2; dashes: 1,1;} +line|z16[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtb;width: 2.5; dashes: 1.8,1.8;} +line|z17[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtb;width: 3; dashes: 1.8,1.8} +line|z18-[highway=cycleway][_mtb_rating=intermediate], +{color: @cycleway_mtb;width: 3; dashes: 2.8,3.5;} + +line|z14[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtb;width: 2; dashes: 1,2;} +line|z15[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtb;width: 2; dashes: 1,2;} +line|z16[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtb;width: 2.5; dashes: 1.6,3.2;} +line|z17[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtb;width: 3; dashes: 1.6,3.2;} +line|z18-[highway=cycleway][_mtb_rating=difficult], +{color: @cycleway_mtb;width: 3; dashes: 2.8,5.6;} + +line|z14[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 0.9; dashes: 1,4;} +line|z15[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 1.1; dashes: 1,4;} +line|z16[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 1.5; dashes: 1.6,6;} +line|z17[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 2; dashes: 1.6,6;} +line|z18-[highway=cycleway][_mtb_rating=expert], +{color: @cycleway_mtbexpert;width: 2.8; dashes: 2.8,8;} + line|z13-[highway=construction], {color: @construction;opacity: 0.7;} line|z13-[highway=pedestrian][bridge?]::bridgewhite, diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index ae93e06ac3..c8d4458d0a 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -113,6 +113,8 @@ @pedestrian: #F8F8F8; @footway: #F8F8F8; @cycleway: #5654FF; +@cycleway_mtb: #04027A; +@cycleway_mtbexpert: #010054; @construction: #BBBBAA; @track: #635730; @path: #A05012; diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index e20f20b340..2146dd0c18 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -321,27 +321,6 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s, TInsertSha ApplyLineFeatureGeometry applyGeom(m_context->GetTileKey(), insertShape, f, m_currentScaleGtoP); f.ForEachPoint(applyGeom, m_zoomLevel); - int a = 10; - if(f.DebugString().find("cycleway") != std::string::npos && f.DebugString().find("nocycleway") == std::string::npos) - { - if(f.DebugString().find("easy") != std::string::npos) - { - std::cout<