From b4617fe9358bc4aef61c9d93721e84c74fd1e163 Mon Sep 17 00:00:00 2001 From: Jeroen Hoek Date: Wed, 1 Sep 2021 20:39:07 +0200 Subject: [PATCH] Render highway=busway, alter highway=bus_guideway Fixes #4226. Introduces rendering for `highway=busway`, an approved tag with over 5,000 uses. This fixes gaps being left on the map where bus-only roads are present and mapped. Fixes #3396, #3581, and #4567. Makes `highway=bus_guideway` match rendering of `highway=busway` due to an increasingly small distinction between the two in reality. Moves `highway=bus_guideway` to road layer. --- .project.mml.swp | Bin 0 -> 131072 bytes openstreetmap-carto.lua | 1 + project.mml | 29 +++--- style/.roads.mss.swp | Bin 0 -> 180224 bytes style/roads.mss | 211 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 203 insertions(+), 38 deletions(-) create mode 100644 .project.mml.swp create mode 100644 style/.roads.mss.swp diff --git a/.project.mml.swp b/.project.mml.swp new file mode 100644 index 0000000000000000000000000000000000000000..ca4112b4391285f1d96e02637bc9071d0748404f GIT binary patch literal 131072 zcmeF42bg44nfJ?tIg6s}%AG;!9+;l#o=n4l0}L`U%qTMimrz!?-Cay2>Q;5r2#R@i zam{f}D1zeZ8VHK6Ij!g_h85TNnKSOX=2gDm`<`=duI`?mo&nve=lOS6oqO)d;Z5f~ z<?o$75`HCEtrze3^MTi#xN|2>+8tDaaWOmzIxo@QO1%=y{V>$GaKrEbuhGg{%v zHo?^=`qQghL1T5R?KgvN$M?I9QhTIQ>U3MH+nv_=exzgzCV zec+xyz=oe||9>;}{4O^9H2eQ(TOs%Uoo)ET?EmMbp5N7mue1NJOg%ryhCkT;|9a~A z18w*z_Wv(a&mUyN&#?cGzLWXl%6G60Kh^$!Vd}Zd_eu8oH&f3aV#8s?tRy8L-zUmQqTX!hCjmo|4!=p!)^G{_J6@Ps7wEEZMf^- zqf^gax^8^EBK7=k_Wh&m|GU`^b?M*ThA*@KPe?t#hYf$M{a;Q!zo!j%{rI-j^F!_P zZT9~MQ_t^Z!)x~c-E4tf`R;AQpJ@MIka}*ryWslirqpx$+Th=y1qLlJXn{cs3|e5& z0)rM9w7{SR1}!jXfxazJsul|CdHPvlL}1b#|NmPU`k#WEz;nTqKnI)+c7e@cJy;D^ zfWyE;z#YMF5f=OuR6rSwgEin=FgZ7Z_khd6!Qf9YMn48$0Url%1v6k8oDa?b$AcB% z{@_nAV&4Yu2X6*10Z#%IupO)h4+4LLq5C2Dckn)N4R|GZI_Q8hI2CLLBjA4Ei!h1r z2X6sKfLFs~{R%$r6!2^K&2NGmz`@|f@VCMvKMLF%d>4NDqu|}(72w%m8dSj!uo;Yi zL%`j@?_lUY09JvAfFB_*cnXky_>5x;`}SI&2VUYcJT%#=PZWo|i!b(uPuQ|+t9Rzf zTX%TF-O^+*a;!caTH$RYWT?~XO->E1^oAx%wa!dwR=!p{wdq=Ove+p#Cw&Q+DRuo$ zajJAtsZ*8TlNfF^c~Z8O zg+zfVNXhTC$UjqP8*WNl!bU_hme6Xa)d(|n(ZXD8KsqC`Sm~XxbIbOvyH40T+$=SG z3Qx%?m;Q*A>!j0mp6U(n+PZz~3A=)6Tu|4*6HDDvK;bI>xc=5C{)Jt?*$p&c(x*eZo!N2fU7ww7H3=Q@ zYSnRVfJ$rH?`S-a>R)(KtJN6yj&cFDrU_VY11hD;ls{r?8;pD1PR~@D5zzKK-I^bm zQh0o{Wu%cck7B(wQ7BpDjC1 z^jt%F+ji-=F1UwL6lr?R<5+KW)#%s}%d{VgGqq}WYT5WWxz}CTlusvjZD1;?ou@^E z!wmnKR!irf9bYo<8a)jOsJ#3PDojoNGDThh@4YBc;##s2E}UB<73 z*JKuSJ2t%Gm#VE93D=^?m+4x)UYhia;rhZdkgr`4%U$=75db&|Fzh~F(TT#M1j zi}#D`kwpExa4@Wv1!~(#!;jl}=J2whQmXq!s?%!Jn47K6vLon4x^Z;XnoTR$tXMg! zLnJo8QmGCP+5X9_W#L@6-D#EyskwBcT|Q$Ab}D`>QuIU@Si9u9aiME%wBWksC{s?m z^vqjMJM5NbkeN*)Rspv!ghA0774O6Oz7H*WK$#M`aUSjcNEH>CBEm9d-TmBfHIyv|BZHzSMg` zx720-O$WPOBOT7lRq(aT;H zdb;bCD&1bGUY~_9+v9t+E<~u;o$|eKM0sbOy1h_rW2X(-b(nWXsZ(q90#5@Za+$Z9 zm3psACbWy+@u2<+x0jX-$;~xu3akN!(i|-?eVH$nF5FHRqIIHF5Bvg6)F^c!VVje* z;fS|R|Bl+fOjh18E6}F(t47z4jjh?VapO^&MmMY%T6V-6+hpR7;HBVvuo*lQ z{0`pz+u(ZeV(@e@1>6pr=O738QTbJ;(1xoxt01KVMQ7$Id8+-bzq2!PVO(9WZ?VW zRJYp>##gVNtaYb)|tVrg-Gf)Oog1P(A22XX$3(_2V&w))npph zDpt3ENE4k*(Zr|FBIA^RV5);sg%pJU|4;bv^We>e|95uY--h@92zU*c24{k!z~6#f z;s1XHz5w0@-T+NmjZ+B7+tfw7{SR z1}!jXfk6ulT42xugBBRHz-`|G@Fa75#E@>d+iN!cy0>HJZo{(7`hoCK&QtG0;nD?b~!eZ7~ zV`i*>hV27W84NqRqDs!NYD3nnGxNR;x3Bvsg~e1(tz9QttuFkVv`*l6rfU^tL!&GV zqwNw<112Z!Fb#8pGk6^?#9N9qqj(3>w8s{8M64w7{w55tEm$NuF_xfNnUxie2oo)Q zbEVc1Mm!Q$Nd=vJz-zCPI(pNqL_lM+kO;|c9U|8nCX$SY61w^BP%Ng0ZL`g)-fFdn zq6U+6!e^!!iKoVXvc1ani%29A2~*A;6wN)~?A6`(R5Z2In)ZfmOzeuOO|lA7nBk!= z<_u!yIX0U2G#Wcctyro2|9@eBemXYn!vDMT^P>A-2fhUF{$cPIAUu8toDMdD`+y(8 z%l|tNJAl`MOF;#k1P%qihtK~$cs|$x4hJ7Z-f$JT3|tJ(2WNxh!5CNu?gjoAoBW@F zPl7jt-Qdw+6dVlh1b%^?{+GeWz%}4?;Q8PwpamWWM!~`0kJ$776#OT6KX@~EIe0ec zfF0lna6j;0*!x&;{Xc`HH+#mw%|MkIwg*e^VCfC#&t5LQ;d}PWFyu^7oa`ZaH5>RQR^Hr5=JCed z$8~ca$2d%7dEby5D`|zlJ~vJeJqu)24I@gCX|KzTgoPWX{2ie;*5*bCP~@;xY77kG zb1K9J)iBS;QqLc|Q)by2TehFRbyw;|cEeq}izl9mil^2bwp(}I?BJuT##VSEBiZ@#4mH;eu_6T`Xss%>rAcwO2k?vG@ zU`qpJ)Fik1kcN;WO|}wZ{hI8hh$FEPus$UJ&jC4~4-Tw@B<3W7%OL62gG=+V+@WhhvlrQ}(9WJNAlyQ?6 zB}D(b1;o6nN@>oXC3Lx*{xW5gT#N2)Q&5tbKtHWHO!mKFtQe-6VDO0SY>%)6gxSJeHNYsbIGLA zH@WQHI5%0ifgR>x1JeBt`Dn};G8J$sD9f^_sUiA*IWPbBK=^;>XYTdz{!axJumgMs zUSIV5PXi6`b9nokz%}5hK=k^L2dlu>;qhMw?hHOby6*t5ae3VKLdii11}!jXfk6ul zT42xugBBRHz@P;NEpVH+K$2%s;ZTwd$l>t%b9W*L2-O*=uu-n7Z8xG*OzFMWgeM*Y zu;;IH)mDa|Q87YUg)(s=f~4X?#c7n&)VJWYVZ_z34AKO#Z+5Z;Il`_Y<{|OMqx_+< zMMfAUTz{iAEgpyDE7FGmJ8StmT`N_4m2Ot>U?m*tlz`I!F#(5^%>~2ENzw9!3C`Xi z^{z84h}X;dN{TEH(kU)T6mU_o)xpjn)5u1qnCxR21fi0?E?zFIn;HGyY<0y`K=u`} z>PJe8#Ar|Up%YU#TY2IcgaA9Dks`HMvv#BcMM=(d4DP+cUsj|a{tlG@VTjWkm;md} zMtdaF1|s*)1lrnIIe7mH%_n!4#??P%|MZWMG(t!ntC!5ex>as}TPG z2K3HXqN5i6-}%3PCp`b9U=nNvzlZ0)3G~2W;5+d7ZwJo7yoLo6Wj|(-Tn?d9;^kA0I#Ob9dH^D-+cdyUj1_L4Dfhx6j%oS zjE?=EK?{5dJ^RbRrJw=M0%wA}PrOUzI~|nl%)xpt&7xb4TewqevI`!p=h9Nq$EY0# z>$$Ph*b5EmZL*$6{U(ZQyKZkbOSYa%j0J@z0($DvtlXQMt<~jNBKGUz)9MAAu_~-h z;`R+1syyrAZK%|%cUKj%x#<4sb`aTW7q%hjVNbn^JmoWN&Ra!E~R9{t7{VH2N-U4LB6C5?q?n?tLp){*j~9+g^&e;lKW zvYzgG%_)DTS**0m(5M69cUGgAu|MJ(+LcWD zR#RMR$!SrD0QIS5Eo+ow=WsG7oMm>jWj=;(v*LXx-{&VFlpPtCRVL__4QpqPP%~mg z-5Pl1R(DD{KXW2lw4MV{#18-)k#<_YKtU8QJMuZ^V<76BW#g;?TI+^QLT)=5=MmqehOovIo z>nV@Sa_n`)6KZ|PBg%|zaCp9IM*aucPaRAM3olB2pUF`n`UEQx3WOL}a> zq`344HK@)4&SS7;V`XBS+wR$WW&K-lP3w7Skx-twM11nbUX2oozA3kEr@&%yJ*4v5eH6M^{mzX$klc>iyM&w_V?%fa)3oD1l8_Wv8m z0iFZ8K+Xni0rvy9AP;yUm;`qR*CG?R02~Rv3(x-%@Otn9@MJIn#Ap98U?q46xGVTA za)2Lziu||ofE)P#79e*0e?}(oUGOPz6}Uf;`aTMXFaIA=|1X2rf+7(4z$cIi_~2x) z2{`-wUm+9tPw;Qxz2FM)5+HJe0GtO-1Z#lE4}OB&U>ckaP6q41!QidP4W0u;o}izo z)9nlsM~*7CvBKL}&*zL-5zN-Db@5Q_q>z$1ti4LMTc_Xdd?$C|MW+GXZ0#aEush*t{Cbv6$MjcDc}qHxWlL zouDRCWiA>p;x1X-5+$^G#^1Km?2$1?;hKku*D~Tf>7!(A`cpr4fk{SBv_|fBy+pqF zb2g_o!yy<^=QUCfThquuaq)JbhQg4Pi?NhF{nS@kYg%!=FU0Cecu|1>ZbmeK_@@JtGRk2z{ zPtoi`r_0+YMojLBbS+sX5mrR$?^deBn-ChKHfbCZL6(3DF*Q%^)ZXX{;SRhu zevG=Uwjo$tjdEVMii9X@d9l`Lw>n*vE|%I#=jzCWL`~F!v;TZct2vlzL&@VXoG)`r zP5MxRu&1GPd&pEg|1Xz?m;(kO!JRz1FqAr_z$GOm|r~v&uRi zLB$1@qYI0#e1belG7Qln2$7q}d5G|hkXMkm!XM#d*FXs#KW{}&oNmB=RJm2h<0iU( zunwzE#@&Qt&K_Fs#rqUm*tz%y2L{S#B|WDdHBR_bj()1Ees?BHWf+j^T&;Z#nbW#G8FZ8KS(+ z#VvLsD=}BE$R3jz|3V*!Pml37ZrC(BI(o!{Zv5z<&avLw#ie2v#=WK4<7<>jVSn&s zF3qLq%5?i#0AFTH;0Cf0_b-4k%WO%}5&29XDzPA}Za*TMqiBzl8y z?g@eP%ACjhNq&h!xT%~7bR%>rZ=~r{kv^xpY;l(QKB)MqEwdKLWS*A>?JFZO3xci% z9e*OxhK9;a1Q8{rQP<0u3`LcQY5eu&JdpiU30E&-&dhU09<-t#d=O z!g=9G^#yK-6B}7$6nR6UP&rAvBbsJ+SZgFoVcKSwizObC7`8BL*X#NJ=fFd+faeze zf0<=RzX`8@E%;y-HVek-e5cn0k{;z>gfVY85z%cj~djD?%@#Xhc@FH+`@I`e0{|rvDb^v$c|5woe ze+;}EJOykAj{wqUp9j~2*MaAOi@;gnWUvAJ4Y(`#4Q>1ba1;12cqe!kSOXpouEP%C z%gz>H-pwuEulQI=TtytI82a2q%(b7ju5rs1-QR6h?puu`BeB+3c-T`!yr@<>y$s*lL~C*1s3Tl8G8m z)HO(w`zeUEeHlqRim$e8E2;-HcjWA|btAlS^Bbbgm-A6`x_27PFg2{Z3KloUXFQ zd1>dn9wx1{h%}99BxxJ$Mz;=~BZm|EHIKE`@lM@x)-aBDIz?+9!poQ)X}^g2H|T0| znodu?@=#PRwQ6@NTO(7FD5YQ}?hc7=MsGHL-!{u_ue`R(w3C)R*+!Y+kyHA-66TgJ zQL+PU@D$TNQ>T&mG8`@CWn3Z`xd8JfvP;fQ z)mVxON{xrC@zh?LH@WN+lm39&H%XNiVc(SdTF!!R*z-9QyC#BLe%zr$`s#7^61i%x zU9aI+)LlHs%9&^>RoJ@|9@s*@cQdqO~Z@7?R|eRJ(Of{&NBw@_^c^krCGF zCG7I;5qayMuNKHX?(#fgZ53w>%>Ls{hjrO@X<|eo+cs}ES#UU)KUwM-w|sTkB(2jt zIpyWc0S}YW1ozfgdR(Knx5h{rjd#4r$tA68Yz=zq?_civ({H(Pr1yfhPuV11_$wJV zqJ-V4e`~jMAS`{fOO>DrO&vrT+@TAV0!f@o54h!BZNO?(2Ah1Fl?&@a16Fx$#J+)j zk@%f;U2C^b`!m@9`DM^?u=iz<^Y&8C5iXFUkRw{cf@Wd=MD6VgM~$OVwD2qqfuP6h z!`DZGVAdU4k7s(DZYa!B@}J9y*6I8A-kGY3fBI}QdvC$nPeLI4zns^91rYxKL6-OY zBK-Zkz$=0H0c?SDz&JPp90L9Xum59kGx!vEH+Um>F_;1m0)KXC&&$&eA`Dt!&;o-N z7_`8k1qLlJXn{cs3|e5&0)rO#zu5wD7I&cGqc!&DQG~x14d3=HyLP7~Kq`WA!cHTB z;&MQ%OdD1Ef7t%Q=SBC-mzte!zl6X48n_X>54;6D85{}j4ut2w9=r(b0n5Q1zz^W} z{{wssh=0JBf@c6Z`(Fe*!Es%fD-G`0XIgE6oS+!y=? zJAiM1&w%%XtH8^_v%xfYBG>_r0pdg8_t*%06r2Vg48DVHz*Ru}3+@7U1z*Gl;Gcll z2b>Nzf+27)_#^uN?*L~TApQnl4K4#u0_THMz>(m7;1>Ey`s;H!_5yC*P`y$7QX`cl z72IR_FJkO@#pG6uIIDJg7Sa%G2aa&L<{{^V0BL@xH1GM5B$|zJ~X-dVYP*^^xx?W+V$G`Ysh7Rx#LmMtOo z9`8|y4QMEEC+vPDca(4>C4*%~Cqv}@WQgmtbZAVse}FZ@TA~r1x%o4HqYj0>Grv@= zq9h9vSH^`?p4n4u*DmzYcBYODCdQX)6Ni^eQsYxC6no8HqwIH>snM}ib3JuD4$Ykt z!`)!5iJ`G$ZfBE8L=ty{_{vViiVqI69LPeDcPUnSg16h-mxP>VIo^4R*8PhcTH+67N2@CrfaaaLF8h@d6U0z04YlYh`|8;~ zR_*MVtj|uinz0z_Oi{aF-ws$Ol8ledzr2y$r@_s{jmG%?T%O(9VLa!_5)fZmBVufx zC0RE-tTolUY^;aOLS|-pB2Ho%jlGZ_M;Y5X=5ZK(e>RM6Ps#f`6BV$9h+1eK$AWIz z=u4}H3)Fn>GnQ!i3Y`$*JSD#O7`oUMcg|IA4nD?oe4hcnuubiNEFgVKn4W?jpCqxh zPh(H?|0D4H|7Q9BC&u`H@c|(Gzt{m>4qgZ@26Z5|0H=VXfCt1M;9J2{z)EmW@Jsmn zH-iQ^9c%?_!Gpn{;OBn^*aU{b1Hq5s`@af41+D|H2P?pv;Q0>+ABNAr5#IeBK<)~77FY|G1GzKcYnG>f z3;+KS1mG-i4Di5Rz|Z09zW}ZVr-EDI<$nmi0Nw}Q2%ZC)U>Dc~9u5lN`|$Cf1y_S- zfG2_--~mAT;!`=iz3rO(e=;s&ANUSP9H=78!IilfRoyGkl<t6I`d%7q4q zR=C2vi$$#Y5g>q>41bkHq@i(IYNLsXFgI4=tG;IZ63We2@>snDs^e96fwzQa0w%c3 zX~Y=LBj)PhHqpMH__3#^i>oPwJ*DO9fbD0ZH^g|j)GRhiRo{4|kE-p$jqpjAY&qQ! zXGfh}QAKiL{LD!(GI7gbIujReGNB_e74^+tAuZqnf+=KPa(hJo?8B7uvbSqyI`_rx zcXJfNC74$RyMd(3u;8t7j%-~TnQZgV;AJ-h+Bup$$!Y9-z`G`tYuS)MwmNc~dcr0A zz8zq=J3tKTaVqvX%nXkz4=!S4ozOifK5pUoXaIn#c8qTEKKJXYV^^PtsY=BqQZ zYpn49kA$QAlyH^k|Cd|t@%}@O$|6v%sg}$4>ztf)76gTmqkcCvXXT_5Z+A zUjVLyuNMFMZ-9qB3|tSNd=B^~{PEv|!@#}3kKlnn3|Vq@Y+q^=J->$(A5QYrqvtT1+|F9dylQTT}xN;ePx#qEfluX}(`Tk z*6RW!8ww6Pzyd5^gUVE^r6rzf1#SE#=yzI{yIdz}a-W)J%jHySldbv$^leOomyIhI zFR{j(;aOs%)V7n*YKNO?GCdNbBKoCk2?!avq9*AVZ6V8Nq$5d{JYp$A!K@H9xV@%; zVNimX(5L3sLZd`y?|?R_1w|J>-IQ+c+cy#=ooZC{j?YoY@Un>t{0PifNjuSEwe>;n_{Ny?t$slId)4CEX1};Q;6{Guzy`h zx(Lb5rQa_(xodfpORfZolLSnHYOU9h*z9D63}VkOB85Smm0I6L!q53~h=lYMbM-K5$xN*Q zUqe&aZIW3xJE?A}G#{xy`E`7#C7ptZ$;>s4kXMM@a`w;RA!xI9CR+(KW1vy0qo7d9 ziQ8zA$e9VQr|-37ILcy+Hklc_89S-MxMpLO8=k09Wa$&G*`%oqc^N+euZ<;CU$H4Y+EF^hZXrD}%+bxq?dV}4ZNMVSncFMV z6ty%d;!IyUNBT~##*=SQJw0)bVu&ES3CRO4+rwr}$hFKkN;XZuUqf_htBZIDBP7z} z<{$PY{Z{HU9JM*Ycd4+1Yw6U4r^q!YUGYg^+#?i{Sul(Z6_goIt}S)2T+qV>g0?xA z!TK&k2u57GXnqx+YhlA~5qV}4N0Ia65W+ z0b|=mO%H9COE_?Bzdy$J$~8P>`z144T?guDT`+sI0Jg?(Kx+TrfVtiV-!1%q+cMf8hX0rQ z|IPrS-~R)0fOmmcf);oJ*alXChXc6};AhAPz6Ndt*MTd+%fPe1Bsd-%4n+TdXYdPT z2{!|${}=oJ7lEgN4tP9R1D1pPgWn)?_y+h4ct5xb$XS4A1Mw&LL~sOnugD~T*aX}U zd=2@;`@z$JoDJ9owtz>1dxAe8xA+P8GWa;S7F+@T5u62nh&k$U?3IF9+gR@F4L2kcE5- zya!wfUIZ=%d%)S?Bp|*84+nC7;Lr5kkH8nfQ-JiP+%G#s zd4Di{x%;G&Xyle$1pCmaiFmonlqC{BN7uy|rHPi($erzK5s93Q<2+;rZMgx&55~jw zgdIeTZG|3IyRqg^OQP_(8Sb|RGR4)pEHfpg%`D2jq%7wWHRhikpGS z$$2{&BK=*#W>qZOq5MfN&Dl%6oxPMD7>3bal0|a<;WFPrtIdOD&~;?oG3wqCIJe_P zug@*@^LRE!j1)|9Q7^I$wZ01qQ6uRZHdh2)@WU7O=X#%}tz4-_Wt^JYs9_V>bu%nl?19H8Z3}V4GCguvR3Ej=#>b&B>n_aL+S$NV zI&6tnt|k5E)CO@vRB|Jh)03FR*<3}O)~ICDcIpj%YvH<)Y(i;iXg0=PX+o6$7gka1 z&V~QK#4?S~hv(l39t8dy-u^p4{QF%Bwu2+V_u=8+3B-5c-vhDpKL?xw)&sfs??K>J zc=ua?ob~@4xDv=Yf4LW+1xi5d3dG+32yigC3-~p>{P%&J`M(BS0bT?Ga4y&mjsZj9 zA>gjy=kWV41U2wj@CW#NIR_y2|1+QnP62Wj;6dO=@b_|$fcORYC4Btnz;nRq!1)9? zi0{9KcmEpr2zV#B99#x226b>YI0=Y9fP=tq;O)N;J`ZjHa*p7Y;2EF`s$e%*1MUlc z4d4HL@I`PvcrADyxCBgrv%twl!=+nF8r(ko}X=68bpWphE4k2PHlbi;@Z-aOK$ zYM8?rzoyPn#roEo!Ny)pQ_4|+r6T6zNXdc=kpBmal8j0eXY5@=EJa(U_K+oO%T&73 zW`=^fZ5lFX$1+@7*p{&ZFL*o0A_eQpK=+_ny-XuIofmt8i8t3)9(A;gFY`H2yLpti z8DzFrDnBZiqJ%B7P@1k~sF(PzouuheH=&NCLDcj}j*3Ovyh#0-u#aBY+HJ_g zeKQ4$)!Q5j8#xv|cWI*7oo)NZ-G%!VjZ+!AwnE83&)NDQV=4AA%FsB8Y$ZAQpo=T$ zm((AXRa$=18Gz(OR6CJK4j1b{7Af~$nsAk@j4af}$fUfWbd}y#NB118^NyPK3b*WIQ)%q8Ho%Bf1@4u3loMDQ&wla(1HIJn1H#A^qQ7ztHYdR8^I_$~Cv(KiIdITZX6u0BO#pA@b7mPOQSz0PpQ@@g!B%;CxrBLBJi6|9u^bn&{kUaw zVcwr&iQDSf_1u)*G(#1G5{yWUy>AVBp}HP%;CH;R$@ll0oL=nz4}GE@J;5K~{Y6&rQSdtO z58z3l2F?Uqz$oy*J;5K54g3`RC-@ln7w{_ZbRcpA@gpE-8@_{#;MHIXh)+SW8(0kv z1qXp&BRBXy_&m52tOkdI`+`3sH#h{`1;pidI z0*1l8!PDXS?+l&-Pk#sS4fysK0O8|T0r3qe{rCsz%lSVt!r~v>0>D{;X%+)#-XqGCO}P&z!Gv(GHf3U4I-qpRO_bYL~DX~bApsSlfLt#+VE3Idr8$DkCD1pI1-{Q!qG`Ju7d^BI8BV? ztVttBFZ#4W)aAC5Of$InTHOYxTR00UiB@ZPJ> zE_Zyjn)O*vPq9FR&sZv*#01QE!0Vg)QQ=VR;=E3HvygZSQvbN1ux5>fwtXp9mR=QHN{wYi3-br*)VuZ}i z2OZ{#+3t)72PR_Fz>E_ah-Qe`Ymv+-X_cy6r&#hrrz0Hv!E}PV#hTq!wgiWHyE*ai zVN1lY)-RkKVK8?l{gvL7uCp@ot0;50JCRWs4aJpCZxgKYcDHPL`*wIeN6u)p<4&>@ zlJxVb3Z3}Hz3B0|-H`3#HI|LnHklO7h=g3B`^s=^e zU@U*!;c%d;BzI~hR|b1lE){6J3M2zv;gg|>1m_;x`!;maJiaTA8vxPBna6}LW6fsz zCazpIQR4l#kgjnlB%1xUYag{Lv}K7JXC5Dah97oPf8-qO1+Ik|#-ZOK)=g?=Nyfz~ zlSnz!Qdu>~{vA@L41JVGQ30don`dmP4o~)yxQsqEzLfozh(cPG(W39sMweflt(g@{ zHr6ibftO0#DBHsG&*6*vv)OVMaihD8m2EFuOeS|&b~no0e6qCqVp}X)IK1#9vvPko zn(+Uyv4vM!{{LLdH@*ViUU>Z-Kz#hY7asmKK=l8og7x45;C=AvmjJQv-wnjKzxeXo z1U?L(Eq?pNSO4iiboI-?-NFCBTVD+(!O7qV@Nx<=3r+&7fY|0=10OB^`p3Z#xHtG6 z{PbJEq2L;L<_o|%U^^HC4+3`tKY?fd5)j|~?*^|0;>+*JpaI06pV;Bw0#E%}AU^w_ z49*3Q2BY9mAU65Ggx~%a_#C(aTn%0Y#J}HqundTv{bul9@K4|$z$};oJHfF)`1FT@ zyMy1;<{t*{0@D7k0O2Pb1$?pdB&o7C_gNR>@pQnP;DqMRhtf*Vu9R`wFMRI+&q23n z+x(*$IFFdy8qgG-gOITNQh!8^&cFtm25Z~+rf3$n*z@ibXS&Q0&R8nxB`j}3+C*Y+ z>B^?czkSnB-A>3ATfvc3D~G)_kKMDC-4?|-4rVaXPV;CZwG$iS@Ig3Rda+t+;tEHb zHnG*1?nI4h6ph4mZ^b)(A-&0LS%RKRRMHhC*`2nm$v~N_;k)~D5=H~rP!P5>Bgsw* zyV&ZRumR!-ZF{7Q4NwkWzxS&0BnRc`CzA9)#W;~%Qrcsg-BH8HuE{7*qa@<;!CWch zsL+K;X=GexXmc8i;p5u_qO5CnVp)dJ&)s4AMTk?s_8cT$C+8o*i;id|(S zGTCv1;oO$UsL;E%3FL@<7;a?yxsp05Qh#ZkJl+4A0qyyDr}I#JiuX|qNaGfy(DBcZ zNHKGS<9(!y@@lSxQ66Naj1rn7X_Vm1N2jfu9&?KDGOtR2E_&hgW3swA_%etz^{;vvwChIxD#)^;i&au;Da|Y&9dTjvi2+(hFrO62rv>p@0er6DT{oD5 zW*PgFyNKA@^j$+;g=BmsR^LqWwt6-TuFT%fLAJ6FhzyJQCak{1*QH8{ktw z`2Jhq?VkZ24Mu?6&vy{`DSZA{!3V*cz)Qe0KnoPXPH-$31|Nj)FM>yaYvAq0#$J5& zi(P#k$bEccK+e~{9*C{{f5VHv6HJ5S!C~Nm;11vyw9A*l$G|nP`x2Al)5-L%cj zSjf`RdqFB&@4QE-j!oS0+F`J7GHIb)#CuC~lH?2zpc#yaa~hjNRP1>UKRMMF%AQg& zmVngWk%rj=<}qVe_T!4pRNhg(FX0Lgote-p5Xa)8!hW5?`&zq%U#)_^6Z@mYrK9CS z;!|PM!C|<&_7_l#Emg=YieId@> z#3F`Y_j!bcDd`tY&JLla8E<*%o7?}w5w!%Pj~?qwWi4P>CJQ;&FYzvFIK#xqGhOZW z_uQTvPTEt%^!DyGGi~;MIuzms4!OHTXoB=xdV$Vi-bvfeI(6$f_oIc!vyP(xW-iULO(=SS6AkUE_v$t1yj$1+duqp6*`D}{a zZ?pboWGQr^vS(TUGUXPI*k(#~wX4Aqi`7OBmiM zDItF4%-88!DeJJtjOoNmZ?|_*E=buNA<;)%WOiLgN2K0$1Vg-Dy;{90=7UZomD#w` z+v{Elpv>${PA#cpxOCl~1XHxIJ7=fsGj4a=LZDbVsLG}WA}cdQ?cZE(^Y$aMl2T^G zR&iP|J2Dg1b3ZadqyrX`9sypB?BHqO zPM|?0e~3&#&g%aZdB6qWG$7~i?*l%EOhC@spAXIe*py-QZYoH}G=g24{mI@H5)=I`AqWZF~{1A2-MspldKXje(Oh7}4A9CF)9lB$xo{ z;6%XEa|My3h8!u6E76FdtDIskb^0!LmCc5N8IyYnu-4=Hx^+HA33k4wKgtenGhy}Bq6xhB%+RDMMh7=c13P zZqbEK;29a0;U!%^n)v>Pahxpmxbwv_8!oLpQDT20EtG$;oM=|M$hd{eFg5)at(b~Y z7Pb+ys*UK9wt&@wB}7G<#u8-M4yKh}bR5J6MaMzhfWx$6#foGHh>*`d&bXp>uW5Cb zdYmR|8gi+L(A#n=H3}2+QpO|3fEz|J4sA!Qn@7UoF_Tu#}yN;=CnVH zDGBqeU2CJGiB340Tk%{XDSovN1u%y)CQtE_74;k0`qIn3g_H;zfCfudKh@Bx({jBM zllg?cl4-8KqAc8fE>KdH?Mj`Q(wWg+8)4Uyr`_(Pw{V41ZOK(QiK3^g8TM%`mLZIC z$7n28nl#D?udI5^T+!3yc&J!Ng}-7cL7v(xZIdfiSb}8mZMjHNxs;q}*n<=_F} z_weyQ0yl$?0`Uv@M(`r=&+zuI1kVN?a5fOX|EqxW1^9FL{4as$gNwl=_!E5n55VWa z_2AXu0pP{(^Y;NSfS<1eId}hc`1yYYuLI8o%YmE;xEXvDoB+f(|2=^C0b(}3{xABUg668t^*HSP5kAa@mB z2BiI_K;Ms-_{=*$B=*3%5XbWP$w_XmHDfL(gCBo`|7y zC=D0?5h6QszK%~XQe<$u%2R>=MP^yyvQ{_+ zdF(zS#LA(xLg`UlW@Dr=E>CkTz+5I|WK8C!$~i9D68?WXOzUoVTH*hnWEt2?;Pa0I zkFq@f@8Ipf3tj^50bU0`FTVaC12%$(1M%}Oy#3dJ-06265MTc<1WyGQfG2_t;4p9} zApHK@z|%n!oCn0O|IuJMxIef9_!%;QuY=Ek_kke?5zW0H*f`0-%a0VCy4+HlAB1iZhxDng{t_Cj!&jdZ-gEiox;O^je$P~n` z;Pc>ma3y#dkbD2cFF^@B4r~I4fS)065MKnZ09_zH2u=nY!Qnve0{9KG2)PU3%iu%c z9pLrg`CtZ|362EcL?-c3@H+5x5P&jx9M}X71@{4RKj4pn`2YVm@E-7ba4C>}-vyTP z;|8))57?r+)8um0vQ$MV#%=2zuI-(k^J0{&HdWs(iv3@`5an^(>e#hRBeEzaGy~z) zVNRAFiUQ|3LT~EWs8!RKhJ}kqtQ9=DG9}RzvUV8TKkpdNnf#izl1K4(RaiVK!r(Fa zvqt``l|Sp`&wBZ@LH=x%KbsPgVzcV}^>-`XklU-qJyFbXVxB`Yw%M~c!5zp>&2Afi z{T-NA*tu!xRAb?+G}@}Zj;Ncs=Ib>%L6f+`NF@^Znj9M&Z4^x(kA@CP)W1?t6mJWO z845`g{yxC=K-pSE^*5$JeH%b8olhxo%qk#?9PiP`icYLPvH94k7FO0_1s7o2CM2G_ zjZkl}7s0N42@^TMtt5Hp-+$#)ntN{^C2R>5b$TIBKM`YTAFI;_bNbE5cdRc8oL?j~ z#o?-9sYEf9+QspZ({}BS3lL2IxU_Y-&z`M|uL|=@*m9`S{V4yFfnahBhk~@5tx&wC zw=oHj?A&Nh_225L8Qw2(i^%nPiOPuv)~ZHpO{1Z8S9hci2&AIP*hwCXHr?-{x$LlW zi67a3D2U~s9so{#D9vs@M(R~?KjptIZkT~|oBMGab&@N$IUD5)<61iEAV(lAv8x+1 zXkB)ut)j^u6ZZ{V-TXDWx^YUO_&i&0h|wZg5$s{a0s|F_!a#9cfr4d4}iCW z*MNTj7lDU>-_dci;0fSi;P>?57r?)Omw;!00F;2-5pWccyZ#OV+TW(H%>uP=J_eF2 zu3Vq#kI1dxZV?P^&c}=;OpJG0TaW_ur93O8Ha_9%#dvD+LP!L)TWt(F#ZDlf9S#Xp zo6_cEGg>oYjV1l~)>x2C%*X7coJy_`L+rUKwXShc(3;T`_0u>~C}BeiqdZk=)Hy#t z7g^=n$|djNQ@z)$4wr&Ttv1}Kt{*lWys;-(vBF#JtzWM)Qe54OFBmQp@jbrdp$yD|QN z`O9O6rZ9$hu!AN!n4K(m9#OF28E5+sU04G3K$t&p=aA!sFCOEq8`aMdkK1|X@Uoy% z!g{RgH(L-nB}T=vBSu$^j*jtn&8C%W;-k{oT80T7>y3?$E;5n0R0%S4O`QKT*(^-b zVB*d@5qIq_K2AJ7?`-Ze*LQIV(CiBD@WZ`j<#Ox7WwC*jC1~}Q>R1d*g)uB9 z&iG1|DSyQ3)PiwT#XaNPyYIfrgDx8gSEz|ApX7!h`=Of!9xKCsxqs5Ot#G{YE>T5w>q^+me;xp_w=3{a}^OGZ5%Srv-!JT4aZj4)cdyJ6ruz}raaYR zEH{aeXyK7}T{V-T2XK9IEn~)eI1tpSi5sBd$e-`(4ZQ|E-^snXA)TI=Rc5YrAa4~4 zn|XiEeaSfGvP%n{FPEH0c57OKhHG_F6|#hFYsT-$!mLrW$^Nn$C0(^>jLgGZ7{W!A zcMH+BjgLcg_&B9ja!m;FGvz9pu~84=x#Ufk>b0u;?Qv(#jPEsloXbLpS6e)6_8Oc4 zs(9*X7eoJ*9yTe2cl`^yVPH74WH!ngJO>3Br@8i0lLwb_l&~seqpVb-|34W%@ECYP z;s2*C|Nl$){%-?02T%e#!3JY{0n$I7y$j|BGv zx5Crk0{#W=D*$FMQk9~Vu}RWeoyX2eeVZ?g*INe)A2k0L^>$TTH>WOpQT8X z=iyBZvGPmBV?RAt@-r zT~D-{geL;*{bmxrLKop=--4>$Ugx?+I_E~>b8Ze1 zts9g3G`|~uwbpACWK@|?IJSaH3rBZ4bKMn&u_>Mv(5w)Gt6gyExc@R7WjLtxQB4vO z65rI|;jQ_{ub97Mz!n?A3DIvl$?PU*mQPng^It`|TIWLYf&3D4*qmT{Ji}QaB;V6{ zpHu5~P9E#l=lE;t95W}UBXYtPUntXZth!whm0N8elE$R?*OkjuBz#BPI`+<-Z#fx3 zD8yczbULT@`7Je^i78_?Il-k~TAOTeV(v>k`51aX89B*jN~{dUar;moRM;ygTb-CR zQwnPbZh8dH)zbxi&Hl;kJ34WaO_Xi;MC&G7(4M%yc*JJ2lzK1iYqPQ@R=bcPoySg4 z^=5w|>VmaQ;-%3Stcyzn#3JQnZWMRFLhw{@2Dl^mC4BzP;5zV3Pz9U7 zeZVK-=fwv>6+9k@P5&dnox%UmU*83v0bSF!`UC3XwL0@t>Wau+b_$o&1Xc_I2mrWzg3TDy~g%YX@Spgh2kp(8#U~S6+l;!!9t%j4s8T1VJP1MK0ZNdt0E*d|OH?#fVeNP#)uL z+^}i!qcTiK2KV|!5+Tm3kPKK;t1KBJ17uE{pd}utl3%P@`?)@H_1`yr;gXUOOFv3Y zpNzytT1Z8Y%`-^P?={sj$}Rm;xWo``*DmzyfeupjGP=v#zGc_$M9VMbcy;BGp_Z~e zGwU548kw(%Vrd7;p*~})>{m*?0QHiL&4xHP6jLub0uU>IRuJKItI`(cvoxcq;F6R7 z*#$Kt%yw;&9DVjsaWb$^17wBr3orsP8;|pjsLIY3=26lHu0%tOk?`6akyvy}6BD&c zF{n+V>&M=J$1bkx$@o5))0MHt$@WNEG^FlsP34MafW}^5>b9lgQDf&)Yx{*VbM5D5 zW;CUpfMD-Mj47>zjKdVM)^Cm@)`}Xzyr*7WTv<$zRSV!fuPnpGohGot@?6pWkS&vq zla$(tM8m183NDLifr~c}r zcU>=oVlp&}LATXT7`KS?=VB}^XKY0~MeAAO`TWzsGk%|u@JefoZBinE(6q%B^1v$# z6LTl$hQ~Z3G>=cBBldv=%2{X@zh?;le;&-?gT;3p{Qr<;6h-g<25=de248`<{}5<{ zBfz!r^3MX>!B^qaKLVOyGx&e-l50?<%um=kU2T zOKVTH)D>!?&)uyssuRqcPz$`S8IxWdaK@RgyMFaQzBY^ zUe#K=-fEzPuM~&4MpaiTM%xZ|#;YY8BCa}hm53rE*Oz+Qd}84yqTj$^Jy3&rao;4y z`k}k!oOg5y*3B@#ke0hoH--&1Sx)2HSQ@N>S)}nv8!MoFXsh90Sn1GvIHWFfl2z-Tru(CT(O_Gd^?v(FwBpM^Y8a9mGS>qk25FhCa{XT>v zZ3bpwPeM%lQ#Em1TBCi;u>@(!X&=2dmXe+DE}wY07ng6qRgj`BC;4DXEZ6i~tHLH( zP)4QUZn!@;CC`}D4tTBe@vTo7N4Kks1 z1FTr&TMwgD{U@WRT}^;}H+AO?Di{(hx@b*d z5Gr+3j%JVkVqj0T8k%c+3R8$uMQ5g}E~rFtrqv0iYHcldi*lNnQbTO(7u!Nptw2xl zNUBpDq?b}q$!1jo$fL*{355j(u8KsRAl^4iiw1_X}wnN$bcelgNf>Q zwd9K}*aY*Y$c30%kO{xjnMJnIfh;wSb0%sXobg(-ByyCPc)jj*v}-2BhQ3rYmumKW zI*C*8ozk>lRNt1198Hy0qrv1tPKsrW9juz=R13aO^5A?28-f<0+LE(Bx<+x+dsEjf z^#-Kz@C2kSy-!1^QtDtEO+~eS@{6@f2Qs4uCNL> zFw-U~!@O3}Z>@SAbIQeboxN?Hvb9UKPSi_7r@#bJLvJ zD)+EHiaObhyv*t}WY?}aHy(y5ZqdVjD|K~HmrG5(zpiZV9VnMCkordzFpZnZaUsjk z5MHUAUcJk}tOX6RAz0+tW1g~JO5vtB9iU%u^l!f~`g&TOcCA7e!WgrU6O~1^;Ty|$ ze$CM9GJ}JlIMri}W@?2gfEF{|j;{2^$iCiY#F!MIf!LC}vPVmHd}WQY_W?HAVKEqL zrDCRy8kvt&&6u&ZVP)R~kmn)NM^E}9KCw8f;5FH#N+)OG5+yNM+X zR{+(HEU%6*Funoux+MRS1L<>16j?fCNUU9!+aJrb?WtOetmH)!fKa-HE*^v0mf&;`sQE(@))c+O`w;wtMSYyH|RrA3k)>=;#)87}TJ8 z46@v`9iPK8Dr_Jesjf#8vcKlOpaiC|UOA3&XA2OgC~cUYHaw@wQNy*D44<>=oa&J) zj(cQYni-n`SN%l2w?1zBmJ_z7>JPDySNWk4dR$sy&6=?_Lo0GyBil1BTex`Jr474d z=&g@Kc~T_zj`=VAzfqbg_iss`LNZeHOER)+0PS9i=8y;yhGUOv&50IUzqPiFX!k@o zNlf-?RbR-P6x$zVDRlL4bht_sivAct}Zl;`?#t685l@>)V!d6Eu+q%HHNuPte+ z#ZtltE4q{F?3RKc{Rt>@g|h{9DE+|WE?{P&)RIC;jhx>_!y~Hw|8{ukZwo&S|NjX2 z&u0dn|6B0+TY=d0-xFK~Z+}lP13&*0^y;UA_ru382XBCvKN!ry%ijtge=T?rxC&nW zvEX0fO#33|d4H_jSth=1phWmg$H9sB2X*UfwQFHh4A$xKyy+^qNZ8`%} zN7`(U5c1jqXd$-*KraoMF?$c5XE+pA-I zCX>*KYF0X;_NFYVRpVYj7F=2LW5G~XZHOA7k&z9dPv|cjg3su18BcCgM`h6EEc8ch zRVb!%*3Gx_1#+K^X>1vwO6nrU`trz%{}n!HvKSaZU)Jo)nUjQM~OK|mHPs1V;-lw-i4bYHT(u?7=EVFlA~FUvV>;z zTlLmtjdS!NAxUQ_840^%uaHJ}Y?@6hRJlJ)xA8;fuK%B!#>+{V} zs)5+Whs2|an_pAs@-6|)Rjr(cCG+Yh+}irq>4N_Nap&bHH}D> z+;*Mo{pgu+`9auwL8W8lD`g*Xqptp(BY+7t6U$d_K|G$;>@aHQ4j0=ZnGUt#u0O4; zLVHXyX!LXl&G=n6n#x?A&4U0rl(`*~0@^|#44s6U;wh}C9Kx?Cp%&P2DAF-1P>5=3 zzL_J^Oo`NBjv8|wx{nMiA{PTy17+H z9x%rc{fcBvI7GKm(jL%h`LiM2IC;MrAim#JHWOwO@jZ7AGTyc2JNRI!DQk^nt0$*? z%}Qida8f7{0r?#fX=+#DE1@}2^XuBt(#sHaJSpVmJYN{1MlKi>detP3U=7bTx=}Q^ z0S>PW361EHJvVK z3XD7ri70{^VNi^AUU&g*r`4K}?B&1eL}j~=j-J5AhA-iNz$~$$z0slvH3e2_HWu)#AY_l++AK1v zJkS-PsN-24nxC;KG=m6t_h?tnF!q=RI=)O`&Iaa+obJBpDmPEkut!$VXS>C`vgke;3QE1E$~A*}tqpS~)ln5uTntE_a`s7|&D0u* zmnTDlC~yI774s`8W>#g}q3Th>jG;vm@X<(j_x=^RM_YvOQX-Ko>3<{D)AJGLch~G@ z45`^@4(3eEOz%V)_Ww3CQR}LdFp`$K5Z6T%j^&BPN{S>(tZMiig%A2Cd z8Fd6yTa%$cRCEX^KP28n4b_UYdZxuhm(@<~t`cOHNFk(n-H1}AOLBLl{I1kn2ovNR zia(Jn$XCD7#yOc@muV8P7ilZ?W7MkKF+i~dnezXz{e?qBr_Pt7E$=-6|Nkd=fARIV z3cMKp{}k{u`2WkmPVg}BUSt7hS^fV1LmnV@`0oKT;27{IAh!3{flEORh%f$6gSUg1 zfiid`xIefM`N5;X3h;X52hRl!um$`r_&u_Oo4_l0VhCX~VHB)ZqKyV?N)FAF1kccI*DzDiQHkWv zip_=PG{gr2ukI`&LWD%RgULQQV|6qWC2THLGb7^^#t6PmlAWl-Ey+TiDqUnA5RKHJ z*G8D3dO3L&mAd%{&!-au61iu5=atQHEu#f(l!PUe=={);Uhc8>m@wK;n?{E_0xW&b zKGW{8p=HWs_v}!`kLcWfPnX`twAzHCT&ts!_IN;_cS8PAB=hb^pSTH$5z%A6`@EsM zhZaS@^@(Me(Wuz5-|08l+{8#~xoE*1 zBf*-eZb!+a@pyQ@6hb?JsN<7C>AtsRb%r|(K=ZXvJT}jg4n6tOFHWV@GI99QCr(KI zO8wlAbX+?wjc7gnP{te)QvE2Q)*jQ=Y!2Pfu-6a;ksW}$PCtIv?$fsIc#Ip0_DzZAzeKlu%C!k7+t+Q9olaohb}5*>ykI) z0qL>OfjgKaVmjOopqvxIrd|IM$B&MKxrBH^$EA8iYP*oSvi>h{nUxf~dJ7!@I;!{pJ} z4GB+djboFOdnZ35N08;IQrt5gAA8I5yS?2e685GkR6hR?t6g}x<^RvMeDIUt|9=DD ze*yR@eE<322k`qHunBw-p8qQF5^yni7`Qw575x53z}4Udpa=dA90v{qcLhH~2Jm@s zEqE0W|9oYz6|4jg1pkXHK;#6U0&fFyK7SUR2R4AOQs{pG0XPpl2CN1LgFhfA_!jsW zcr&;R$X$G=gK=;uxD)sxvV%{9cLKSOPtN80;8d^%JQ(~LIl|Y#wcv%|DZmF?fcW75 zB{GFCfRBKyz)QiUU=o}G#5dmorFDFy-FWu6y|oUY)n3 zy*eBxhqEAdY{J&*Lc9m{fYrQ5VZ(#7N@l0e%*N>uXgGXjIs2m6?I(#$B^6^rAm6G8KjnY7RYt&}4SUH%t%lQY+5VFTgm!mZ{N%VjXd)Tepn$=wB>}kJVr0Y45E%il5 zDC%}|np2H~5Xw}H{!kqU6UQ1AEX)=N0YzC1w8Mj=k-$Ro)6s%C9H(6|GIQpmO@Bs) zqZym6Hf>TXsb2Pc9|zK=we+hwj5L3LkbBpRc=dr5V#Kz-+;4V2;2pH4%xw* zf%y6V6aDoaa2P! z5yINIGjYi!9a$$9d!mc)E;KSFO3C#dFB&U=A#3gNoMSe7>kQFct8##cpVn2BNlpIh z9^BTy7sQf@A_&dRmK#5EpA*ky8~PJ6(qR#5N>!M1rVaSw+K#VgJFsV$(Y|AXNu#Qz zPU3)J&Lz!RPVIvGg=#&{6kozm>E5ES0f(IUOvB~?vx;pRPkn(LRzrE9c< zrbp+ifEf)gR!Wo{Vw0@ zv`W=Lz1fXWr-JGI$mPCsITbm?GBQ7oOF?aQYkn|p-?2-Wrl)=wF-n{$a@H?>g^_b7 z9=<1eN_!^zQX5poddYCRq-O8a5Mo|JV_vnAZ)O+yXyvoJLhj8KZl3BXvHvqW&fe@d zu7&n;P0a2dI@6FFilYsgnmU>i14Rald=|HPytPxRnrW*{JLR;|U+IE6!U8ygD-3tPNVJa5<8t4eBTx&gI345`xq>vb`zY{B=kDhUW3O=(v&fM|14o@>Sc$%yoYP&UNL$x#9Ok!5JWeS1ot2|e14)IgCDNRV z&VodAA6{^ZNp1bC_OjrjI(hoy6qB)J5W(-}RDQ3GNi(t*Zw7%GH+Lh7;ry965#Sa< zoOhx3^hE3;UK=p)=163n3u&>NlOz2)v_!t4hZb;U(CXEz_#~*3Z0OqcGyl>dJqjN&fQJ;VQRvrOaF@crZ9X83yH`!@pN=Y^L)6x_w~@aMyqp9~%XeghAF zJ$NoS82kdBTX^xK!9BrG;IrQZ&IQMShl6{8Kf-7K1l$Zh2;^MAYr%7X==^Ko@4z^a z`}Ph22Z67{KMRljHgF193BCp2d_6b^`~jZ%lVAn-9X#`m;02%w)&cQBaBuKOc;z2~ zFM*GOcZ1gg@tuDY?eY%rdhn0nLQnlURO6TX|Pug4zU|T9$jQTaUrMTtI^nJ3r$f(JUt}Mf9X~U1!ggJy*tK!BgW8TJM_WygklB9-VAn3Pn z;=%)Xjv-Xaq#y5? zSPjZ=8wZV5%BL-E4q@sK@P^oEy|5lMNIec z{8#&Ol;;UhUU{Q2nSnj^O=hiCvFA!0MGsSO~Q;L zGoKB+?p~AKR!Lfm!l{LAHX>I zD_oHfcOk~6w65|KKr zs_y{8u}(N24xzCZYa=pQhv|Sd6Vbt)O5H=t>dbL;%FJ95w*{m^0&4Iw$kk~HWwxp= zzFx~A1N&`1+cy?mDtaz?_1@6)1=5K{=jFHx&v!}?xC{jnoSL?V=f=}fI8i|&nS@F( zc+dF1W%kQV4z39W?@gU3WT%=?Ocmf+mQ5ddvve&LLtNvF){Evn(e71g@!ue~_D0P( z$=V=`n9o3MS)xrVJu!jKT$H> B1rh)N literal 0 HcmV?d00001 diff --git a/openstreetmap-carto.lua b/openstreetmap-carto.lua index 8fc2c85212..b6f406efed 100644 --- a/openstreetmap-carto.lua +++ b/openstreetmap-carto.lua @@ -203,6 +203,7 @@ local roads_info = { primary_link = {z = 220, roads = true}, secondary_link = {z = 210, roads = true}, tertiary_link = {z = 200, roads = false}, + busway = {z = 180, roads = false}, service = {z = 150, roads = false}, track = {z = 110, roads = false}, path = {z = 100, roads = false}, diff --git a/project.mml b/project.mml index 2a685232c8..0d55ece65a 100644 --- a/project.mml +++ b/project.mml @@ -648,8 +648,10 @@ Layer: ('unclassified', 4), ('residential', 5), ('living_street', 6), - ('service', 7), - ('track', 8) + ('busway', 7), + ('bus_guideway', 8), + ('service', 9), + ('track', 10) ) AS v (highway, prio) ON v.highway = l.highway WHERE p.highway IN ( @@ -725,6 +727,8 @@ Layer: END AS int_surface, CASE WHEN access IN ('destination') THEN 'destination'::text WHEN access IN ('no', 'private') THEN 'no'::text + -- highway=busway and highway=bus_guideway are access=no/bus=designated by default. + WHEN highway IN ('busway', 'bus_guideway') AND access IS NULL THEN 'no'::text END AS access, construction, CASE @@ -999,19 +1003,6 @@ Layer: cache-features: true group-by: layernotnull minzoom: 10 - - id: guideways - geometry: linestring - <<: *extents - Datasource: - <<: *osm2pgsql - table: |- - (SELECT - way - FROM planet_osm_line - WHERE highway = 'bus_guideway' - ) AS guideways - properties: - minzoom: 11 - id: entrances geometry: point <<: *extents @@ -1863,7 +1854,7 @@ Layer: horse, bicycle FROM planet_osm_line l WHERE highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', - 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') + 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'busway', 'bus_guideway', 'pedestrian', 'raceway', 'living_street', 'construction') AND (name IS NOT NULL OR oneway IN ('yes', '-1') OR junction IN ('roundabout')) @@ -1958,10 +1949,10 @@ Layer: SELECT osm_id, way, - CASE WHEN highway IN ('unclassified', 'residential', 'track') THEN highway END AS highway, + CASE WHEN highway IN ('unclassified', 'residential', 'track', 'busway', 'bus_guideway') THEN highway END AS highway, string_to_array(ref, ';') AS refs FROM planet_osm_line - WHERE highway IN ('unclassified', 'residential', 'track') + WHERE highway IN ('unclassified', 'residential', 'track', 'busway', 'bus_guideway') AND ref IS NOT NULL ) AS p) AS q WHERE height <= 4 AND width <= 11 @@ -1969,6 +1960,8 @@ Layer: CASE WHEN highway = 'unclassified' THEN 33 WHEN highway = 'residential' THEN 32 + WHEN highway = 'busway' THEN 31 + WHEN highway = 'bus_guideway' THEN 31 WHEN highway = 'track' THEN 30 END DESC NULLS LAST, height DESC, diff --git a/style/.roads.mss.swp b/style/.roads.mss.swp new file mode 100644 index 0000000000000000000000000000000000000000..8bdb0189a8cdd972bee3fd61851deda26a1d26af GIT binary patch literal 180224 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

