From d3fe4ab402381a69c436a475dcfdc265979d3893 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 29 Jan 2019 11:41:43 -0500 Subject: [PATCH 1/4] fix3439-opacity --- package-lock.json | 15 ++++++--------- package.json | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2685cf5f341..09d475cd4ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4755,9 +4755,8 @@ } }, "gl-error3d": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/gl-error3d/-/gl-error3d-1.0.11.tgz", - "integrity": "sha512-WpdmK19qH+6kW9HSeCf2/blELxu+0jevUPLvpKnVdRGirNX0yoEW+X4MFyFaVbqLq40aljI7opgLiDXOXVVX4w==", + "version": "git://github.com/gl-vis/gl-error3d.git#93a5f0f5efd8d1801d0024f374616a68389c634b", + "from": "git://github.com/gl-vis/gl-error3d.git#93a5f0f5efd8d1801d0024f374616a68389c634b", "requires": { "gl-buffer": "^2.1.2", "gl-shader": "^4.2.1", @@ -4806,9 +4805,8 @@ } }, "gl-line3d": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/gl-line3d/-/gl-line3d-1.1.8.tgz", - "integrity": "sha512-rTN7JR/F9soPOa35/Tn1bEsly/lEyDRXPftMVlk3iL1vnZUAlt2DtszOzxvBMhCmAk2RdfWqZ5DkciRikXVpng==", + "version": "git://github.com/gl-vis/gl-line3d.git#db5e4cfa81023bc49b1e826ccdbca5c702b50e26", + "from": "git://github.com/gl-vis/gl-line3d.git#db5e4cfa81023bc49b1e826ccdbca5c702b50e26", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.0.8", @@ -4937,9 +4935,8 @@ } }, "gl-scatter3d": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.1.4.tgz", - "integrity": "sha512-rliOq1MWv0d4E7y2IVb0hxC5vMaU238cdEhCcF/F2zQlIPD8ZB6ThIKa3D9oeT10mM/yjb70Tk604RWn5d88NA==", + "version": "git://github.com/gl-vis/gl-scatter3d.git#bf062279b2a6179eae4f6d068ed5e74672da14af", + "from": "git://github.com/gl-vis/gl-scatter3d.git#bf062279b2a6179eae4f6d068ed5e74672da14af", "requires": { "gl-buffer": "^2.0.6", "gl-mat4": "^1.0.0", diff --git a/package.json b/package.json index 2d2c70906f0..618b6155bbd 100644 --- a/package.json +++ b/package.json @@ -73,15 +73,15 @@ "font-atlas-sdf": "^1.3.3", "gl-cone3d": "^1.2.2", "gl-contour2d": "^1.1.5", - "gl-error3d": "^1.0.11", + "gl-error3d": "git://github.com/gl-vis/gl-error3d.git#93a5f0f5efd8d1801d0024f374616a68389c634b", "gl-heatmap2d": "^1.0.5", - "gl-line3d": "^1.1.8", + "gl-line3d": "git://github.com/gl-vis/gl-line3d.git#db5e4cfa81023bc49b1e826ccdbca5c702b50e26", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.7", "gl-plot2d": "^1.4.2", "gl-plot3d": "^1.6.3", "gl-pointcloud2d": "^1.0.2", - "gl-scatter3d": "^1.1.4", + "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#bf062279b2a6179eae4f6d068ed5e74672da14af", "gl-select-box": "^1.0.3", "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.1.2", From 8608dd39be86cf0f632bdada971d367948546bac Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 29 Jan 2019 12:17:16 -0500 Subject: [PATCH 2/4] added a mock to lock the bug --- ...d_error3d_transparent-with-zero-alpha.json | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json diff --git a/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json b/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json new file mode 100644 index 00000000000..7b7b95779bb --- /dev/null +++ b/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json @@ -0,0 +1,46 @@ +{ + "data": [ + { + "x": [0, 1, 2, 3, 4], + "y": [0, 1, 2, 3, 4], + "z": [0,-1,-2,-3,-4], + "mode": "markers+lines", + "marker": { + "size": 50, + "color": ["rgb(0, 255, 0, 0.5)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(0, 0, 255, 1.0)"], + "opacity": 0.999 + }, + "line": { + "width": 50, + "color": ["rgb(0, 255, 0, 0.5)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(0, 0, 255, 1.0)"], + "opacity": 0.999 + }, + "error_z": { + "type": "sqrt", + "line": { "thickness": 10 }, + "color": "rgb(0, 255, 0, 0.0)", + "opacity": 0.999 + }, + "error_x": { + "type": "sqrt" + }, + "error_y": { + "type": "sqrt" + }, + "type": "scatter3d" + } + ], + "layout": { + "title": { + "text": "Should not draw transparent scatter3d markers and lines
when color.alpha is zero" + }, + "width": 600, + "height": 600, + "scene": { + "xaxis": { "nticks": 12 }, + "yaxis": { "nticks": 12 }, + "zaxis": { "nticks": 12 } + } + } + +} From 403bfdaf630aeed5557ff82f67ab290d5efe60c8 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 29 Jan 2019 12:25:08 -0500 Subject: [PATCH 3/4] added baseline to lock bug reported in issue 3493 --- ...ne3d_error3d_transparent-with-zero-alpha.png | Bin 0 -> 38152 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png diff --git a/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png b/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png new file mode 100644 index 0000000000000000000000000000000000000000..e73533b4c2f2932c3618585e0038874786c9cca7 GIT binary patch literal 38152 zcmeFY^;cA1`}j=^Foe=2N_RIRUD6>r^w0tWNJ@8yl(c{-i1g6iU4lvvtqe#b-Ou5D z-=F()ul0PNf8beP*5ZembIzV??|tQKUnfROL-7&L6C4y2lt;=+^4cgUXpo10FedO# zhi&E}3JNWXvb>D0x7lt0)&;df{oTzL6Sj;zEe_ZL&K&LS#L7D0%k_0uh2D4XR^D|p_vDKTD~cgk5iE{w=@tZJVTzxtjiT;;d4GZsd31GSiVG45~Oc{%P< z=@GDFyi&>_uES$BEk-O(B2WNc^!}A#yD^f66kEA`CwjeG`w0071D8zKecX!X8d5yH z`N932&%S%UqvXvReoh1~`3nU8_f_)F3k4yUz{^o{VT4oT5&=6NyUzOO`>U#ZeyO{o z#BmnMqZpOhl^dkU^wYZn{D7}Uao%ZBfR#+LfSvK~iY4~!ZNGm~K(_2u3T)=S%@e&n z`8mF0et#AF<}&GN0mM~+W?qgkO*8Os>h$l+a29bHm_hrRmappjfPM}$3$v>q8QEfs zYmZZquwNlvdIqL8k41kI9QX4Ce*abJq279;T(pTFc!+*n#1l|LuNz%e(YU;DbF(Q` zMYgahb$^MB(e$^hs!r(_duCLVrwm_YY*L1Qle+gmUb(+rvAz7eVf*caDF4TKb`HSg zWSjC&3R$wSB(`LbHavcYo6jT}6&iH@5YgxD7KQ0}lLXu=Qnw zHn)sqLvuhJQD*N69~O(Cvsmi(4^r~HInf7L>U~Ct_owH_V*=yKEV zPyG+Ok*N6IT`$k`-t=Hkr~YZ)%ySe*zy#dSTUVBDt~>8r=iMhH><|IKXQ2b13BOXV z(5r~z3_Gdoc_cc`MR4<|>Hd#wiQdBayUx=Jmn>DD_Nm>vpBl(u^vApuW0hR8)>hPi zlcF*?Dw}%z@2^)x?k@(V#wuI_9FO5q66N&7r^9zOqugbAUygL!z4naUa}bLI;(*48 zXa;QSj5FuJwCB(7?^f>1JieNnB2cy4kEX7d&pR4@W5uqvK6A7cFxR zfWJLodRx`tem-xP?~t>xa<{j_-V+s6OTK#nY@y5Y(Yv>q0l+P1D{F7(B49SRJ)dx% zRW>8D=Yt;X!$lHM!5oTPn4Pv1iq+ih^~(J+ZK_+D@lxqR#{fF2<>>a`yYtS@1@;%G zQ#u?ppT=>`4$*3lzllw32dzbr>(74zG;uab)bAOqCUvdM;bH4EHl4#5DMh!y!q>}v*DWP_d#^)W0>zLYI=aL z%F)G1v6PdBb&5@IfA7XbRlUx#T5&B+T25;MbJu9oe zIBV=|e;Y^8(XtwfTPlikl*kXhcy^3|?0DF|w8W1;AD(jEGBL^y@1kn5L_Z=F*r`u6kRT~ zX@`F0fk_NU=*+U5p>gCql?`$5t-B4LpprYk5uH5k5?oX1$1>b9{?)W}$C!T~e+qw& zO4u9Gzlm#pAsfL$rg%ZTHz{)19igxfShm2_jpqA*R;-uE)bF<8t%H>G~atY1}SxaEH&PMa5i2GtB&Kl&YJN5;th6E@QZbFF9e@J(4GG=5Fnbf zTM2qw_Zo~z@tg4Hpw6L^ufv)h?{Ci!Ot4Lkqdh)2Tqw!HO{{Qyl`OUS^IpjO!Y2g+ zMUQkB$VQng&-YOGVn|W4CR=*fhJ^snOzronGNEyN=0{%FPgN{Zm&4PA5!k(E5Z0r& zYDQ;wTA>(}5R(Fyyu;lH7A;OVB;FK+o65*+mqhHhMy>Yytb|gtg4XE*pK;90I|YMM z&K6rUtBD%$!8tag>8H+wS6fc`tJGJMQTp=VJVV|DgXkS=&X@fRa7k)3hak|kuAW$I z3h$8L78V$kT|fU)Egwd*m+3TqAL(U$^aJ~^R#kWG^n}JDw^T4AZ3p}mSNo@zp=pwG zA8~6tj0`7^eZ6@HjZ(pwGrI{+i;ge;Mtq$xac)aE$qbqhF`R;)gl63ehpw*yZZ4^I zwhbvnwUk(m>UYS(eSvkfu|VG^yiRj>7!|8jCxH?I?!4&d5q9zaMP*0sWH1K#i$f(d za&_|O$4@ML>!@HVCF|o*f9t4^#L=8e?E#t6#_UzjS*Qi9(quby6}t5?E&E z)(#jU%Y4D{SPhFw9hinb-`w+b2(e7O&`^~fW+*Mb4}5yJqD7IYj1othce6vztauZJ zM@|-_6&k_Curb!4B@5Y2*yL_wpM_OD5>7|^hF6uFiYhqBolDb zwC@$d8kJ4I$v0p#_He_8wq!(-u&giOO*g+;q)LXklvuCYk8=-92w7kmA<#xs?oiUw z{M;s{z~FB~Xu+Amx*{v=HINVr3q*M!;I_nyt2ziM(V$@%k2A)-=bl%bM{x;RvsFKz zXntszBa(bHMW>* zs4~ywNa{xOsWLyL1m`ckaQaDp1pW(CMJ=B|!0L{$m-r;VH`b4yB?Jxjf(CSMWy$an z&hUwMlmx7><5`}u*=P|Hit`~OI>awOp-sXS*C)Riu)9;@*_72<22y#Pf6nDmmP=PL z{0tp_l3HpSeT_3-{hHSC-OrFRd=Be-=_aRVL^aap*9)_y6*91Vy0DmXrW+F$$dERD$2R!@Mzjz= z*|?LqwQMktrNRsS$;S840xo`=!|S6#8grWvxI#?Cla4`eg_)WICwZ92^v>BEnuc_! z4!HYA*JsDr&}T!);OC)QH-kYpiVEd9R)h$dXbbZ0Ql4dfW-!?m%$738iV`tC6kKqI zYy6?>Q3FF@HmGcmf{H4CC~vJB%hP*qxy(G%ksx)BzT7->6rSsN>#&0C&uJgWMch&_ z(9Ta1w}QRFeYZ{-XV0fkUKu>nr|LL8ReX|Kc|_9Wp)u{m2qD~mDFMm@@e;1aD7Cz% z4M_dQ&q&An>Po@cSo0xc>B8Cq$4*_B8CbE}vG$zOg6d zED6*O)tkko2u0})B%p;^8J9~ZasH_}4}QMBMaT(-#2p=z2MoW`X-C&JjUIzwHBMp=Q@owQfvK zT9d`nsBNmG4m_#Bzw1!G_szD2h#<%VY0Fw=H zP?NnA|2xE9YZCOmkH~$@d>j`a)e8Z49Gf}_!4uy?Bc3X?5G&vNL0z0JiNgf>ky-xh zyKo+T`nQtiG!RG6wBt;9$+kS4*Wy(&_Y+#%p%hw$1niQ)wF5{nEP;4=tXKGH-s7E9 zv&=epv=Y@M|5`s?R+4ov)$ znt(==wa~i98s!OFPKkuO($r9UqoQU>SPQ*-z8+l~-R?sd7KO*MFf)j|PL}mp72b04 z=jt3H-m)vlhU)N{mpmA6{eU+4qSnkR`~ss|O#u#z92>}(r0bFI6bJ-_d`^uF$IcklAz1a z%+jV1?nDGzTAMak!=&Z(4($s^*1m>vpc&F6J!{hoTfiYXvefRDb;9kfHc#XvST5{N z6=X(*eJ*&k-F@}WUYZ#X{RslfiiSbg*SRLyX82hKp5z=jtZJssSVG563bPY`j zis#Pc2XGKCo@1hh(;)0LtA62#%t-NEZ|Rm_WG3Uxv_7@x{GYyHRd$juL~) zmzQNR$L-4JvK63?ok?0eeGPYAUN87r4#_<*d_aah4TVd~3V7>WM$llduE%^KuxCR! z4TvPRZmRfbJpvHHYwJ4B?(HANJ1bU4U7s*zLtco+Q(9Xdtzy)KaA`SG!MaUCL|Bjb zv3P@}Uh%|UXez*YvFKG3oIJ$8(&iEHcweAJ(t&WTaQHw$p)iZ(u%}}}L;7nKhVgs^ zK2MK=qr_CRTLs+sX-uO%r$`qqK>`la(ud@^m zQe6#HdrcASjW+Np0UJatzC71+Mo7lHQtVczn2x3SVUEAAFhnGjSH{rIMz8lf03fRg zR%Ks;aY6icb3NN)ShyfubPPtqLY(l&Alv{40!}e|=%=2aw1=p|-a3y`oh5eAwPVXM znf+j-7HhAs`_O-!6SZH1@xGmeOz;-;m=Dca?BG`AGSu3c-$vd+w7!!!r0yP3T)dqF zN$~o#NGgY7;LB6t;@n`Zmlfn&uVad0RYIhLrH1G|Pz>uf(G5-EduaT&R+W2CIj4B( zQX?|E`N)Srp(F)xQ(1WMvzjNgoRC$%KxsFbZ7p0hqJ25|B+URewY2n95=OtA+;NYw zCGE3ARI=AegarJsHN^99ldTAWEhr5f?GHL379R$7_Y4`C>6BvVR}=%NiIiWNYJO!< zVt4P%Oo&pj{2G{mK)MYc;;KKfE%SJt;un=Wj*>`CI>k9HyJ`N&pBH`FMqv?Zyq4(J zB>0-%ujOw-z#(;^v}c!XcVq?Q8U=Ze@zZFB8pueF5~48M-k^qpI0<$R`79|7W;45Q zVz8v3;hBAH2~j8)6xBbx01F*{UVrO&$r=e&9{6f4j-5VH;w&2~G`(MZ^fNR#H@z5ySa?%Y+WB*~SY8XI1uCr$QM05|}s_K5A$w1(4 zHvq$?QMryVprO-BhYF!=ktl3R0nGFw%N& ztuqYT0jQJ6f%l+T=|TFs*r)&R8&z>#&g6hOHUVNh$>{vL7Yv5Y!3#!Y|AB-PzB9G9 zLYI9kk`|KpmlFntvH#*K=68QH0EB}SMgpX<9hLHOej?B|@BU^p=K%;HcWWnv-8a7p z0XU$2+&%x=M8IXaZT_0O{p82|nSpsgee=)Uech$E8Lf*p4dbfjSK7x(QR00juKlD) zfW~xO4oclwI0G;;CrV=10!caH9hsGt^+#b_QR*tWJ1T!d;@qV65}A{OSlahO!h0VJ zi0wC7d9Glye1LYG6!GYFx-`t&BKO~R`qhuuZ|3=ZJ3|2Ut#y|lT|DsaI6tS}aaR9K z>c9C@P4Zo$@6_k9$6~wCfA~=6-DwqaQVw4Ti`sjY>jV>X5(seoDld&hn1J`U_$E$QaXJL;GmUp4Y57zyu)yo%t6Vs>RPv5vNd2I1H|dDX5bHhfV#H!YhpcpBTZ`F#OR8iFLO|&nvs3peh`2Ja8UrMK(t=T z3f9w55_Qna2te_^E-KhWy^m za>7&BgVA)M?Us8!}e z6-VldYSE4H7bOKV#q+QmE5~?gTOT>4qbU?c6WHX_jcW!c40&xCc_(>NfS(oi_{Gp7 z0K&?^Lp1jnipM}D(@bysz=g-7q;4#Z>xw1DAE1)ZSGudK*-qyNqMVKIzlvTP{#h9g z74TSbD63#c!>REaptREk;oP=eO;;^PL&x)_R&FjQf+|n2UZF9=Kl?1b>3xI*AXU!1 zOXuy_vjcBMbfWXT^S0uiA6Er&P?__9v-x6rZ)2BsPlcxzy`yGl{KpR!I*|=FnFk7U z92r+BEOMEaq3hXQ7l!Of1do3~&$B%X8V{d!;{4YHSWX5yB1!reWZ|Sut8Z6P7SC3K z?q?+7<#KI9cF2({?F zmjW1RS^WF<4q)>#HG{5xlE(Bz1XjZtMk8Rj+}6*fN2EzOL(sd?zIV0fIJf+P1-Ssm z#o>k``@_qk05jS5FpS0|xeghj@U%0GB$RU=_r>Y~t-6cPsBvkKGZCkCjD9)f)vW=G z%8+=-#k5n@F2J2Nk(pNS_*(Z{${K++1&$r$v4iLlQwl%=kDh)Szx;r;k5lt+tc4k@ zvB~@|3RxuV^~txea%6;)$G2OgTV(pA>li^hg{c~)H|Q%9SptKIGsnv2FF$Z8)sr~$ zo2p%-VQUQ3N707!l7Z*?nIZ%sYzlyrRe7da+e^?TJf@TPmn2Mq6ycYDIc8Vd|D+Jz zkcjh&)%tErQOd}P0RVqAIZO;IS2K-cu7l4SlcB1ThX;TrSNQy*T6xV4(9zQTtJ809 zJAQr$y1SgVOvD9Y7>CZyl$q1=J)DP(DN6oL)<>TZKOWn5YWV!_Md`?tVAW4esrGFu zYt;FKs|YUkhhiSAnhK@MLHl(4;BY=)OMipwVWog~%kOB(=ky;n17yiO>j8Tp0jB7d zwy{GG8M;9Id3E}W=Dw-tQ8XUuSJwFJc`sVXSGt_ z5N^xo^es<--Em1{NDgJAij_$Xjd7SA;S{3-XCCXNkq!@3Iz^Sc#GyIK6&2Nuuw0n( zVFdQ(F0hb|>7XDaG-5YL!fXuy;$b0Gs|+{qcIo&d;l?U(C~t#K2tz}H1u=gl?Z;E2 zHeqNIC5C7?jaHN`kNu)Ye?j6(?qe%-Abhg}p^ySB-$jfHb1Zm=VHgJBukjSpBpMi< z<&j+V-+vW?hM^H-*wN}V-DsjR1L*a}b;fFi` zrAPd(PL$;$?SIrs=eI_n631B+3WPP!IK-F|^amVj&r_;vl4yUk!%QZLj!))6+tBsfQl%r+WWEMP!)H zW(zr%lG9TkXAbJR8gv%A{yaq%C$30D;pPyBlsxFYgQ;e(9AVcPUX3*5;z&5p6mtJJ zqf@tkX~@W8hal_m6xJmHr?rFDU_=WYEWp#W0EBxg_O)8}R=s^-WJIQ0tVVsV0j;3K z{6Y-plT(0!d-cm_lr^#s`1_?0#M|nzHOcSpJoM=zso!)~7>MM4^b#3i0^`E-mf3dO zX_-ArUZ8GlOG43peH;8(t2nZ8bJy7C2OilCHa|wF;RJ6e-sjii;ZVac7&9>?R~ys3 z*SwQ-(l6hoXA3I7zQjQ?wCJf5EkoqVa0Vryj(9G@pPV;;r)pL%FVrerjrTu6cuhVtduAW^^mVcE9w1XQ<-RK&q&jt%hE_&leUeIgQIm!W)1EfGA2N|;IXki+$T7t|p~<-CJHs!btMEW>#Q zAhcIfjwOy3jx$ghRgz`~xv(C4&JKvQjKiA`-N2dC#7GiFXvB3V5c2gXg$YEgt+dL* z7pQZDrxW+(P_9G7t&EKR{vM`{(2EgFa%-@{>PeSflj{;Kf5E&6}{i=e@WH&*$qX z5G8D~ce5yeqa9MIN#%aP1$!o(U(pZlUKiVE^rgSgmI`x18EKw?%r6^Z;9&{E@o z9OU;^dO9JHETb?!4kr+@dq_-a(V79THIndrgAkQI2_vNAMHMHG78v;cf79iV;Rg$F z3s4=6?xJ`|Rl_pAG5~ih1FGaBH$Vjpqa_~g^{ZD2c9sGYg zB>w3^`M-T5|J6-1DYwe#o-z*=KJjYmoHy5`^`n2#7*^o?un5H1N{1#-`xrH;#C^OO z33G2q)vZ^4(e+g8Rsh@J1C6%`poA{~CH%8GWCkeVq5P`2d!Fdv2P+L;77!tO#&aTW za@m_)FhR(B;I1P1i~ykYgA<}v8YqJF#xXjMEq~sZ|M(Pme&h&4hz{+u0#pqVLX^~O!zvTw z1k8F%E*KPdBm;_;=0)=sBknlSQ2eG@Gj?(zgv5zB=U?dL<`>v5ewLma{iI*eR3 zM3#S*RO!rOEc3vBB}K2r3{>MbR}n^pA?t*!mlqgLhi{bFq`E&RuwMg?x>z~ z5Js>XadQny&4q+AYqbtNZ}r23%N^}02$jOR1XDOt$_1M&&Ju@XB^>HK9>Sk!v#e9xo*Fp3=#)^WCWkrne=L{e?}hq;~^{b!2c;pPY?{qh5C`w zs!5L`lInmSEj1dLGNW&rFky%i@H05*NrvUTi{9jfnexDXGk-6uivi2icJ1mt_b%_p z8GQGaC`1|9ZO0$tDt^(@jDX1fs6$RY&u;)r$Rv4qq(8MT49xoQhW&?fu2O zIdouoKR+Onsr}D?<)z6{ZL8LgehXWONA8Az)zARRQ&$xhq(LME&@&a(zMR%o;R5RP z-3Ltsrd#d%&X*X~1{nSXW#j*R!2{KXOqE>o>?LU6VHfAbUk1cT(}PqPAmmwbV;Z)_ zW{ylwMBN*^>7Y?;LMnogm?GN(@hhooSWHK6TeRE)2aS$u**8v(Z<4`?yzBRVl!v|oxJ>qNjI zTj%5Fb}RHSvR31sh(<7tEwz3jdS*BK4=&wUur;tR98^;z@}LogkDySDniG-Z#u+s| za<}oZnQyjso8KQdw*h<$*M5W!%?9u|dSA@Hk`fNZN`t$N>}Il>ZJptH0=5I?hV26; z9anBv&Vsgg63Cprv*mA@S*zUR8)e)gj`|fPFXo)Td)eNtU+M)FC~Ef2DTR{mD=sU8 zm{EcCQ9h)1qD4yv|7L^;>(rmx8)qSwyp08dzN<4TU8DJ2?~Gv}NBRx2a_xHfjTs>e zW)?y6P+uUVXH%R1)TW<|k#-2xTN&y7vpY9}xQQGeL(aOSgc^@8_}to3jn(Ivxo``T zKOqqFYktgIzo!I${u*#VU?4l-AQ4?w1Tlj{NI+#8r3>Kk^jR0@hL*tELeNh3xHGST zi`NoY1K6}B8LF=J<|hd~F9D!+=%||2@*f#Nb>Q^(O843mx|<1(M+4UBRa1-#QOF7SA&b(MmPloy zp{1vrZF6i8KCW73x5wQ1TT#iE;o_5)37y^x&P|tJXyKy~Q-=FbS{l>y`aJl(JWYE- zLa^+|MCkOy*BWaE+iN@==b&j}q`rYm>U*eZ!?YgqM@1DLJ!JCx!fR!wJ9Xa~GHiV< zioeYCynGKM#Be2pFaT-`0!Ib~x& znnp?_acH*b;1IGt*tfQXTzj-MEm{X?XU;0If-$#a%cHjc z6IWkU-~ds1?#zThtBEKNTlW=0cxP+{S+1@E-*zrdt*FYbij~;f5pW%ZDFF}@3e4#d zrUV9Yh#_MO*nEu&;mYSHme@0)9LOBg875|k`)pRHb1O4d zcd4I8A}Ii3c+A?GdMJauOu6%mVo1(ZfRLsFcpdFeqa86_DBwD-nRG3gXRWIudZX%a z=hi^K+MSk5WdTS~mS6Mb=!el7;&SvcRNJ81d(J-Y8)Y~q1uKA%i2yrJqkwv80)QDx z?wC`u0JjL6_d94W<5XGk%oCmPAMsaFdub^EX{~Hcn|E5ONFgde-ZZoQmg844_k~%q zK=^FhJOq~OwP0@x{0Y}8gr@nu*PwfWezXIN@z5tv>}4x@0*CBv1WDe zs8JWIeYn>kV4&qb_q;(1`v>#jnZ5D7ae;AxcK@Y~DoGkY?AP`m=$WlN*KdJ1_TVN2 z6My8b6GRWQ8d`0i>RyOkBl9^Jh|n;<^}ZPVz(CJbU`V~?IXL>3|E*E0j&|s2u}_dl z(BeLQGM9R}EKIELsil`lt6w*F48C>4o9Uf~ws65Gs@4N16Mg`>=Zyr#y^;ntjG!g6 zd0Bi%M@*Ob>SWk5B8i~vyl3<+pPy-myLPB2(u+JxprMr)w;N~J3>DYhyuUA^f7!rx zovvp;rb`}hu0qMqMX#9XR%!`R-ki_{Tg$ zvT)fN13FOI{&9l{5mWU6acaulTqKZ>83W_=f2Bo>A$-GSduo(ZDNyRK=P~SY%EIN9 zNC$aq=x*#jJL;129(rrhiaU0&c`t<9{r6H(JYD%Ke;u z(%}%7-yuSzGd%Uq>P!(d0Ccm@WVS0VDTV}_j%jz0rdxhbx2}E|V|LeezuI=Tkg|N` z+kM>S_|0(&arxvf=}mgruAmi9)YvOL4R*jBfN7->n0QGnf#-ZnA6PtAP|NboPkB{G zRL^P4eu8p^j6G+vs(A^vZX=0%@mhy#_f(?t%w0Y1P`yMhVB6q-+I)^btSC*zE1v-w z(Idcx*dIUNQ;(HKP?;H74=TEJ0q|j{}Z1jXOpo7XG#<=|Amm37fYY z&r`-Gt1&44cJEFUS|n2$IRsUfdBr~$7V(klU#Q95R?D5(+VNLqzC z#YjIS`fhaUqG9v|FG?KSFUi@ZNa}R|W;1d`LihYGWor+z#h92Nv<97X`)YcjMaq=} zvhZzJ3NdEwe%md`T7W$5L$g{*l1--q9c}JZK<6ckkT$#dLVlSkyU%zq-t!izN zYVOR+LBORMa@moLnF-SQ;a>6hc<&pS9^%wspIXL8RNf*W*O8pbE*ut`BtjSx4or^; zlwq0y9BcLE{ZcPoj8jqZ@k}92?QS{G7R$LVZwE~4^w`HPGk-!#A{r{>q$*Q6paI`z zFyVivJz!&4`>37{?PgBE3K~oBRdYW@Nt}PWH1D}=Z1a;$2^Wd zh|0~!q$AHFDTB(C8-SA;L7*|d_Pe2R$uE9Z0v}>RrEnAhNKCLz;|AR! zaC9K3QM=t6vJ$Qy|3QILS_FMO&T1vaWO3!=}H;nTJdGE`1*F za6doAmrWFNyZBo2jex&(AmqTuje4?%jgaCgU~Ao`(ioP6NgbCWzkATAj&4Q#Q+a38 zdY4<`nTK0uOdJoH%?!@A?smv?uB(jSXF_iWKJeR31IZWHd=FKUaVD4ZT8i8looyU$ zqf*|{*xKh7*Ji89sKto3{H;9` znKb+U2;tc&l%IWFf;dD-j~s{Fh7m@2c0V7!Vo{g>UMg z*-z!MSz~pMf|edJ7($J^Q-3Erm)soud{*V%KZ$mKn8Ze)SI!OYzTJ=nLN6QQX5mBI zUWrDiXRv73uFF~e^t6pJjC1Z<=lW}jowLsZK84YW(o-U=ia86Z4Iuf@>qvZARd8TU zcFp!qvdiD|J4mW=m*lVXR~Yk~ZZyO6!Mv;p+2gDFm9%SMHa=DV%tk}#zHyvK3|l`H zQcoBPoc?`$F@cR(ToCeL^A}VYV6+WHqMx!T+(tn%@nP= z4q;+67@%~7o6xL03O!w0P2KyJ(3*ZfH}UWD>6ax=25n8Qz(&p)3KKhbzKn2gipmS4ziD5w*b?Wc{OyqQykoowN{ z{AOGTIZ#%~|E1dV>z}CO#;aCQm$JCAu(7bV*0hD0w53$=`;nv*Ci_%lGi-d3abUNz z+w?KDLq!p4JP$Eq=bAGeQ76GHG_`xtaammPTab%a+jz%Q?-)6L{6brf{quMtRb~53 zuyqk5M8FtkZ`-iQ&l>OVgf42@>Q!OTo?aDCE9W4xk#2z2UAlu(6S4dG);fKFDyCX; z?e^b{)r)s@!GSLF!<=f?Z+ENJ6!KJ`>dcq9EFQO~$d?4=kEqBy9WnQrX$^8*sHbe= zoqni&995KwJzsopY{q6)rJh(YLQ)qnayJ6hRb?hC@hSqdIYDw7yXv%2KbX!%O`N<` zwoCodc`iH-shoMKDqFePy0cN67hnSBsk)j=2W7J(lyL={T0UX3ZgLu8rdM8nh^}6K zQl$>cHv^*6m)Y}I>DQ9C2^OIVX!73f8c)kP?S&Oy_i$xnAUu90444E30G)ctW$GfQ z!d!FAQH8cMylEeVh1^EiHwu_Zu<}KS+QZ^R)E)sVN{rmjbb3Ti!k1q~;pWC;Uo#Pb zUPGD`!9eQ2Q)=S+F_NVLQ>KQ#u%g6?!4M-g{}O;6>3GH8>u{bGR?>SuLir|s ztXBJGO*WzO(-pX%Rb^{j#L?z`p{JfGOq~gx?~iYS*$?JEmlD`t!`+-yBRa3CgYU8J z1QKqmY~MLHo|1?~rH3Yi6dRHsUZd!>*R3c-7xI!l#84>BaOv#Wi<)A1={4k|$M?6e z=}QV7oo0%#wwV8rrc!=^VNKF;eP*}AxmGE}N#!_zfiJ`CiR-B3Z@|KatDmTkR(5X# zNqa+gks3V&{${$fq}a*PAc&5l&zfKM_oZdBO5_7rxmXB0D}lu_x&9clQ3g2<9g(Rx z$XR~bp;jJNc<24IE+$|YCdemoB5R} z)lmcc>T+jq`$oIz^;hf)O=mSPOQkj)3$}-O(jBFae3`@3&(A-iT9)4(8AHNL3danw z=gT_g%A{_9c9D=qZy6>=XCF;NV9IG5iBKo_-o-NsUB=hZ`SWy)Bb3?ma z8-fXMRLI}e#4>_q#$-_MH(VeJFXxY3ITV-kba+z~HbU3?j_au=ly6kM&TU~{B;)<3sBq{s zq6v9LhtwQ-|1Y)is2F&W^&9O4x#THl=(zqy$|FwqAr-dXb%TkM`r90@#lkxK=&^V8 z#az_&)yGT(B^&r5jfv`_mg9;v4bwm!s)|4Q$(P-8GW{>Jg@Zq=q0|YNw|>``7MYYL z`;sPbrh|kBo`9SsEpSTcu%r`X?&dKx!(%bECGxde7R3eX z%Bv3|E@me=Ri}+xmJSJmmc2qq_aXR;i@pyM=Bl4(xQY|3{3ls4Xbj5#p7R1ursvI0 zo8xc_)5FV_wVgcX9sclHXPv;e9GDH-%xPK@mOBvHjYw#ooPKnCCM=C4DzjWaT3x%{ zEoFtmu-f(Uyy%ZYo>pP4di5~zTAi@Y@B0#4^$f>&F0<*ch!a&=X{j~XOq zVzg4rceu5q!M{I`;-sPMpg3!nVG3wv4%5Moo%Sr+~;LXS6WC6^@1$cxo z;A%&r>8QfY)K2<t1Jnr+2Gi3)K(_6$4pDilL@XU6ignJ*PexWKH~=9!Q`^<0IQO(sfMLNzz%VOjA2 zX(=_#DzaVhAJ;2DRK9$jDsKExSQ;bqOgI{0$)4I?bqbJ485YJ>!OR%xF zHBUv`l%)Ma+K==vh{&e~Mc;(1esFk={k;o%D27>|z$zPm83VEDJT+c0u;%=7TVBsGj+a;6(Tn_Okasq$I7x zNz*IY{8_I9;I8vsD}ymWegFIxS#(;b!JASMTL2$sGf>qxa7xp^cao71>@Kyd7i^T) zv7G7SE9S(GDW}0KbImMq5;*!C=osP+f8zNwV5f3u}^ygYO9z188bc2{5y{c9qzt*Xz) zvVEs_B>Wqwg**?jBR{wWNTymk9g14g6>%{UmD}obFyayeJy;hh)+w^rsmq&X64{=08U&@`+T~Q>j6ZFuY={ zay9#;p}jQ!4Ij`askWDhmOh!i&pKOVANwpMeU+|K>xS8CRmtv5e?>>U&kvxCh4wG} zez9Eux>sEntW(FimPH1W_=a0r9&o%WhU9n$J)BGF5K%Hcc9@;9*+!eAV`-biSY(0i zbhuDgum03DN9YPE$PsWl886fri4IzQgNzD&Va)2$Zd`Y}GIR8=&HtAdqFOR7dc6I` zY{58~NbymGI(PFa%YCNE$`xGAW|RQLk;Zj8hna2^u_$-ZFI1^*G4~$P7?G)pMNT%p zqB=b~`?%pPP;hJvytXuY{~TVSkq#=PNBP+Vp2v8m`4^X*TkXkUiKSx-;9pRmzrd)@ zd$Fu@*-xq_H{@j77ByKQZ({P|=-dNX)S}*oraaZ0Hy`n}Z!gAF-W6YRN8v@NvNy|d z3YNgKbVJj2y6Mx*O;QnBZac>BnZ~$)<1>1jnjn_$Y}mcC_0nW2^?ORoqqoi8tR{e~ zw?WmJU3-nN3=ob1m5q~^Y(LVuESloeo8=&n@wE84(y1zj7Md|uD44g zf0TqPYxa8Ce{YE_r)w}|NrpE2)3L3lKMn-KgjB~~WC}v0(kjvau>WI40Cv;sxo$~o zK=$D`+0puyjc0WUeb)4%n9wa{77^}Kr})W=S1Z}|QxwJ9K~J#L6Yvwt_1Qa5#!2N8 zSn{KoXZfBixEG8s|I++$GvWB+0d_u?nlQ@p?WxC=0;vqkIpi{OQ_EtRXYt`yR&iq6 zO5$d_1U1|W5|=Y~T(r8p@^|RW$Syjn7PJ0_6Jtk{D|@vmu>k~Py*$knhxe9AgOZQF zOb(Ox(Rn0|oQ&%~s@_s|IyzO&g&IEPbUk1&?{ITVQb-sp;u+T1$dL4pN}8Wy(Z#Z# zkznkQ^~6c;_ZtDasmt)BtbfWnCOPIA6cy>7v1<{-B>hF%dWWgX>j$)qB_)E9gHJskBOoN7ji!V`4~&g5=@5-P+yx% zhGyaFFcXHHPp5Sy*!rB@bS-tmC*xX58($hUTZ7_y0jy$YcF{xLknMBwT`}jOebf&z z7LnD!Rr0IdMeR$2jW)La5_bikXgH5a^|zIu56+crh2HP{*_Ibt6yJ{)cADOR)1yDe z3tp_xb~&!uq8*pcrq1k7UC0HD9T`iy9hMnReGJ67jNQ&x7|}`+kwZ@TiRL<&ydKILXG3;fO~;6F^gpzFAvb(u~lY&`zoUqi4Qo zBW#_Ld{%^N$)vFL{DqFmJ6Ch_+${X=QUqs-<`Z^w;#j?*Oj+j1z?0{S9}L|xRQ0Kt zn-439um9z)vbMpP&^*7J%K=Qp<^xE<|E8d9uOVGv@1p+MO*6Kc1zEYP!riJfdNe*V zm+8*cR{$ElGGH&J#_wpjco#O+@fBeD-BBlFY%B2n_NnE4drUjWj1>&o z{_n%X6bC)?UAnK~AyU5!Gu>R@a5*&Zeq$=;c_Y_wXbE70*Oz$=X_mCezY&Z&6%uFe z^D~|F`r&zN@>)Z;QwG$74`3tM83Zp*Ta6*-%5R0unQeFp{6sM8@j89?92sCQR z@SUk%Q~Uft;7g$^`!m&M7#06a5kzoU;!fk!M%;1}A{Cl|2-4VV-7Zzh1n-O_t{p$& zhRg8_Hs2%}X&B#E?&jiZ-c$ldSMp_CVPYVCB2ItA#azMZtsG5O$C=Us!nd~J1?%uF z+rku|vTKJvPVRj1V?Y~UJSUrvGd)B!pho6_5hzqf#afqq^7Oi2T)K+Vbq>r0I8tJv z(?^cmIm8_1Qdf2O)eOJs3Sx@R8mt_00IRP=r(4IAi% zq<@Q?8CL9=A;gvBw>s418cccL5U&-#EDF4c#FO?&9iTX$oHg<0L-INlC4SdbaD0hO zH(w948oT&UVBBt1&54hkQKXk*HWoVhowL68Jm;uOwhgHFPLGmOp@tg|O{?s+N%XBr zJy<2fk(&Cd{E<^(g)?iDf1~JsvhmrhtO0&1!m2oMb9=gMJeHJWELoAdWchqDuC?zY z5%XXJ#-v?H@|>YdYVDaCu{iX zN17VV2lq9O=@P+!Lf_ilf30EZNsaX|QLXopC2#=8Uke<>rAc1DU~@Xm_^4@$wFlGN zRtw{R3LftD$bUW%zKvpp=+mf&=He7DW~B6LN>5yi!Z%G|Y z)y6~sX5r|!VO>uhp$U*wHEd;$Nuz`9|19gf)C*-mYyl4T|6%H_!=j4T_F+X-q(iz} zq@<;W?sTZ3W9XI=rKCZ+J0+wUVkiOWMnGa<1SFLX$)SFmb3E_&{lzt0*Q`Bzt*4*+ zxmR&`v4O@&8uxF(0*cHVYJhu1Ms=#iQh5UbVC!AbHyLn?2{{}(4=&$;X?w#0xP;ZF zo-vq6>oS?Z~lBBYqk*BPynet`JP$d5d6Z2EQhq;(dFnkU+ zVCRyi=T?mtjFdPLcC*dMAYF9#5g33WSUEU#sxvxD0XFc6u2GF|Ka5O4Chl38FP!oo z|FYuus`-hGYJXWhJx`LivzXgZz1v}_hF=Pkq}Kc^-5{NT(OJ7d+v0A!KiIkv#vOPP zWxuhNvQ>~Fzv%a}_WFZ?h}GLSMfJxNOE8(AMMTQu*Yf@mNp6EbPz@Rpemv*cQneN* zo(Uh7suVs&n&T7_GfISZs{CLLjoH0NCILxrq|2KH%U>07{pjNBy1_N=pojW3HQlSZ z$5mWgBnff1Ezfi@DKlZAe`kJ0CI7B0jxH0tvm3(llblLCAj;z6&2g)=+Zytp`me)z za{`(jV)Nkj61Kt+Yp{Y7S38W@uBI2>{X}OE#W7wtUfT#twj2;p2ZNF?K>WpLS$HJ2 zhMAxaRDJt@^(MA8Z3?${Co9{{(G!P9*nVi2F~@+nHAr0U&NFD{de)fs5|cWf&C!*B zV9)(C7#W{6T@Z#tMh^@Jm^xo}z_h!C$o)L6ulVmHsV+~Cc3d8|D~{>1I-O$GS=fc4 zFAC0VVbvTYB6mmkCNAK5%|?O)hkEzyzH?!N3%W2%Gcf5at?iPl&Fow|;6bXCIg#0q zo>(=8)y~`89%D)i=8^%%o25VHZCEnDR2ShNsDq9LDV3>Z*f$1QYdho%dcl*+Cucdn z$3xbgH)ni6|9Ae2-Lgx^?HRo!j~}u*HNG_cDW;QzqT@JceXPdzf^_7KFmzCl7EX(M zFB7%g%5MA5>b`sbN!)R&;1UOuiVAI@e$i^RB~5YBQX2ItCl*V4?c@jJf;q|N>I%j> z@ONc=bEckfwl%PHQZYa3Xx;2z){}sL2e@){L6uRd+TBH(Q(AV;VoXskgBFxB>%NZ! zN%*dCdQnKvDTa4ZIK0Njo+5-k7EZ3>uNCX`jG3NXDDKv;Yg^RFXCs!(+T|g_HF1pLu3IgVkYl=2N0m*sNY|FMudf%S-P@Y zlV81o&pYs7j(u2%kIdN+@~*4YT12MS;D8>Pv>jAmOr);W@id8%cG>qoxUCirLmiS) zV5QYu_}quG$E(H-4bw@%8gI@f6cmd33mp;;yIwG*gBO_h45ce8oeI#|lWmopUOc`_*xbW8Fg9iMvNeJc4ok?}@c=nUMBaK1n1u&#E+vND$Ni6PDu5aFTw2%N0ge?i?Y zt>OSq!JfwbA9vqkpKc`Bd_v9JX5RTeT_miCyoju_=p2P|7{z-9Rz+0*7ed(gD^oG= z3G*j=Rm+Z~Qdw@hETg)ed8$9NVzH9tH4VnfZLO%YA&9`<1Or5^aON~4lm0LPr9L$t zyE2`(TDFr&$d@+8Qzt`v-Rd!wEn)2S_x$bsv>vX6)em0l?w~}9-eC&L3KeYI#3qyl z$|dWkJ0c4#Uw=SmVFjCEfp8V35ap#`Y_&F3cWy#!_>f12F{HxPhs_!ZG_G)jod{PMBuK@lfosXdSIPBlHUP&l}x8exE-_ z2yLiX*;-{6AN#r{!pC@o6vwGYl=6!awZ`Otl}K3$FKn>Q;`bX0N|lmP|5Z>Y^GxB3 z7;UA1760D!E^;9`%d8l&Iok5z3Ps1S>%Ne@{czCcXTB3H+iBmTo**)g2vFO%D9*Ck z(;?{{B_ZtS2s}?xgD}7^`$}foJLsANCI0a) zO-;tCwiP2nLoJr%^602349|DFfq(rHk(O24>Or}^3zVL(+p&So8a|XEFhG<-IEsKA zlta2Sk=2#c!YXjw+#v$nj)b+yMGq(_)@IH}#Y^8lzbImQn|Lv9u4PAFDd-1O(nq%$ z*XZA_P&~T!`wDDT%-lQsOra*YvdAl!!Dmztgs|*nn!rrs!{!wl=C#R?Vy1{1FEx=mH6&i{GU62t%fh@WrddbIDiSQtz-4$5oXru+2{T*Q_L<2IY~F^kEXmdl!b*&?BiGC8D@*>iuGlbp1jg#IiP$B ztg?2f<;6MhDsbZg^Sf<{r~Agd(vdU#*0q^18`w_yB*j$C!dg)XIEczy`7OH=Y1z1A z+Ed`P#9qg#D=Q`SzzV0lX3BLof#H8%V8Twh+>b2@VlR$TcTnf_ zi6~vsM&`2BQm}W``H!{aq@o3wS_DF|%=qd$ygzfzq#$RxM3pBQiN|+^?)}B<>$=5u z%b`Sl@Z&nqKLz2LDeQVIDW=2g3ENfjL$eTPZ1AwkO_&zu;tu+VKl=pNPrr3`53{1$ zE^C$}n^9o{t}O5tjWm~$fE|}1%HO45O4Ss0zS%FPYr2#N)Q~H`dOuZpR90?NDcM{S zYBv8^xq@Wa*+y}^Qt47x*YH(Qdab*YUhxDq)Al{#R?F%qc56Nch?$gj2QW#R6^sXZ z?X9}e-AU8Q7O8-Fef2FRI_7y1s41sIUu@>1rOki9u|@lgUB~aT@nGfWx$e?)$ulVh zNgUC)f3|5$ABt-LlwI}9{#QC7<^HEPB!zA53Pg7$9iEg-^IE2&;H_#YS%FAhpxXv| zp+uTieJw5l2*xE(Txx_P$#!ijmodd++RiiLP9f5!B56^PxQsyyELW)Il|?cANTYWt z1H|BFR$}O$iO$oyEPhc0pbU#1v$dPPww<3i5%qBVp~3gLm_T&OJ0@Y{FB=Vx8*AfG zld+OvN=IwGAI-hD`9;O?*b-CE&&TziA#c9UYAEU_y^u8nj$rGCys3CUs(07HhEK(U z^cV!DVwCw&Y8++bx1(#Y?tD|#7*pv~isg<|xRF?3mlVdK(%`!@#c%0g_U01}1-v%y zzk!TEs~!i(Aea+?>7i<7t22QBYjeeTSaa1(C8^k0r$}1TOViaA|~eP&E&I-v%Q6m zQ^3jBRQtEp*_82`bu?d~bSd~iZ}YN@6dk?B9vPe|p^i?=iZtLE9Kc@5Z)!N=t!BbG zr4c^`3+6+$kLAt2RJdytalKCreQ~}DVHG4yoJxV&Z&NGRO7j|U{ghcNW%pvfQK}bZ z^Zc$RZ~k|o(P3Fq$kUeyO$FYCCq&i`&$W`K?*f~N#-=+{icF}P9bmm4-{ zra6gH*(nZA zzF+C^ot;zqcS-e7PvfVSUL5;uj$cNG%{3@HoZQ0c(#6cCSy82JocDtcrjCBGN;6#J zeps@&;zdbqWMT?EC5yt2s`NdCvTAPW!DjmBh&@)PphUDCYsDF>-t5OLky}(}A<Sp7+;5r9~+6K|baPD!~55v}o6dXlCfK2rNu9xCZRd)t&_(sk^Sl&h6REKI% z?!-GvexY7y#gnS7+%q62a8mWXDYF_t^qZ9n;kjRE@!tMVqTUct*sHyS^?f(^a1m7g z=J`H@u5KxnfD6y-v&&Z{%Yu18t0+HCo~KceMJ-#CC`3ls*d^1RfHMa6OZ0XE^jral zc5_@Y>{pM^KXB>uvNyYhE<5fPaa0&NmI9JEDV)r@!mLO5hD__Pi>`?@=?xZcPhk?eaCs>)te<{j{qTDZT^=-gA|s3zSGMPc;T0M~2OVxu$MY2C z$}SsiShpC^_ZUI-)43k zC=fa47TIAJcuFwEXj!C6`-9>uv#g{05E7J!Qv!2vQ&Ou0TPYQNY~2My#ui6atEl8= zC7$m}wbBvsA=%Bf0Df{tz2c70QOOCacLy#k4)v`3{{HSYQ2(U}&-*k{=iqiUFFp0j z@{3ZnN;M0t?!uNRg=N3Yaq>(}J&5?T53O+ImL9K31Jp{- zAt&(!*(+f)xzfM6>RT;~$89$nCg;4QFlvXM1N{_%zHvMOKQOD<5Yc;eB-E;9H*&9& z)Bh_99oBmLAt2~+7kIT{tEAttF7m~6y9enhBF}G6*9bBnVmqDXYbi(_S*`)dkF!V&5MpUB_ z4o9nf_awebmF!k^kux&NvH;A~cQ3M!n+5q`9_ifClEKI%Q4sj`wsmKec+QwrWY%0! zjDx%<52T=3G|__PV5;A7L`I}ha75q!ea_3S(@|*tUQZ(e^lD6;?imRP*o`jk*!8Ma zt%1!}|ANay)TukGx=L2&S0J}Eb<5nkAXp9BLAW%d?CV#C*<)I^yeocHylZmZsRBk~ z3@Md#`-*)cg6RELX|^cC>2Jajfj-hu)1Y>eGOWg`gN|&n(uq7jT%dk1>x!sQHtFzf z5k4Mdw7F`?s064s%7+uUij+bGMNV@rEFyG_8)|-Pau{J5>>8@F?f%)Wk3kPIa)NY% zGR<@@ylN{moSJy}kj|nzL7?MAB0N1+#kl;z#?X>LHH^ur_?_;BQ=exd%^vFq|H|uy zjRtj=&-frhpTEdex+STQ>K_RY=X2(RIjF`!SBi9lGcgWxTlkf+1bloh)$^A7*)jfm z4BWzphtvol$Cds)4O^9IaGM{%PIa-YYexqfjn9-B?V(MWdQ}EGc7D@u6qw8UD0+HJ z)hfeSATaU@YqB<8OL}wD1EP!b1j+acO0G6Bwyp(_tG!VcWFzg9`O)&?enxZ+AC0sF z_n4mNZcJ-@p+=?>$@#%GJB}PRc6^I`{u6J>?zFVs4Vs3 zV})Bj*p8{ik!(OdENm+-G z(T9wd+f{z_kyJ~k4?BBfC8CZ8AtM%?oLuj`yxku;MOXd&NlT}0r9eHfIctua!6lKJ zAFQHqYr+LQXaiNESC29bHV)n8Iwp4b@GMEgo^UGc4Q^YNG0ao9dNlBR!UJPJfu@?G z3!}R@m9bM&<3z4t0Y0c;+gR18wdm3?`L?c&-dIxoXZc5LBpo+};+Q{=mPbdU=O%IK z>%a?>)2u@8M|tF>U;P$e1E3`iA)sD3Z5`OD7qbZSR1f}yUFQt5b|c%PEkeCKjs#C& zYx5`C)FCa(Hc?WkGvdb%7b?8vZ)}qQ4Qj;KTvRxF(Nr%6a@9I~0yK{R~%YIPQ53AZ}9>bqr3hw<9T>Pbg1SN3zsAnf*Tz)-D z6-Ca=VKz1iyHh`&+(?4Z_NpH7K$+yZ4sz~uZR&0fXjBz`))JB8QK0nDBzh4P^&y%n zZE?y;oz`!MSE{m>i~;ND<5RI;B-=)w`^%#`Hm2#o)7l5Ptap$HzF706*>1`@bRA}0 zXf}Sjf31~BYSj4?E|uRZL3#EDI-i;QghE~Be_P(?&gA}7qo1B9#V12z zV$3cV9$$ff8RDgO+{&CZ`pq>xYO6D))6=`X3@So*$P(pvWq8msQaPk%Y++Age1W~y z##Q)SS`mySP}w%}$H<`yuNBqSThhA+AzPuW_zmo4B}3JdWmH2zyfS+f0Or6_4Al`h zzkB{k!qlw#0%{P{xR*nc?sU+cPod$L@!FAcwK+IGO=iNy&@WXZIt2S-;?}PTA-xfT zc>Z@{-9azU-$}rX=j?E43kV||L~g3>Jx9@_<>s6jLrYN5^>8%$1ag^53la+2tZlE0 zS^b%f3(Fvm$&8j?ZuR@of0L|hH<#Y))th&D&3NTAbx7i0EeY;+!>g8*2pK^g_VAcJ zQ)NX9;BjP(L|*f0B-?Vwpbx!+=LtRVe^bLkQJ(Zk2~S{k{Q#wW(Z|ynZha&Pm(h#8 z>Uv`gI7r&*&Tl@a<92(1Yg%G*ed-}umG}+!X8+&W=1lpUj-l$mV_(~TRu8{Ys?p4v z2oP6E8+iwAYh76R$~Il-Y0gwN6E!2_Blal3(B}7Az@LPLcLoqxUfn$gA1U#9V%&yz zib>bg)z@PJt&xq7<s6kf0Wl|X#ipzxFA6F^e#Z626g8*Hf-MxuFrwBWSs@KLz{-5ZqmnaD(%cHGyV61 z>R}hpb+(h%jAch`RD1i05AqxV#bdZ>^SyL)Ur$hwKjXbcBH<$zQFDHpL*i`xj#Zb4 zVx`&zd#9paelO8l=f6s<JwuTPa4+mI`_HwCf97OT1zr=px>t7n?^tKbQZ+es*Srw2~2@oFk>WzRO;giq1KF z+c`7;j%P>It4oMXsuK70x7SVAzE`JCc-@c1&z6_Z#{=MLzos^tKmm#ZpJJYw3R8$& z4JX6noJf;qVp7JgSOI`u<PWOCu*ssjU20im3=?!}M!sSk zQzQ@)I8En}B4W5fbV#Q^!JcZ{=tSANG#Z?1OJtBoOhE*?$amuFFIEt}7%r3erWpGJ zW3Tf7q|(qzBM%<5%=@1vw0NE>*(tisz{zaMXp?Rx<7qAQ6eru6(QR@(Q}r9|XXI(E zVqt4zE*+7*$+DH1XT5|~AN*!>efISe2)9xV=8!&IqwWb;T*74$x?F9ohjKThw><^* znF8)y0mtV<_bSeNllik8F6aAa=#5qf)77JRcS}Ow-9$_E)}XaNpW_4pHnseD;1Y_$ zwbJB0Nm?0;NRnEK+l#d^fJKLa7N%op_jP0RMA1T&Wobe3IMUN4{;|;XM!47)3|Sx& z2C^#REyuCdWksF3#aN{;oQ676>tvW=2Su4Z){)Wa6d9XdW}}7r+g|w^VrJ|=Y>@cm zaUW)1osWTTTFH_JV9sB!CMSh zMB;Foma`&b?ng@AUf4Z1z!et`9mHeSl_9Exv=?XSDG546BLfp3hI01M-h64d;&Ygp zF&!O2^9x~Snq?N8Lxv1T&>Ix+`Z@g_GP64!^DhDLVU=5d--DwD_@(+CD}eknUZ*BJ zAwHLjRV9|xb_tm__F+(F*hf^8?;BE47vq+`*-$j|LdE_w|Emb?UZ%21X+e=ySvgzKjz|yBjb$*zpT827i z30@^y<036s1fTe>X|ltM*VI&UYjRp>Q>9PW{MGKB&Fbd|ebOw^9| zO?Wp(AJHh`0`+V;><-=R!sEKScuXsyyx_k^xibo-;nSOHXj0ooRoXsw*_Q-JV;*0( z@VXmc*di-7o}TgDx32z!!rJSNZOYcIHrn#*Tn{T?Efc(Ci%98X*eKMjsh1v$bJ={! zVmS4C$8N}|(VULcKP@_CqLN{i+~tUY1)MvR{1V<4p&RKQ-W%sAgWh_Nrz%9$deXfj z4_7L=2xDNeGD^P)Z{AMwaHMb6zI%=(<1RX`ApfVE6ZS51D5X!~YC_wT;b-()e3GrM z5<=R~F&bZ$t}2_@_o&(neplgRzt^|~EMdw4qX5nhkuV%HPGtKF)AActapCia7Oc(< zL!NbCOWKX+1(gJ)d_-#_`G#iHB2Lz*>$+th_+R&K8kzY`t98kC3P_!xWYa*-eI)me=s;#;Sy zxHZCl2sB~thzHx68=b`rbwFHm@|a`X^?=`-0I$a*VQUh*@)&Zec}@zayoW)qo#koy zs3MvVr3|tfyU}B@kRfdLFgFd|vAwXL$I$glM<|>c5C1Q!lh4~8hvnw=6Iu>O!@a8R zR$Q{r7c@&##VR&;`XA18M}@U@A*!n3W_BBPe`pvb)=ifFZS@4AR-+r>LCVc3lBzv? zm$jwX`1*HtHWEJVHmqMG3=ve43*vj(BeR&ubJi3v$<L?!l;hxgSyEd8Q z*_@IUzhmF+$_0;YQ7`(`hL%?VSx2a5W)tSsV7;I4V{*=A74X{hS!!VoRo)rsxZ%?U zF!nFj3oihKEtFy4>H`7L87)|sRq2=>Gd{McQw0rhg-pA*I6{GSCL{vp7G5TU6fb(^ zvxxnAzb3zos4~gWSr*1J>&~X* z&+|w^-ouy_*2c!;LtE`c>-BCY@lm?;B=39GY@KNMXDYu_*zaC2`v0Kjk!5eHDiA#G zczeI+>YXvt4$DI-?pY&xUL5)G3sA!!qpQDyFs7*airR?7F^fLJ=%Mnle!UZ#9WSz7QC>i=&@Z+e>R&)KUk zVfRhTdKq^#PXZ#nevWlSsJ5i%eD`h&&FZOBcfpX(;>$T0ZZ*$mrzn-&Tm|RtGWF*? ztQ+NgKj6VP|MPFj1`E-|pwomTh@EwG&{nsq-Ssyu}m~m3(u=J&<{{< z2nwfzfIQ!*eYD7(-fO>*JOGSNJ%D!}?cfQ!iWRoDaqlGnZeQ!5gEtIhKxnTJ85Z4z zbi7}%#2)nez7~Un*sY_Vko*2sJNq~Z(8q4$n2l;M8Sq3LF9`zvg^aWuqru8I?1OTs zc}E@8LCvvh1Yp85Kl|zaeID<$Jg9P7-@OeWh<=91YHRrwbV9opJ43d%R#`t@e%sT8 zBLjL)D`M?CU|m^tdX-h@$2XJNT3hpvrYvi*uKHPhQDg&NGGZ?qz9+fNNa!Y9rB<^s zGM91wHQX@70Q61QVV_jAsI_T}xGiTd>y-1Y2^pBR>;U2Xf8&%MgGwq4qGww(p1Wuy zG)6LxNrJ&8E(AX=`rhc)SVb`(e6rUms^O-Ass}geL$9}9(xpYKskL44Ldw=_ zm$&XoZdz~h`cPn2@G|Q@3uH=f`R(#V2KJC3?z7Z=SKAH_x}(7ACr!I*nQt0lF`P1v z)L}-|s7mnfP<+Gpcm%e9i;sE>BS1@s$ZWqddW9>H0Uw%y{E?0`CSypVADaLm(S?YE z^Xev^;@iWd*=3Ov^KQ?|V3mOmnC?{eue#t)qCk9L!=*K|zWLO0e$;EacaxC}kg>gZ zNDz@>Y0yOEj1+}`N7Tz_sn7NGMd#j<7WYeKdBWZ*b_ypLDDbGzBd8Wrath7CvaRPs%Mthw`oi90)ZtX2adtsaArSygbFeC#wt0;89@1}1yCBaOoo!RBLOzrkO z2bDKDVU2D*A{?_UlxMAH{Ar6sL5dGeqQ#I`()~P!C2D5mWmaFe8l5fz?ZH+zQYMo% z;r9nON9#wv8}=?wm9q&l-%Br3%;OPqM5bLYTo6`@NMYWn=gM& zxVWQHuB~KR9^J%WAKnI>)dKvg_%)CU)??GQfW zc{_wF?$xEIr{psv&1T1#V1wD8t#Qc& zK`l+wL3As)I@1iarUj~tP^f4p+V6JXr9gG_Ua0$^k0DPbf;iUk!O;|p-f5`xnvy6} zu+}n|vT%G@XnGq}V&Gb-E>_YtC%S(I+;x#VRwsAZVHn{Yb80xfQ!jmzVtH6(kYuEk zU?Iv0$Zw`tk`{#rK4_~$?s<+?JR2Ve9YoozhpAN_ZL z|C&scsz9#g4w3|#?zlr<86TZf^A3mv2zFfZg3M+Hq!i^9=cM&ryed~NNaKsrg_5A# z^}7l9yjAm`FnaIv*Eo8gL&QL`(WQYc$CQdWm!*$~!VZP6Cu|C1dB6U)Hl+qz zE?=+|RKF9zNIlTEf#ESzU|jskKdOriF>2kU!fBg-N?;4b1byj)v66b!sg{KvY?L2% zgSfliZmsli0|GqJ16zOYxrHa_0Efwt`NnPNa3u}qK;GAkb+MPE+FbzfmIzx0fx@VkKE zi+b_*yUrOAR%GGfI;x=GV{@WIcQFt{>cJ4H_j!Agk+1@CW~F7@&sI%m7Ro`)r}=G* z&sfRo?{4?K#z-I}7s-HPvU1S$*QPA9W8wb%*gKcsb_rJt{u*4K(+?q3FI zE3`4*RC6j)?R>1SKMakGSAmW{OBnG1NZ&}HbXaI($$pBHW%4m$H86_a7jvunO`IM_ zYk~zXAwTQd@q}k0xJ_fAO0U;L`_pQw;eMltCU><@RhODR-pl_%@=*KJOb^3{5KS!7 zZR5kF_@;i7clc2@9793lz&N}4lMx|FXXk*6m3}I(^xaLK{%~f!f_WQq-o+~E?fO=e za`NFY2)6g#zb++GVU#IQY=f$D~Ft z7Et3k54U;ySak(>O&`X?ml$$Li~dHZn(T&SOy7s5V%TAlrn)bzRp!N<4j5tkQN15}~*qezT+_V7L#H z;B>vtpt8qILAFOC&uiyzrDlc<0bryD^_Us7CuQd4vousskcZ({^qZZ(Plt4#(G=hU zA{uCdzMFtClFF$fUrV>vLwj2*y#3|#CqHH9N6(U8lZ?Z1V2t9y(F%fttl=G>$yvnJ z*IyL7L>_tHJ5b=B&c3bzk)pXo!ji{;8Miy~$j^BlygA4ihyAtf4sM+@1IbOz5>SEu zKw4KBWe8crEX|iw+U=bw+YVEeRF=zga~cJ0b8=F^KJn~k(NAfV{B)I#5kdqH?$sw) z9X->~E3@&9v0q9DhUb=0*@q;{7S;&(u8y9X$yVcsq>^`lYjTdOe@qY$xM5(<{G}m4 z&rFnjG>>`RVn0*9t&v?x^`T(7dlpDS--&1DlYq@CkGy!XdkAtl%60ON{wNO=d)Ih1MFE-!p1$(6zH-XdRj z2r)LYWKJ88U;ErtA+Ds`_IrDt{aHrU`6?1*wR?eIns~xxm#er%dnT?97{&grCP#zM zPbxBC!>91&i6ooR3|*OyzUTE1&JuWYV;YZYqv-WcbA2Og&wk;>=*-RQFMJTZVn1@M zo))aXdwU;ea0OUR!Y_F?tot#G*f$JA$4Y%w*M*m-{|Ya*ey5k=$fn?J!=TuK-EQrP zv?xcuAAU$H)4M~Cq>s%%9BMA^jrSu8yvK8p(bi)?EM`U_E6YdQe2OXZIH}z0!cB|( zBqQ{7L=;iQmRFyi##4M&t7Z{4@f~O_5+6!IXNI%gGxQOD)%=KyID7Pddqfog)mOH; zb>X+BtZb8ZmNLC9YZ7TxGN-PA_c>@MA9kc6us=$r=MNR=hZ^dcIeszE`QE_o`tiqyGbkO0`=rmT!WzdhD)7 zc{5d}(aOVV{~3l&PWz*xk+9GA$><4}s>{c!mLMjoxsU8KE1wA+8dw(68N4EMot*eR zzhC+_!{yvFdG%X{baK)itm+#qG$^hz*Vvo()hKtY2)$^GTHK1CW5Tn*z|NFRAA#$U zxZ5N8>r2Hpqd)x0SsmF*l8Ua1k~nc{H7;Er!1bYx4+h-17B1= zlwJ|xmq>%=ZHD;=Va@Mjw6KQyNR#Bm`?&o9mAR0nN>^Ld>B|uHwC;BpuCwj@^zE0U z%wXs`mU8`o1oD=egTB-zYK{djP-?SGUl@4m&9JnVkgpj4`Ff4U11V zQ?%joqAJ>9ugOJ$8sgaiReiniY6N+`xs2oY%l&{2_PLCEySq7-WjGDb#0pf3@NtB8 z$7Z|qx4JfV25Zhc5@YDu{mq@m{qKy4|EK~dEctJ3t7PviMs;@H?4;Y5MK0MzB_&Tj z@YP3gl0g)FflS?B;@TAoT-#CNUMlHKE((s@X=H!@bAj9Fn?WMGc%Fug1|XxqHrQ%m z9mSjF4lfB}QG$kcNG8Is+o-0QyJW=%4p{lXNIKlQ%5?jPSN>+_h=DUGt(OUjA6Rf- zU|4vROdBd`N^nJH|E86s7Z%?Ox>-SdV8L~v2%7#iF;3rv%LxneH@1YIq+#vmZ@sjp zjk-yx)tZZ{w%hHAOm6UUGpwMNj56r5vHWHsU>1gi*> z6ppsX+_ikZTatamG}*asAUlWfxXC4Q7-m4D2i6G9@Ar`pm9!&juP7!2rzl?P&xyO)g9iLAd>VvO(b z+c;P1I)smU4V}4L2ep6HbgcI-(SFGDG75F3PAin)wT}qp=}^qyQ#lj5uW+h$#M!Nk zVPGqP`AM1!qLyV8!QvOvLxH*v22iFw;XH8L3yIlq7%J`S1_hMzfEn$c;hl%81T&DH zBpngzXPa24#u0{~nMxiaJI>>6fDW2IT9QIP24d6{T6bkCvWGFMAA3Wz$+NPfQdop5 zp{Y?tMcpq`T#&0TiFM0-k#Nqa0Lry_=ft<;g0lI*D{=JqYcs@WT5dqTf;qopL}>RG zWyGjlrWz{yR#LNBtshGbJGD)(Ilg4&rVyt9v|E0yd`NRT_mfd~I9Q9rOqh={BI3C$ z7qgx1h;tF0KC~(DEkF5R>Z)|-dmDnho39!u^*UrmfkDCrE%C*4qJ&TFte?3NCbc>l zAnZ_DLG4bTm1YHQwj6?W1yx4!K&bP^#=Hw@N?#RE0Q6#DTu%#dnF3)}Fe5wKnaW8x z&4(}gEpAr2^Typ4q#KAU0m%sCU(kcOx`#I*v)kBms@w1Z!fD|D*Z3;276)^+1@i;< zQ+WVppeqmHvtZk`%(DVqh)${miwUJ8!Rpo|=na=~YXe!9%o0Dl9nUjnrQ&(~M7a!f zN@Y5|(`cgzTIqhx>StyE7PrrG+db z)UW+WatgBlOikJx(GEXJi)Bu#_`vcdt~XV6+OJNZIf)$+IEC(vgDa3&s>k(g_5{^| zF_O?HJ!z+882X?jCO_Jor&6@Bf@Mg~=o3bCR?465pK^36^#w7ODVltn!9O4avSsek zcxR5H|D15-6vfun6fjq28Dl5qlE~5497n(QgBWp&t+X|t2%_8^&oLxEii=zqTpOCT zj#&wOsRh~18G>qnfQ+p*=tX}VGnl88j>E&pQk|&H zZKQD6d|Hc$#=8wD3%w*f*QbpZ2!2etH_LJxFqjoam<>=m{vXkCKEPBsJAl}>+Abg&-&R0}Nb86-c4mW1Mi3K=lz-x$vdZtzR%p z4I=>%@cC-Bf1@JtiH+&cW?!8|>giC7bpXl6PCAvWC58rJGD3bV=4JvDzHkys{!v6O zW7k%&8=t8E@6Qk!#qg71=KrJLkD&Fh9#4q zTzCX2)J~-45l~{b3bc52%52RRE*DMBc51OKYlaP|eN30iGz@|sX7aH?v2P-(bvCt_ zgr?vjsfyRmd>>gId3nH1M*-BZ=gFBAdf0u(Q1OJ#hXJ3=f?oLzmH2bvNtSm8Oanr% z8x<{*EIr#Re^umZT+v%BC`iDW(V+LYd10Fr#`ZDhs}Z8GXH5oo>cD4<)>^}%Vphv) zhTy~>$$mn6WS_E0B)*l=5nupcV1K~BB#pj+KPXk_HaG|y+>C!nyYY=ZJetaTBfcvm z`2R-$NfoF)A4X5osZE}*P39>qWTneREN=`iVsK~U!6f&n(5n#y1{E+{QqJ)ME$+dK z{lwb6qz`>-!josczsY>OUx zzRl;#*;J=f^bXc zhNg`MF?GXnek>A>7xwHp9XU*${LsdR(S})wg~ShlacI`#;{9qBdRMnDK%fPidaSwN zY-^*8*`@-dL*^`FtBQ^^3*2A}EFc>5NZlGT0x$syTw=(&@TAQw!Xe`8he40s`Yg^86+}I; z{;>*bQK8*+wu`npP|mMD*hQ0mSoDBq#oQqudkQ`Ip&FBwrVNcD0e}3HeV1m@woh~Y ziDDEvi~(YcSt-SQ%L$XqpJ6ZfAg4(#Cx)1((rK4yCK?}C3J<=J9K1*f?#V5^nwYk+@xE8=3s=P*-~vY1b2GnZ+#Z$?N3g1w&uX%F5yj z;Qfw3_GlCQ%lWe^#->rI>Jiav8Od)V zkG`usizayOSrB`6IIIN~Iei`J$mecIrLnaFJB8}Y9G3l^3Sh-oll=B+mf+M;-E0(X zjf397F$daY*ftN{p=vWuJ&G1)oui3bBO2tQGqXC#M+q^y+Lt)&1*+#{hzRgmia9+V zRc$bKd)=#^FP5Eo#qO3#N*)YbMxvj!X;({Jan^&N63%a%1iu}-{^{I(sj zr-{Caaq=}Dp1UE;zeF=YM$`{o$fyV0p}rFTh7M~4!U^B{DH^5W%?CR z`knKG<*2)|{HmC;cdykBXEhlDYthhj5wkC%zvZE+gjMEBSq89dZf}=g((0J(%q}Jl z5LaKz)5WVuejA?Qp5fxqyhH3Fk;wi1edqJ*>#v6drF$Kx28GOzx)2GCxUmF5iaXyH zS`VN;?)Ggce>S8Q3c6F;ztKr#OHXIksM!!VhVgTG`M|`)#H*>PsjalMG%o)1@DShL zw~7l+(5(~dBwSMW9U8z=V#8<{S_woYvF+$p0|Nt#J3Bjx;V>7pGC)eS_rSY}XcGR{ z7Z}>iMk#s6cOx1NA9d_S&I^$rX1~apj^p@Np{Yf|u!GmGuCDesH?3!#zwiC63?BD= zvwl7@O8=fb5XhG*>o2}~kDz%zsrbni?R^Cuuc~#I8J)VxH8kyY6==xRGVR3|qx$hm zbB4T9gMEsU&JpR(fV~Bt0cTJNmtD3!K85L+AxiL>?!kAvq<(ft`uF&$B!u`I+)C^kYCf$>a+2lFCC-buS@m1 zZ)!`xkAXz<%${LF3($|UJqS7lR&vx)dS~0a?ZTzz%KCTjUh>aAvczK4LcM}F*+7vG zAEHG8hZ$A7z!vC@rr$l7JwQDAUhM!k1}CO{$4v|kJr&r@)VGa#X!MU6!Ykb!qNvOm z=17iZb)E;}0NCeuR><7PTM0R1R5!_Zt&?`jU>OhdEqx}2EJ&T zF?brUYhKl7N6^>Y2iXmN5NHRyD?hg(5hD59!b7t%0C%_K>^QmJ=wuk(1;W5j=cY3o zYx=88Ne5Mp75(`N{H(>%CmWzEH`qVQHfg}%%!t>p!)PdA} zS*=%rScHHGe3>T?Gr0Y@ySTWxe|B~j=Qh$QAtq)?CcQx6gPzc6{qDo))G2PPod$m> zQ8WI-hda^~IacY+itX*~d%1aecWjpvomS-E3q%5LP^Wnh$gRY*XhMV=H)-g9*Jq|; zzf);d^Ms2(1mXhpN-{sqKFMFVxBkGCH0pb&n7Fv#sJ)ZblM28EY-|)t>&DH)cw7pZ ztusO@c#ikrY_yug;k7FV!BD>Cy;yq<^b)`@{uujeVIFuR*+|<=0=iyp<6dJYjZk@} z@4&$?G1IFnV1=b;*fImUrhbDq2bi(D^i$AGz+H|c-ou9#;dM||LbBU#4$_e0`jq(! z-c*s`(~FCX0o6sOB3#NmQDpr(XA4P>#CfV!vVMye$tj7?JlBU>34zp=0NRc?h5$$g zFALHcFmnsK5<+~LsF8YK-kY;MLj=;!{o79T&sU1_#%TgVmU4J{jV|so_u4J3<99I4 z9pkvC>+}A5G9KH;c~2_np47vN0`bfHsZbB9~I zA^+JMXKyaQE|8%MEUd-0?pI@q-m^3?ag+X?`}zRlM)zozu4 zOf_KY{D+4-`2R*9xplQ95}2q{zgqvvXwP0>W2}+4`_M^A`ysvx zn}BVboz_{(69N=&&r;p~PiS6>m)ZmehXY<0R8)mdXiRu`@||SXnH$xn!U`L1b4HwF zVqy^!?f{h{+ajFb%wTBD16IH0S?o#$Gnp>t9ZcQbS~)YlH&FNl&@)fpFBAj@lR&Cq zQFtPko26|GHL*RwdhO!ev>vnCq>Bu4QBN|xJXbC7>@J(3DK51R)oxBZv zE)5PAKo`e&i?}4*X4-q$@BQQ4-PLaH4F@8CA+cu4TMmH?wF}x`zF7GgOIRy8Bp3tZ zE-flkfu)F3XRlh;ThsWRyB0<2dD}t&~*G z@TLAwpa1-6Su$S)Xm$zE>|Ha%1vqpksK$gIxpsbO*S9-slhwU>!&N!<@7>E8x$u5y zm$E^u!+}|O&qP@caZTy|wmttos4b9~Z4(yJt-gBu4R`(>e`l_a-(UAuPF}uz{rdH` zeD5V#I7$QrHdrZGvoyvrJ$3r~_xJbyn-hNRKmEpIrs~N8=~r_aO3r0he_bxO{F_>~ z#JjgoD_D$x%{Iy1%hH(Ub6kmTQO(%9XHU(UwA85A#$UzaUq|=s_0!uNws(na`vEJU z@2%eTc_jokI&bHC|Ni~uJ55r%J!)6Fe)2Y1&a&!n^mb5d!y@F1zOv54#Q7}SfKA5S zy@!vvKge(NVO%|>1{fGz;i)!*cwWIHk%ZbeT z%DBih}jfO(P+K%@ZSf+`scwO@UCwJQdo2>1{FpDg}oJ!i~Eo?9C}EE#3P2(^GDJCKiqsF@X(E+uaLU zI0O_N8XVk!v7dbXicbRr Date: Tue, 29 Jan 2019 17:02:07 -0500 Subject: [PATCH 4/4] bumping gl-vis modules --- package-lock.json | 15 +++++++++------ package.json | 6 +++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09d475cd4ad..35da1c57c00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4755,8 +4755,9 @@ } }, "gl-error3d": { - "version": "git://github.com/gl-vis/gl-error3d.git#93a5f0f5efd8d1801d0024f374616a68389c634b", - "from": "git://github.com/gl-vis/gl-error3d.git#93a5f0f5efd8d1801d0024f374616a68389c634b", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/gl-error3d/-/gl-error3d-1.0.12.tgz", + "integrity": "sha512-OaYMB0G9RJx8MfC16x6Q0TnYKZ51nrac4GiUqBlIKyDuNGW1U6YLmiuzY3u6ftQlh0jVhk7lDXCawgAeeYA3JA==", "requires": { "gl-buffer": "^2.1.2", "gl-shader": "^4.2.1", @@ -4805,8 +4806,9 @@ } }, "gl-line3d": { - "version": "git://github.com/gl-vis/gl-line3d.git#db5e4cfa81023bc49b1e826ccdbca5c702b50e26", - "from": "git://github.com/gl-vis/gl-line3d.git#db5e4cfa81023bc49b1e826ccdbca5c702b50e26", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/gl-line3d/-/gl-line3d-1.1.9.tgz", + "integrity": "sha512-00E3VAxTXGOpn8cGImtMaDnKs6UkyVYEZ2tzUBYwjea9N8UB6wvR1NBoKwb0A/wFNIYUsLhdc3LKZyliB0DVLA==", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.0.8", @@ -4935,8 +4937,9 @@ } }, "gl-scatter3d": { - "version": "git://github.com/gl-vis/gl-scatter3d.git#bf062279b2a6179eae4f6d068ed5e74672da14af", - "from": "git://github.com/gl-vis/gl-scatter3d.git#bf062279b2a6179eae4f6d068ed5e74672da14af", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.1.5.tgz", + "integrity": "sha512-i/5Vrd2c9rqvgISkJcrSz3st7eCCIBgCkICb73MBJANd+PI+ptRZ3mgrUttwGB3bQm01HKJPpBr/R4/gQ6PPAw==", "requires": { "gl-buffer": "^2.0.6", "gl-mat4": "^1.0.0", diff --git a/package.json b/package.json index 618b6155bbd..9958f7c2080 100644 --- a/package.json +++ b/package.json @@ -73,15 +73,15 @@ "font-atlas-sdf": "^1.3.3", "gl-cone3d": "^1.2.2", "gl-contour2d": "^1.1.5", - "gl-error3d": "git://github.com/gl-vis/gl-error3d.git#93a5f0f5efd8d1801d0024f374616a68389c634b", + "gl-error3d": "^1.0.12", "gl-heatmap2d": "^1.0.5", - "gl-line3d": "git://github.com/gl-vis/gl-line3d.git#db5e4cfa81023bc49b1e826ccdbca5c702b50e26", + "gl-line3d": "^1.1.9", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.7", "gl-plot2d": "^1.4.2", "gl-plot3d": "^1.6.3", "gl-pointcloud2d": "^1.0.2", - "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#bf062279b2a6179eae4f6d068ed5e74672da14af", + "gl-scatter3d": "^1.1.5", "gl-select-box": "^1.0.3", "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.1.2",