tRvV?tmab?tR(B6I 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 S<= 14] { + line-color: @busway-casing; + line-width: @service-width-z14; + [zoom >= 16] { line-width: @busway-width-z16; } + [zoom >= 17] { line-width: @busway-width-z17; } + [zoom >= 18] { line-width: @busway-width-z18; } + [zoom >= 19] { line-width: @busway-width-z19; } + [zoom >= 20] { line-width: @busway-width-z20; } + #roads-casing { + line-join: round; + line-cap: round; + } + #tunnels { + line-dasharray: 4,2; + } + #bridges { + line-color: @bridge-casing; + line-join: round; + } + } + } + [feature = 'highway_service'] { [zoom >= 14][service = 'INT-normal'], [zoom >= 16][service = 'INT-minor'] { @@ -1282,6 +1315,28 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ } } + [construction = 'busway'][zoom >= 15], + [construction = 'bus_guideway'][zoom >= 15] { + line-color: @busway-fill; + b/line-color: white; + b/line-dasharray: 6,4; + line-width: @busway-width-z14; + b/line-width: @busway-width-z14; + [zoom >= 16] { + line-width: @busway-width-z16; + b/line-width: @busway-width-z16 - 2 * @casing-width-z16; + b/line-dasharray: 8,6; + } + [zoom >= 17] { + line-width: @busway-width-z17; + b/line-width: @busway-width-z17 - 2 * @casing-width-z17; + } + [zoom >= 18] { + line-width: 8; + b/line-width: 7 + } + } + [construction = 'service'] { [zoom >= 15][service = 'INT-normal'], [zoom >= 17][service = 'INT-minor'] { @@ -1713,6 +1768,56 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ } } + [feature = 'highway_busway'], + [feature = 'highway_bus_guideway'] { + [zoom >= 14] { + line-color: @busway-fill; + line-width: @busway-width-z14 - 2 * @casing-width-z14; + b/line-width: @busway-width-z14 - 4 * @casing-width-z14; + b/line-color: white; + b/line-dasharray: 4 * @busway-width-z14, 4 * @busway-width-z14; + b/line-join: round; + [zoom >= 16] { + line-width: @busway-width-z16 - 2 * @casing-width-z16; + b/line-width: @busway-width-z16 - 4 * @casing-width-z16; + b/line-dasharray: 4 * @busway-width-z16, 4 * @busway-width-z16; + } + [zoom >= 17] { + line-width: @busway-width-z17 - 2 * @casing-width-z17; + b/line-width: @busway-width-z17 - 4 * @casing-width-z17; + b/line-dasharray: 4 * @busway-width-z17, 4 * @busway-width-z17; + } + [zoom >= 18] { + line-width: @busway-width-z18 - 2 * @casing-width-z18; + b/line-width: @busway-width-z18 - 4 * @casing-width-z18; + b/line-dasharray: 4 * @busway-width-z18, 4 * @busway-width-z18; + } + [zoom >= 19] { + line-width: @busway-width-z19 - 2 * @casing-width-z19; + b/line-width: @busway-width-z19 - 4 * @casing-width-z19; + b/line-dasharray: 4 * @busway-width-z19, 4 * @busway-width-z19; + } + [zoom >= 20] { + line-width: @busway-width-z20 - 2 * @casing-width-z20; + b/line-width: @busway-width-z20 - 6 * @casing-width-z20; + b/line-dasharray: 4 * @busway-width-z20, 4 * @busway-width-z20; + } + line-join: round; + line-cap: round; + #tunnels { + line-color: darken(white, 5%); + } + #bridges { + line-width: @busway-width-z14 - 2 * @bridge-casing-width-z14; + [zoom >= 16] { line-width: @busway-width-z16 - 2 * @bridge-casing-width-z16; } + [zoom >= 17] { line-width: @busway-width-z17 - 2 * @bridge-casing-width-z17; } + [zoom >= 18] { line-width: @busway-width-z18 - 2 * @bridge-casing-width-z18; } + [zoom >= 19] { line-width: @busway-width-z19 - 2 * @bridge-casing-width-z19; } + [zoom >= 20] { line-width: @busway-width-z20 - 2 * @bridge-casing-width-z20; } + } + } + } + [feature = 'highway_service'] { [zoom >= 14][service = 'INT-normal'], [zoom >= 16][service = 'INT-minor'] { @@ -2437,6 +2542,32 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ marker-line-width: 0; } + [int_tc_type = 'bus_guideway'][zoom >= 16], + [int_tc_type = 'busway'][zoom >= 16] { + marker-fill: @busway-casing; + marker-width: @busway-width-z16 * 1.6 + 2 * @casing-width-z16; + marker-height: @busway-width-z16 * 1.6 + 2 * @casing-width-z16; + [zoom >= 17] { + marker-width: @busway-width-z17 * 1.6 + 2 * @casing-width-z17; + marker-height: @busway-width-z17 * 1.6 + 2 * @casing-width-z17; + } + [zoom >= 18] { + marker-width: @busway-width-z18 * 1.6 + 2 * @casing-width-z18; + marker-height: @busway-width-z18 * 1.6 + 2 * @casing-width-z18; + } + [zoom >= 19] { + marker-width: @busway-width-z19 * 1.6 + 2 * @casing-width-z19; + marker-height: @busway-width-z19 * 1.6 + 2 * @casing-width-z19; + } + [zoom >= 20] { + marker-width: @busway-width-z20 * 1.6 + 2 * @casing-width-z20; + marker-height: @busway-width-z20 * 1.6 + 2 * @casing-width-z20; + } + marker-allow-overlap: true; + marker-ignore-placement: true; + marker-line-width: 0; + } + [int_tc_type = 'service'][int_tc_service = 'INT-normal'][zoom >= 16] { marker-fill: @service-casing; marker-width: @service-width-z16 * 1.6 + 2 * @casing-width-z16; @@ -2605,6 +2736,32 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ marker-line-width: 0; } + [int_tc_type = 'busway'][zoom >= 16], + [int_tc_type = 'bus_guideway'][zoom >= 16] { + marker-fill: @busway-fill; + marker-width: @busway-width-z16 * 1.6; + marker-height: @busway-width-z16 * 1.6; + [zoom >= 17] { + marker-width: @busway-width-z17 * 1.6; + marker-height: @busway-width-z17 * 1.6; + } + [zoom >= 18] { + marker-width: @busway-width-z18 * 1.6; + marker-height: @busway-width-z18 * 1.6; + } + [zoom >= 19] { + marker-width: @busway-width-z19 * 1.6; + marker-height: @busway-width-z19 * 1.6; + } + [zoom >= 20] { + marker-width: @busway-width-z20 * 1.6; + marker-height: @busway-width-z20 * 1.6; + } + marker-allow-overlap: true; + marker-ignore-placement: true; + marker-line-width: 0; + } + [int_tc_type = 'service'][int_tc_service = 'INT-normal'][zoom >= 16] { marker-fill: @service-fill; marker-width: @service-width-z16 * 1.6; @@ -2941,26 +3098,6 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ } } -#guideways { - [zoom >= 11][zoom < 13] { - line-width: 0.6; - line-color: #6699ff; - [zoom >= 12] { line-width: 1; } - } - [zoom >= 13] { - line-width: 3; - line-color: #6699ff; - line-join: round; - b/line-width: 1; - b/line-color: white; - b/line-dasharray: 8,12; - b/line-join: round; - } - [zoom >= 14] { - b/line-dasharray: 0,11,8,1; - } -} - #aeroways { [aeroway = 'runway'] { [zoom >= 11] { @@ -3359,6 +3496,34 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ } } + [highway = 'busway'], + [highway = 'bus_guideway'], + [highway = 'construction'][construction = 'busway'], + [highway = 'construction'][construction = 'bus_guideway'] { + [zoom >= 14] { + text-name: "[name]"; + text-fill: #666666; + text-size: 10; + text-dy: 6; + text-spacing: 300; + text-clip: false; + text-placement: line; + text-face-name: @book-fonts; + text-halo-radius: @standard-halo-radius; + text-halo-fill: @standard-halo-fill; + text-repeat-distance: @railway-text-repeat-distance; + } + [zoom >= 17] { + text-spacing: 600; + text-size: 11; + text-dy: 7; + } + [zoom >= 19] { + text-size: 12; + text-dy: 8; + } + } + [highway = 'living_street'], [highway = 'pedestrian'], [highway = 'construction'][construction = 'living_street'][zoom >= 16], @@ -3479,6 +3644,8 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [highway = 'unclassified'], [highway = 'living_street'], [highway = 'road'], + [highway = 'busway'], + [highway = 'bus_guideway'], [highway = 'service'], [highway = 'pedestrian'], [highway = 'raceway'] { @@ -3524,6 +3691,10 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [highway = 'pedestrian'] { marker-fill: @pedestrian-oneway-arrow-color; } + [highway = 'busway'], + [highway = 'bus_guideway'] { + marker-fill: @busway-oneway-arrow-color; + } [highway = 'raceway'] { marker-fill: @raceway-oneway-arrow-color; }