From ba00a5384dc8461c655fe0df902b5f2d92f4aeb2 Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 13 Jul 2016 20:23:35 +0300 Subject: [PATCH] Render themes: texture atlas separation, closes #59 --- .../assets/{styles => icons}/poi_icons_16.png | Bin .../assets/{styles => icons}/poi_icons_20.png | Bin .../assets/{styles => icons}/poi_icons_24.png | Bin .../assets/{styles => icons}/poi_icons_28.png | Bin .../assets/{styles => icons}/poi_icons_32.png | Bin .../resources/assets/styles/mapzen.xml | 2 +- .../assets/styles => icons}/maki.png | Bin vtm-themes/icons/maki.xml | 95 ++++++++++++++++++ vtm-themes/icons/maki/atlas.xml | 95 ------------------ .../assets/styles => icons}/osm.png | Bin vtm-themes/icons/osm.xml | 44 ++++++++ vtm-themes/icons/osm/osm.xml | 42 -------- .../assets/styles => icons}/osmarender.png | Bin vtm-themes/icons/osmarender.xml | 60 +++++++++++ vtm-themes/resources/assets/icons/osm.png | Bin 0 -> 11628 bytes .../resources/assets/icons/osmarender.png | Bin 0 -> 23244 bytes .../resources/assets/styles/default.xml | 3 +- .../resources/assets/styles/newtron.xml | 2 +- .../resources/assets/styles/osmarender.xml | 2 +- .../resources/assets/styles/tronrender.xml | 2 +- vtm/src/org/oscim/theme/XmlThemeBuilder.java | 5 +- 21 files changed, 205 insertions(+), 147 deletions(-) rename vtm-playground/resources/assets/{styles => icons}/poi_icons_16.png (100%) rename vtm-playground/resources/assets/{styles => icons}/poi_icons_20.png (100%) rename vtm-playground/resources/assets/{styles => icons}/poi_icons_24.png (100%) rename vtm-playground/resources/assets/{styles => icons}/poi_icons_28.png (100%) rename vtm-playground/resources/assets/{styles => icons}/poi_icons_32.png (100%) rename vtm-themes/{resources/assets/styles => icons}/maki.png (100%) create mode 100644 vtm-themes/icons/maki.xml delete mode 100644 vtm-themes/icons/maki/atlas.xml rename vtm-themes/{resources/assets/styles => icons}/osm.png (100%) create mode 100644 vtm-themes/icons/osm.xml delete mode 100644 vtm-themes/icons/osm/osm.xml rename vtm-themes/{resources/assets/styles => icons}/osmarender.png (100%) create mode 100644 vtm-themes/icons/osmarender.xml create mode 100644 vtm-themes/resources/assets/icons/osm.png create mode 100644 vtm-themes/resources/assets/icons/osmarender.png diff --git a/vtm-playground/resources/assets/styles/poi_icons_16.png b/vtm-playground/resources/assets/icons/poi_icons_16.png similarity index 100% rename from vtm-playground/resources/assets/styles/poi_icons_16.png rename to vtm-playground/resources/assets/icons/poi_icons_16.png diff --git a/vtm-playground/resources/assets/styles/poi_icons_20.png b/vtm-playground/resources/assets/icons/poi_icons_20.png similarity index 100% rename from vtm-playground/resources/assets/styles/poi_icons_20.png rename to vtm-playground/resources/assets/icons/poi_icons_20.png diff --git a/vtm-playground/resources/assets/styles/poi_icons_24.png b/vtm-playground/resources/assets/icons/poi_icons_24.png similarity index 100% rename from vtm-playground/resources/assets/styles/poi_icons_24.png rename to vtm-playground/resources/assets/icons/poi_icons_24.png diff --git a/vtm-playground/resources/assets/styles/poi_icons_28.png b/vtm-playground/resources/assets/icons/poi_icons_28.png similarity index 100% rename from vtm-playground/resources/assets/styles/poi_icons_28.png rename to vtm-playground/resources/assets/icons/poi_icons_28.png diff --git a/vtm-playground/resources/assets/styles/poi_icons_32.png b/vtm-playground/resources/assets/icons/poi_icons_32.png similarity index 100% rename from vtm-playground/resources/assets/styles/poi_icons_32.png rename to vtm-playground/resources/assets/icons/poi_icons_32.png diff --git a/vtm-playground/resources/assets/styles/mapzen.xml b/vtm-playground/resources/assets/styles/mapzen.xml index 9c64ffe85..2866f9bda 100644 --- a/vtm-playground/resources/assets/styles/mapzen.xml +++ b/vtm-playground/resources/assets/styles/mapzen.xml @@ -2,7 +2,7 @@ version="1" xmlns="http://opensciencemap.org/rendertheme" xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd"> - + diff --git a/vtm-themes/resources/assets/styles/maki.png b/vtm-themes/icons/maki.png similarity index 100% rename from vtm-themes/resources/assets/styles/maki.png rename to vtm-themes/icons/maki.png diff --git a/vtm-themes/icons/maki.xml b/vtm-themes/icons/maki.xml new file mode 100644 index 000000000..c0b618d36 --- /dev/null +++ b/vtm-themes/icons/maki.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vtm-themes/icons/maki/atlas.xml b/vtm-themes/icons/maki/atlas.xml deleted file mode 100644 index ee786868c..000000000 --- a/vtm-themes/icons/maki/atlas.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vtm-themes/resources/assets/styles/osm.png b/vtm-themes/icons/osm.png similarity index 100% rename from vtm-themes/resources/assets/styles/osm.png rename to vtm-themes/icons/osm.png diff --git a/vtm-themes/icons/osm.xml b/vtm-themes/icons/osm.xml new file mode 100644 index 000000000..9f768a2bb --- /dev/null +++ b/vtm-themes/icons/osm.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vtm-themes/icons/osm/osm.xml b/vtm-themes/icons/osm/osm.xml deleted file mode 100644 index c8d7de769..000000000 --- a/vtm-themes/icons/osm/osm.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vtm-themes/resources/assets/styles/osmarender.png b/vtm-themes/icons/osmarender.png similarity index 100% rename from vtm-themes/resources/assets/styles/osmarender.png rename to vtm-themes/icons/osmarender.png diff --git a/vtm-themes/icons/osmarender.xml b/vtm-themes/icons/osmarender.xml new file mode 100644 index 000000000..c350c6cd0 --- /dev/null +++ b/vtm-themes/icons/osmarender.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vtm-themes/resources/assets/icons/osm.png b/vtm-themes/resources/assets/icons/osm.png new file mode 100644 index 0000000000000000000000000000000000000000..463bb5c989d42db5b36ad084900ace60a26637e1 GIT binary patch literal 11628 zcmV-yEtArTP)V+;b)A z0^NeaU@`nENf#NNuh=RGP_bR;1c30X0J8w4f&l-U1n39^fw#|B0yynfr_-kN?%G1K z=uTI1*_3WBht<=;Cdn0&Hy{9nemSs@32+#wbuI`nxxwU%fL4shV)^V_Hp{IpyK({u zx*SS3?YukL+7hHVDbCxht_sN;6X0VOzJ|}D5#W(W9=Qp~29EIlrcwy~Js@jRgGmRm z4-#;E2K!||KOpM8-APh4r$hNw2->d9*UqE$e@f@vc4dnz#d34$pPa{E2iPuod>cZr z4(ERbQq0^YAbA`6CC?+#;FJ2*EK34F*!KdbLkMsNs2h#|EPOxE7?64IkA(yfYAs+I z1if1mdITH=<^ruF-80=${eHCm0J?(BT^mb^+AS#Gg8*Bd$<`L}d2%FRkN-3T{yX-+ zsqhhY;y5T}`u1brHrj0<+;4P(cH~Ol=7fMW=&?fKXLb!pnbA~XFJMIk`~Vaa%$mM0 zHXuOI%R_{(VOazMP>XLIa*jxl9RmR@z;+YD*Q0B+`*yNbt&dipm)&`bKazwe+dSDFDFAUZJ z-HQ>xnQ{pMg03Bc>wxQl8`(3cVn6^=`*O%R(ga6hRR3e40Zw6`6He&3z6bj}CX1z5 ztG8R9fWUjE*%DIF>cwwOOR?PMa#VY%Q?h(hCtE^uI@h(UR5`7Qa=+W5bWgKepN$6r z))-v71?P7G+i+a#EE0eO+%ycn0(!)m0HxLdOn@r@8E6-w)qew20`Aa%wzK1sO9@c# z+qvJ*hr0JU?eZ5+d%|mlHh^q%+2w3>4Qp`yIK7wlZ#b$Z65>sOw!jHo+l;+68UcKg zXQE&7Zou(AjQ}`zNkmFI< z0D}uiL)`%0>q@C!GY(yV5OfH9$5eyR|F`l^fTX0P%7pUZl13rGqS%5#@@w$>|8OTO zjk~5u3FHBQ2m{N&2oxT`SjHIOZ6L|)ZBzny+hE@t_)aJI1AMM`u9TTvRs=9;(N6(E zR^?BfWdghwfdC6)5dQ0M0r!zBs2POl8WvL^$mx(X;_U^jDa~!pwGkLb_c0~H4}#yO8iex90wd6_3}qwnu*+WU(Q--vPkX#x!I&8%0oJj< zKRXPz8@YiY1n?UWz<-vtKxN<>AQ^ZTxEc6!c7tqFc1mg!5Wr^L1|#oqx?Op>z(#0R z^=_Qo4N@F{chIyv5nvm-fMJmUVl4GZ-sVwmMef+Z2q4v$Sl$T`kIiMX-0F4|5Bj7v zsaiMPX1y<-T>y+d|9SU-%CZZ9ioFDAE?w}O$6pzE5V-Y1`nO7A1VZ360{1?k4Z;w9 z1Ns4Vfl5-vc42G~=B13bz*u0jPUzvV6PN_N0bEWn$~Yp>h#!yqtqAv?iX@eDOMpg< zBPGC5Acastfb*9Cw=#YLHUc@oYQV>@S2K*R{S4G07zo}0d9WtS|DVg@UKQ`M@aP zc5?ZEy8s)|qqGEYCtZ96gg;B`j?&e5z+SiAnqID?09UUr&<$>3MnLlP_e+^?V}I-a z00EW&wRNwb0)}#)z;~q~fHTQ@HESQ$7HMi-4K47M$PBW{DW!R6m7I3vWtT(g>9Wfo zx@^iY4Wwo$A(6(L&3wrQY1kzYc6XnY*^&f~{R_ZLc~VAg5TX^(1?OW)47(f_%U_99bB_TiuoAf7q=USa1dfa8V_Tl4?OWkao4&@=- z=pbW52xz={ORB?iOElqAwojfkO5up#>slx{APs6j=hjLCE&~C2u8@XRjj^v5|Gd*- zZ5UDdAwmu(e4_^*CjwjotfUriK!C=;xRMY+jQwlEcgX$PHI^>M@o2zL$8ph}Y4(JB z>4xs6)&_;du(rUtHNZ8|K2L((E)7f2g?x(@Kn*c26^axsDGH_ok1VI1(tWNlo^w+e(q4-(FDVCe*pTie5fy!-#F5pMXL5m&& z&bTW8bzjsDFeU(Bdn?w&(6=71{%0EdHcJ2lbsr4(!0|sf0e%1|+qNUOuH}48_z@Vz z$Dae=0gr_tfR!_UWdj1#2A0woff)jHY9>|3_v~T!toTf&_2*C2uE!Px4MJ%n0%h*3JX(Lilw8lJ|Kt_kJ_Q`ZuURdhmy%J%CsVfO}ra z*vt9%#~H^MM|IHr|HF(w_*q?JAZRlF`i9X043s??R2}gi*oBVg3)xSL5UhS{tm;l~15-Mzg>oh>^zpn{BNAf(W zzZQ@(8sjs~;!S{1b*~BEhyIiTExYURMX-%zl z)xJMrB-5?-4}r2`%?Kh?_(mi+7X)Au+yMN+1lS(Q z4TLK`hX#GhT==QUN^N}EXFwJNKNFZv#}p1uZC;~>IT8db`K8Pb0nz^td|;iF@qa#P zz?FF2gpx!lL>$X+qE_H^$jxZ<%b6_OMPMpI{(HO#Ft*XyOD8p$^lsLDSvO_Z%f4z- z!%6=h)mV*i#)AM%f(L+|z%v)zaPVrWZ#ByMgTS3?*WhikR_bag>+g*wd;?p+aHE+! zqIK4vya+^C$n*IYRuG_^Z}A`iwR#Ap7YRMPVK%vKI|KphPwH3kgfDOcWY^Drn)~IA zlN(MRm)#)ydz_n();|Tu@8bCVtQJ`pRXpk98;$POh!IuG+dlyzcQ3Hc>w^U9{&$|t zA&Kecv+xGzuwOuKJdbu#$K0Ho<#=mJ)O6g03i5Lg4O9+x<-=7ld#PvGxThX0lr zK0yOJZv$OS;%)v+x!a~RoboWo>w^$}7Vjs~vDtgzGk*orfNY=(=Lyg(A?jiV1H*v3 zOZpqLZp*Ter_xpGTDhzU@R{WC&yU4p1G+K>0pz!i0zL&k14aX%10!_rYhBWxM{#kN zLs{T)FJDRBhnioDlm?Zjo)4w;Q* z;9AFOEnuScw*-Cwrt)hV5&V{n zNC^7~upY-re2p@PjsOuSxsuU|_xuVX_Q2;`6rkax4~dxNg#g;t6L?T3{MC{=)7Qr5 zXiT6_X?_}n*$X(W8!G*SLfD}MNV8k+;8{HSSv_amHo0#J2=Eaecvlky=*+FZH^1%) zVeMsGfNX;Oc)bn#s=!M^uni`^8+sp#I+DwYYhU1dm!a#q1IMFvT|fg|ACG&jrLF+) z@sLdrAK?!QG=T6o0=s}mV*E7atWiJN5m*V#1E{pjdOk-am|W7IMx$X)H7jSUPN+Ff zoBUHK0Z7nv9mpUVkU4>)J>+r}_FHu#g)|YB9%60M#70US|iqThjht9iWnFQf9tR11zFJDg0N?)C1QPDu>ZN>y4Sx>%G?mHSQJ_MkLd(W zmz96emYE&faFX}-WV z>Q1mf2D};8&u@@bmnwO3C;^o2s=F9U0L6DU0!k3doxno&`&Y6nNG>7;mu`&q`C*B}s!pjpKy0YZs6QuqP13@7KFlj7@sCn`Ls2UdC=X;==?s|4fA1qJOC_(@Z2pPu#K!8F` zP&Cc0B*VBRnbZk^-$q8@`4I*l6u1o~-D?=`}60PZbp4Z=sfAHt<%ihZVHlO#$6Z30ly!iU)nd;n;~ z(Z6~?9gYY5gS&^C<%|HAaqSk)rl3#=S>B}7b{Z9=@qrKmT*dg13N4rrzJ~vD z*Kij>je!-w1&je+1kex?YXCEWFM&S58^FJS`oPsd6`+!eitVg!5Z+V zwZ@wU1n935a95xv6QO^I@P`1G0Buwh5P*tE+(V`1`1KR?nvb<}RDJwb9(5d5x+jqp zyhyAY*mZFg$?KmHVN@{4%gFs94avDP)~}(8BTlQd%TCOoupsExE(9oQ1fppda zS|-tOCI=nwrXpJ0|9{Myqb5No{5BE#`LBVxZ1t1S`vS?_1xWhp_ncKc)1(GC9G`K9 zfxZ_-{J*fJuaz>^-2;Kkv9xfmX*W@;F$f<#!)aIMQsRbI(u}iuXcdgZY=Qq_plbJO z%cz|N0%+C0s2t5RKuh2ijtdZ40WH`LZ~@+;k-)@%GlEeN0G=$i-&@R+edf{$O3+gK!TG%7XZIIu^#Xo@HZ7j2tbD5my|RD zbOV~RyElaQPVO4!oShDn5=Ap%9}M(AVB*12E?_0f!qtjQknlzA0THc}Pq=9HYlpJY z&2#_Bu%ZeecuyX>iGArdYo{pR;a7)(mCYsnm*N+})7&@_^r6=veB!;p>%ef}XW%pw zfL^Z!<^ul!mIC8c6d^!O;CXKO6R5l#`upYV9S{kI<8@wq=LUEKUa0={&;Wy^K^u$q zy&`$Uw+Qw?$LOJ2r8^azL>EAQd*G1OYsXU#{x(nC$M=J+I zW$Y-|pYj9Dx}Bj_HRDKtI~f$^dmd;GTpwZ_-okyq#Qi_)sKi&86irnW^YJZg59mQ_ z5IxF^Qqgp^IM!ee1}meL=SiLo4k6m4`#sbcn09 zi~Vp;?vTkHTON&Iu4H)u-P=qpLw8f9F$lJUv`xok%bjIF01XxZ0!d5)TC%{25RU^l z>mr335iVhSz{m!$aI2>*qA4L*z_kS^%lP6r+5qeRPfY~zFT=ifF?ju71J9c4U#&BZ zY7BL-U3@wF+@b`H$lp(vn-pgHSogahv(^iD-*j6-TTwX+UPQE-LD~jG)a_PDcgks( zojL;4XEXzz1X=>m^8P8{Mc|EJ#{SZKX`iJuul%n-l?Vg~1^NEBGa;T~GQ7(!p~3r$ z5TG_2db2|pnC3MJse2e(dZAPJcTnISkqMOP9|j-)aWO9-G!KAUzQ;FPxQdh)NVY(P zNFmj@rBS$0;fq{-8?1hZnA`!O%WG*3To{H_l7?KrrD5-xTD6Iy(|fEtE_} z7GYOpQ1*~M`WP<)l+|b;1l$CuYjEDmGmA>;B9q`n^e?aw`=21(1MmcDL%^TI9w@9z zm6@B2>)+x1uVa6TvxcVud7^7Ddg!qH$ru#%Zf(kQ@b%kM9b&5d2^Ib&gmFmM4V)(7 zJK_I_DTpYNLdoFcvZ*JOTLyA8RzKsbEABz_1q|j4ki}2&0ChGm zTt1teqAqq^jg~w)0(Hz?fqcMiv;OW%u{MfoUo^E|2|Hmpw8lPHa>9JwETKIVZxB<* zY}P0Bc1OCJHJqj!7%yp7`{IQ|{)YsOmOb}H8;0@QXA!@2^aPIe1-Pz{nP`DP16#|LSYq((2c4d%|Nd;+CP+Q(@}SW~!14VWuS9 zLoT4^S%`BW7*!E-*<=rdzg$=9Zm*L9hiFJsNIpukHAYlMjwI1dlsqn4nP zOPmnesj0QDUid}G=13Tc?^vQHhg7dA<`Foo9;ayi)_v@59v5rx0Q)!Xe}^!k*@T_@ zf7`$Mz?K6!-T?Yt@c@e6 zm2`@B^f0t2uB>(`DG4_H_fn+sb-R2c#RBw$PHgP8{J7r7+p}6^?Oyoy!W~myoU(7z zSDV%xKX80q|62V|pEz)0^Ta16p6Dud4H7c0$p~&=v3=d(TL=HnM&gTxq=!Z#cen_7 zljWO8gAsv4uf<4!yQu`N&LC`6vO7_$RfmA*t3$m|?PLUo4;9xI#-i81Qnd%jhFE{2 zR1P+@?5=3#c`B6AA=k!Iu}OnSU=kt!SpJAjUvK(#_2;X%Ea|mm|LhL4Pe2m{M>ZIF zde6E&%b^8+|LE?Ig59fh500omf(WpE*geAz;j^iP;&BS=o0?0jUuuU8QCgP?#%O=a zPc*w81Ft;x=MW7rn2%qeRmn={26}VumAvckFwu&c2>$D&!MWFmomo`QHazIdjTW4O z@RA9GZXUFI=$%84%yrG(HNVsRy)X>(2V6ZM_-(Im_rM?=iuVi*%n1ZQjQkS^PyCR# zIB(hT#Nh{V-c1Mza$Qp-(B)7T6lev9)eFH7AFG+tst_!sePVp@)_BdoyK{D}*)AtDM>kQu)h5#RghPg@gvu5CIW?Jvh+Bv zL4Z;aAc1i+T6&*u7j+A2#@+{(4+@S6KMnus#EjQwY{h#Ate>)e!6%JAAsc{J1MN}7 z__JHTC^mc9VQoRxO+@Q=C?gA|t|v#1dqB9;c#)|Iyaq9?Kw6EjwdHG>=e;0keF9z; zlh)@|&LRP{Ku%2x1#euiF#zAch~Pi_=V!sq-)s)TNZdBF?aUn%6Zod*H@m$zd4os) zI68$;gaG=5o;b=$!WR`x93tCjEn_KVNktI;!;>0J`iYmC8AP>&Xq_S5^{WA@Kh*j{ zAi&dH_^HiV)&Lq54({}UJy3)IW9?(9ws0=GgUz2d{`Bbn&HMf0TBWYRFH^tVK`7$t zsY|{2^$R`f&g(0i1VbmPgb-j6Yk-lQ6F_BbFVbDF1cDrkR%Xte08*;g6pU1J;r8l> zXA2>6_V!ZF9<5}dW%tC10G;@IGR_eJXdS;RfHt877}t~*`wT9Fhp>I{ZG%rA+6nI(l;2oplRpR<7`aN1XEEhkX- zp8I%6_|3RH463r}RudnC2Fu58P?I%!C>@JFHU0RbrT^5HH zKcsLGWU&JFE*|6G$C`+WKMXvJ1ken^dwnx}W0v(>c5v}~i-XJhFUyC;Pwrv6Z9i`7 zvS$36q3{mc<}J>9{owY4&*sj}eUVVCG2t2MT6suVoJ!Xj*C~P!|HSx-^ZiN4UG=km z*e#?&Q@bb#gl=FDlZBE*DwUcD>Pnr;da(3UQuDN2jHtD1SLV5sq-t?e`TKcpU1fe< zn{)4PI!9eVTnWI>khJ9zga4hh-kB)Ye@$K1?`xr+fzC##s#PKbKBY2sgg8XbMAps< zb-^O*Dw=U?V(Io+2tYG(t4SB=me#~_8{17k8~pD(=$e^Tzb7{og1sz+09l+3^f|wN zi%Q1PGB^!k$~qhh~_Jt)s?(2AOg^QI)?!PsG?`&y7!s>N&>2|8-WOP z+*U1T>+cItO4~A#;1V8-fJ=o2G5&oUqD%`9I&ESOBe|>F%_O2$5TNJ-ra5-)4G2J0 zxgL(9`l~R4qJ+K2-&KcB>da-|nW)p+J$@HgL;s6F(ciZv8UfrCq!LrxtkcO&j;v8c z3Omg)9GBYE+KIFVMF=UTA`l@EWWo?E`vtdXY8Quv*U+-EaUei5puYhDXwLn$Q3xP2 zNQmzj6{_!$stuwMKy)8X`1MtxngG8cFB$2K^Evh-f!;2A z!Y8`>pLW~il~m=NaspzllEOIvhxOwEaoxluPIXS-DcwJRfX1{-Nr2laylX&!0ELE4 zSp5ksym7!lU;xmMyMW$&ZYX0gK=T|uKqipE+M+Mtqqqie$ZMi%0Eb$E%xRZjqkvA> z|25f~hUfL87EPr&kplQ-rE~-3UCc-Bb4pEdNDop+fIl&)CC|ftGB5?lU#RY&kE)u`WR*EM{u29nB3s$xUnu4| zcqo}wl(^AK-(MzBga8HAKO)%xJw(}hkYZWP*ok>=)(1tr%dA@K2Q2DoB zQ&7N7Xbiw40ci1vvRiVG{z1x~B_oF>R|qt7 z5jgq>-=n%fkyb0Jenjm5(`-s>Uae$fwCrZG5vVAJ2>#eaDH)p4G~VEuEOOc84ulXv zTR8bsk6U=5sp_HE&J&|j4Ev7c8a$tK36_>71Xq(m!n?T?1W4q2C<3~zb8|5su{DYo zI3ZRi;g%iV29TRMZE^rz#TP08M9O-QvVn^H1Zg%0iBObqnL2ABQDegn=WAm^fT)RBLY11z!d;J(GVq&1eQGs186Sm&5umn&aqnSocwt6oQTbGzRb^A8R#%QfZJV zwQLU4*H7gvAgwCcJWdSNR|=yM!9Fkwe>r~^q__Y#Qt_M<4F zqBV#)Aylsc1{i37Pve#rX6O}wq10bVVe;21Hc|B~oq(1-FZ4Ol>}cWs!IO$L+Q+3} zhwxm$K0srj4rc__<7-5c_!rrv@-9x{zrv_-$o=4^*eXOFwhKrSGm(W)UpV$|apA>Z~~E^aWx%UMEHH8g{X&^NB3VRB7Wm1cR@m83l9Otw&g#L-6SO%+>V;D;-s zeBu`M2;}J^i`pjd*CvLP`+q`AT}q}9r{$g0WXm%ocnxXEayl&75zq+#tPpqjjmzQm zbaN$Cv3C>=@RZ|zO!>%VOX#T=ydJnd!YIqNyl!HNIT&EjW^?12&uB^`G?Qw%?A2a~ zR_m~w`MC0W5FPgphQb^}e!ua>2@CU}uo;@zNNrZn2=Wm}*Z;OO(ANqN^BIAGzAjRR&y?qpmQpQ=Trgh6!+0dmp&UxH z$?Yo$5J`2ZD|9bMckp2kKK+AYPhKokf+<+>) zQu*Xk8iN)pnLaViE)R4jLEy!@0!vS{ww3zYH!-yS4h0KQXtjt2`qOdlwPM28K$;;l z=b5HvlR#M^5>o#5<=Row|Ca;Vj z{5rf6Ijs_MlvX0=)yVf@e}K!$uEc9PccxSX5R)2&0VVe_^azL)Vrh2k;1U>kt8@>n zx8%u5l?Dach82DRa^HbXP^?V7h^^a|t!{g@f4lA0m1apm?`>yPku(AU2-+5YDV^d3 zU@f&3n)49I7c2sYvN;W1Dowp}N63qSa9@RBEAjE8EcBmwRr1GymvMa~lj2MqYys;N zBw#HNR19i2kQdWp4Vk`|imFS>? zSc^rd#QFka*mZ4cO0^fzC2Wg<1mlau?jsOj(UzkH1eg>!6cYi^x<{wlEKh0z4+V_V zel%tfLx^~r0Rh%C0ZzroBXC$-;9>SIhzi=|RF};+0Z7XnZYps=pdN+9S7Aj12?3n&Z> zJqr@NP8r0}jlT_daQb%WLt8IO)Ruw(l30O6EbpcnQ}fg9$~(@2H3^F0q{|`COKmDU z@qaCD*W&VvqY)ry--#fJedm#U0os1pdCW8c@SQI>la&$S2!O`*3+$45CWTK$BM)+V zm_>K~M<&3r_{9Yr%JUF#_t3F{0*}Bh4<(Y&s8_@r4e~khfKD0^U=OrF7oDI#!~^Ug z;PHQ8k^t44-5!UbGX|2i2%R;aYEn>cLmCj zfH?vrTN{zF7mfgwDi-w_77DsM3;F~Viqf55%I6QqjQ~`^TV3MK(#v>^00eQ!ZDA8Q zqZoki8~e@v<01x7(As^4{h-&^%PawepWRrh!BIdGbUqVcB8P&1Q_HkkJ`uvVtF7N< zPk1Mq4eL$^cwi*dPwMkW~ets|p_1{yo z_G$Gn-TB3uYZ%`#0=wKM%`T@K#RPbyFq?AS3{#sj@@fcp{A1wq^^pb!+CiAdAn1jF z3+EQAi&2)I0JOc6qFn1#ORxpiF2K^6t8=E3z}?BpTWafN!F{Wrj65P=^i>n406zX|94^<^biYE2S&4Ic(rJMUpfMaAz541`i0Z5tXrK9 z3(e7+AhZFIz-~@!=aO>%@Ba>fSj}@a&j>ZV6$|h z;*v2Cpudg)53pOfLU)cZKh8tN*7WoyN|!XdM@|K={WPyY(APmT&^c|pZOo>q1fXXI0<#`ipFbT}0`M|$Tg8+po7~oDHLw^0LUV-r7sr9e)UJR* z3sn>lAh&zLd9S}m!3rg2f3r<)57oazq+{ElsYv)yCUocta3)x|{qp;XVCzM@ih#~( z8)=E?8o)Z3S1`%bAl6W(tf3f^MmQ}@BfwKk01+P6$PiaUu<(H@51wy@5n$|n>`a!M z5zGav{JR;!%vJk>16J-04)}R*u=T>7!4|W(7eVWVyTrADcu(J-_G;Qe{k&1v)J&@G zY+CgnH0zqyE)an0N8=K)%n*j4TTrQZo;Q%7kwWwTaZFlZj8w6eVDtF833vnhP1G6) q^=S5^^>-Jj*eVE6u~ls4cKd%usni=n@MmKH0000MNTVRZKOH;AIsxEqii*6-%hA!u>grJ2X`AmUrqxH+n3&1H7x`8f&0AyWcaGtF6XN%bMaL$% zGu0Otmg4rheR`#dA;DHzD`wx*ANw!Gem|tqL7$=Dp?Oe!Xc;u>Bx95l{wv1M#t>+y zLZ;sO`!pZfrPk6%35l6bw6q|*FBp%;%SxX3s=%rgsv*)XRSjZISn7+wjoL0z(_>gE z?LRTkm5fa(W|jR_vg==%Ou=7R{C~*EqDXT95kZfVP_dAQX|7qns;&c98*Q8iIyoc- ziyO!h4xw;l56d`Z#;;jPLHlZdruiX>uQ5)Bq#Re5Dc(#fp#>nQBs5N3^u8SOXv~FP zD4H%bnMOE@TBLJP2|@r;08T(AN*(g-6;f-GnscIrR})i9UcH_y@ZJ&2Q42HzQ7;=7 zAUh*1L@>hSi&{HI+=HBXy2Pge?90`y#><P<@NQaC=x8> z3$#JnX$=F^fL)Nj$0#SM#8M|n^_Q7&yz(FAu z#Aj1+VS7+VhZ#8+@e%b_QD^mgcekM`HT8F}mfeFt=@g%7EmZQt+H$!+#}(UH4Jw?? z-OK(asONNfBO>&n25VNo3h5eEI`zF6*aZm&S^`M%LLkeK-wtQXSS~NsZc~4tMUMx z?uQ>M3WQ${xgTJnhHvuO#_^z~(4#BwK$twGZX(#_vocIhTAj`ilnmrYziRROchF|h z6S3H_g-8?rlN1l?T+Mg=3WLwf)Y5V01{Sk^YP16e6Y*dt{FHh>+LnHE`hrlcZ9#c+ zeus2&r!=k<%RE|+=Pa#7$DmXx#j+FByRu2N%NTw(Nypjm+gK!PghiZ?lRqEqUWAc# zk0@=BcOR17XgBmAt+y)&~K`c?sd2~}G#nVMgbY8i{v zl5^>2%w-_?he{3ENAGN5d|z zZyNPib^W!pv{tK(`15(K6f2#w_-uUoFi1Bw8k^LBh@Up%8mfKn^8C*W$ZWwu63$TR|eb6$k%t=u|;>>t1R5*#!VC`9tp zAqdE~`%@KnpHT6A7V2yi@U&$5Kb2fj5!O&RJ^7`g@s8IHWNkaXl1i`Bil;e1MyqyA?viqit}o z((0~_M?p}+2^z>sx%~S_B!r z@A_!)O_gC+@YBCH`J$d5Ivf}HOq*RS>W`1{p!soC{d?Le=Nw63P@=@+tBZ{u5pJ{m zp7E^9l~$)eFNP8SC10=5JW-*}2`gw!xy7CA_{|(G=rCNAvH=2{o6ESnyQ_slfqnd@ zV`Yb(8;yMNg}>9>@0w{$`?1_oK2GN?`*5xePwdn6Ss+fR+Q4O;bilY zTo`7dYSBu$&XJZ@v04NiKM-h7b)5$ST_;Pnsx`0PP|PJ7>f5?e7?9Ihouh$VbZan2 zduJ8HaR~?*ghv+eptIj+^89DMegG$m@b5M`e>+sq`>F+n!ZB{gY&X+BD@_M0y^dCCA7 z!KTN!&U%pKF=$_pV=k$vj<-8T%J-4nZ{<2+A3x0z%}5C?~Gf2K6NUU zzu2-Z%-~~&1ft^iT{R|EG{GnH2K{bP2AG&NvQxvlGgBDVh|=j4&^F#K;X(f$ioEO) zw^;R$k@8PN3hi`8gP*f5b6)L;B4fF9cz)voHFHr?puZIULa4dAnBTF5z`Va=O;px!Tk6_T%IysxB!rqf=Y)b<`{FwG~^( z`(-l0#>&)}bj}L%ms|Xxpp?|pV>L*lfRou|z??pt*6_A(xXMSu_4Jpq$$~8ODPJqg z7jpdm$_jU^my)CoKHG$NG3J5Tg!quXmK-_T>_YCRxSqszC~v544|LPjE2s$*q^!R4 z!c7P4`3B)?$D){dZkP`}<s#?+oHE z)XGLVy|kk#4>adFw{c&uIO8~J-rV_lr@KGNe%BYb>w7qBys=9a9SI7gqP;=D5+}fZ z!3oQtO>@a#{XaM480}sc?5$^=ZLVLhiTcp8#3GA6Or+ck&QzA&1;wu2WpNr zlFtGy__lSNl(la?_ZRNMK6`#7k>7(y^1<)Qlr5K%PlDV7_qtlbfT&MnvAcQ_ToSdDY^fN({pN2MRE)r)iY-+>XTbVtC& z7i!^fh8QB(puI#ckk41i1ZrRmL|Jyc|C&@Y8W{nNQO&DLH1>V?NRXEM_CVL}pPc@= zYO}Gi0x9gZ;LKO{lb_7me3F9i_bZYw-o#f=SNV~O```nhXZwv#< z6KPlVjow*W-o{gkaoi9kgiIkcyoBiEYFR%&n-y)?wN#&OWNd6GwN&iRC6MIQlL?bv z(XPFJ?>J8!`(1o!{?YU7KEl^Gj`3SZ+-o5kU}t5e!+4oajoOd3gFYqjEodXO__g9G zs5Frfl4z-CYF)lStxWmiNeNz8p;z$7@}Cc)NlM6&=ex#tMJ?Qq3d$Cu>PC^iG8$k9 zzGE=MtM4m1paqfJ{Z4Ggo&d2!0TgvU zyO*`9+?mnK^654Jg$RZh+k-}bN3xp2Tm;Tz(5P!-1~0$uHS7;p(RzALAkzp78)g6v z4*hpm`v+aex97QUDlHj-EWV=MSIFTbcVWmE1RyM^CkhO~7z}-&1_GL~9Ra!Rg7N1e zR=riE9ZF7?GvvjXUrtLx9e)2lnEw2rKgf!sBC|hPR>lhCUF+sd`jWh~rRkqzJNNsv z>&E)~k>q^9BSTUiGogY>NIR3=iO~V{f@7`@9Agq(O{L3fsVrTp=^QN=x93~Q7k&Tp z6g4?HyQH4TzaZn?(L6@ke>ZEvYBxf*qq&>UZFQdZphu|>sz2T_-^CDfm-=OJudQ!v zh)Lhg4bw9typ@lrQ2G6@Hs(X0M`%QBRgT2}Impb9^*T{@R@G#qmlv&QVW>(auD(E47~XHqwQTXG+KF5q99w_pGZN6yLeNMI8zZh3T*W}A-JCyf=?8TmE3VS>&; zxziqr!Uv~ia=`e~FU-O(aNnX}p+HThk$)q6owN;n@}pD$Lrv!iReYt&osNIj;Q$_g z<-my?Ms-4a(`kG*stsp_)H1B)DqRN~8zJ=l6HoX5ws?x4(UfAMsiFDUuyTzLU>f5_ zryd{);CMG+LGY0T>GPPD2{(3veo%gXp|~3?zK4Xb+<&5uQR5d<>J6Vvh{NJiql^PA zozvK-(Q)Bw(fH(N1~Y|J^m$tr>CHdaOg!PPDCno%YkEJXYOv@ei`lo^6kS#GbJFLW zA<}VVgFkEaxIC5{|v`+AU2~!{y9E2pVeRuq?cTLb{h(OZ&6fAW*FcP{~ zRsuU5r9qz?Qy$foCajpVh-%br*DRnFlae*kg$ArNl?y8EhSa)McD*D>hGW~}=p&yY z^DPX|&=_b^gG6%U)A23hy5L7G21lx*l=4mWB*2`7IviR?M|T}cY8}Q995R$6T~EyU z_Uerr13v@cdr??Vvb)qYeEHD)T?rV?OZkpi5d2XYF!ZG%D@-IGiHpioydis&?Q89F z9wEJAxw$Ec>iA-+3!-Kx_$@jzN+;PW0U4g*gpt8$VA@02XWExXl0d4?;?_Wi*YRSN zY8sor{7yA6>?$=YHyq#hb$~ac`=`U4qt7rDgwW90-l+~W)}NiVS2z6QO@{SY9hzNy zJ1;BJSEmmqeYab%{J)|zER75)424_rdkmxyAuHRpAs%bmY4GT=docb|L<2iuaQjP$ zmK}km7Dgc8p{UXYt%dsJ3GXYb))c390^2xC^hG!*0GFph;$RR!&A*`IimQQsReI>; zPK|*AGb>#uT&7|4$!n~hy2jLK?-YO(GSaC~H_1JoLp!y)zL=t6_qGIL zKa~oDLT3~&5TFy({Hl-!cjjGmA{R-&23I;73gvk6{=4eX1yUvmu1e!q$Jc2+=ivA!j(Lt0ee0J$s(JlF|o1R1pyaPsVH`*tL?fZg`Hc%o z-@a4HMShGFz4RW+urDSBCr-))Z+Jbs#~2TI46A_lR3tZgyPEx}b@$L7KZ_fxXCk>N zL;{7Lw48C0FLaDQ0*zchy~Lhno309n{W2udQWZ>NhtM=cF~+ie#{2SV{J_4M64MYg zk9k(;CkR>tyg=9EpJOJ1az)LP3KXLu>kM&M&Lke1d$BFySHKiKSoWVjRB6u+lSB*6 zg+j9ljYMf@t8$h812Y~JJ9Fj*aD`EU5~~Fnbucmi$8`B) zAeXXNv>tlL7;mcx@Y6!y%RXw$m@)4#Z8EV6ae}_c5dk_O zF&vbHxIdnGGpi8x#^*8>Z&OrsOy}%hA_$0>=uzD!z|i;O9gSqtOEwYjJ zs?QO$6~mg;V=*RTp7@{iny`KVS^(vQ5~j=ex(l*>u+mrReFjjb!cEVnczB+K$73cz zIVcfSb=i(XH82pJRIuoXhKU*1>3K*rmc~9;_qtM7hoH-}yom^wEtsp7`-N)70Ts~1 zzdB8zms|P?K)~7nkFL(%KN(jd2Eq-X#zW2X)kkf72GJC-+*nSXtqxvJkzXFity!KQ#d@*TIp zw3i_4V(?9r>N1j=%}$(jfBVs`cU~fn1bAK7pZ@&nipGX3&{}Krv~_B!|FCkQlB+7l zspfk(srJ62y!@BK&&l7lk{URt>KgKFt@bipO#7Oa4RpdelLAA!9}hN(TJ*G zM(T8Z(0P-Y;#4Y^h&VUO*jO#@46(Uz&4Yo`R*ys^F3?GipaF0{9aZ?R9aKe`>1 z2L+rLajSz4Ey*2Y`e9ZU^5I_|;iwCH+`#!ei0pdEGucH$49D%O>|>d_a@906jceAV zaeL*kromnJUt4nxqUYUzz+Vri<%lyYUB3V2;jR{RX`k)h#q%-f!<9OJkZt z8|T7d)bFQz7{v5Ff`*oAfFoO`Nwi|!uB(onp|qt0 z-&GYO7Bs21ZD(H$L&L(b=e`@i8Db8h*W|9|Qcr2K`{pGIgPiDz^^_{TML}zW6t?BV z0a}0m_rVmsC3G(v8+a#ZHQ%izpjKs?ltXAl9G|0uTqcSY7}3D>R{eB5*n9Q2%sEn)Hsa=_kHOlmMmAe;S^uAG{k=`wVE0$MaS5eti{Y`CSP?6%7LX*;_*` z+0s7XRKPo12A!ZtG1e9XZ~1;oMG%pHIf3XDSSm{64PwKVmdMA}-untyDGdg*vEIxs zHYVvMXpw54e%UthJ;RFu3JF5uiK3(*&Ro>y3+3v+{?toXzmJwR`?qEI-1+?P?#DNG zbzA_RYdE5}Q2VKJlZ9WNhj|w}!zJIBOEmLDt4t;A7cdhtGc(JYy+CY_ZN8U7gHdg5 zx5WxE(#B^r=#!@k1_v3q}=p-{bv`E3BEJrdeIv+|8Ez>Gps*dv`>k1U8EZewf1Kg&_Bz)fIo4s#bxZ}MJ zruTD3^TbZ~=c?E44racYh4HZxQBRRrE!EWUX;f?3o9g~s z!IMhI>{M$CnLJaF?YCSF%GztQMa)kcVI=;TJ2^ZK#(-}1`(#2+(d!88Z&OB17W8`8L!0U{x!3>}%#^_5% z1q%jLG_n+eevh%B=r3c%%)m# zk@_Ev+v&lbvF`YQ2^jjtIuwYl*Q*eojWQy$>Z^Zy{&rQJ!#D<46arTzA zLzh-l(C0fP!-KkzfJ(ARryjcpT(yRw^jSvLe z78`FNemd``Hrx7zak)FTi%li2%{T#KbU{S{X=QLxDq0wFDagxzYTz^bkBP7?2=pp@ zQ*ElNYKEt-`_n-C*J6#f7{r`@--g2c$4USEf|^USve9k>3eb@iTg$zETAM}k@Q=@m z-ETM{7ykBhWO)#m9clGPYB@Va8?&WWYSm>Gw>p33xm4zKae(c`B@@|SfI{)!>=t0a z8^2xY%=us&*5k!GTt4tz2PO)YFHjha2h! z$At@u#11782$b;2Cg*%N#=!(*3J)rNAvz*-N|4S>{G-75`H62;1DL)CSydq7)hvKO z!d5lGKfPpVkX?t__aBJKmn*R0s4u-*=}%yY6ek{Sx`hl6c%!l&>dg2O(RhQ2C{D^h$~K9EKg>kgv_>X4*x(tF(0LY` z)cGoge1AAU{*3a`GM!sVoP4WQ;G+Oe*u?4)ZzAye8C&VsM@*d6q639!g1di1Y3$zT zt1nkmTDx_&V?oYCsjQRHs>;A8mPDlNxdZg~8nR5R-dcS4(Wkf{=5J zvGGga{d#@DI8=l~fdTC{dVe+(?n1<_Rbc&Q0$amDBxQ7fMvjmT&o8N{yvM;5W|8=- z;O-faOsf7(1SYu`c?FPp^a^H?I`HPlyUJfxfe+X12#kj7Q!viX-0SyYL{xV&snu;!iEJaM}x2&AXPL|O3E1&iBHGL)sj@&g!FPNn}qG15ND5v#v^_vubX zY}jl}nc=r{6IH#O@fj^sF5zUb6be&(zEf5iRUIGz*e=so9L`{crQ%Fx0@xUuL-jjR z>E)1n&5y&or{wQzF+8XjWOY}MA7=D$p>WJs)%1CO(5y4aqz?Gq-+#$(J9-AMa4PhH zxkO*|Dn`rTeO&d}ycDizFy*kuz1}Vq(EN9@Vl2}6cJrZs+o$8}mAJ5vx65`XKEa3) zO@I;+Z)2f^Ro2t?qqdk-L;(yp_IQup81zg$GOycQ9$7AvgHZUWG@Q_Ele@0)q{oXt z_mgBspKg{xD3V*V>Tx~13&A&J*xicQMJ)Xqy~ruUgk<`i4w)3`KI6uMVFBaN7pb7= zwY=u24(`pq+uu^;#}Aj6q#e${<34dvUO}w#d@@A1Iw3w-C50&vW1IU2eD1gj3k@}` zHfc?Nxftedv+Rw2gm>1r;IllJld$7FN(an^X?hd5%eg6Dh)(=61u8o2lGNe~H4QpA?v;1Ni@9Qp0hamu=e@8NJz{v^iYttzrlz#hScw!3f!OLWbPG^giegOD+jIRUZO zx2UkDf+4dB;PWh6bG#I{#ZiVy;iD}o1u-K&Ce<|Yc;m901Y^?3vsHlMvfUc*IetJ;T*10Ot|Yaj6iUg9 zf;7teq0;p`>w?xXrTac{atq&vUlYK(Et41`xzWN@G`B$fGjA!;+11W)#$>x@f#g%n zLcOip&WEmru}yu8E?>Wc0lDheiI>heM<<`yt6W}E}!Ws-8(<9 z@7z}jyc^USto#vf8t=)`6F9F4mn2cDl>C;2`)bdt+s!msMLVpp=iN<{G_a^vavMV| z@^WW;<+ugcgY?7v45^m}^Md{VV<6SLj=m3Ai>24Iq(~tkXIuC|%pc77oz$Ot*>{s@ zl0uPV%2+}gCMta=&{`PKLzIDWhfX*?BIi0?jpFxE-GxX9fxp8TKMmS1?ty;l;1LUg zte-9$-NjLcBXhNJigQdTFw?r<1vK>FAEl3^Mwv?t7LE?s(q=ve2sZf>8677$fA9jC z$y&~`Ej}MeGE-#*PAmReC5@^KN#?Fgu5B$=KxwLN6PUqA1uRdNTb7jtvbZ@R!0wIA zUHxs+YAm*eipB5FqXnPN99O*n-(~BySFSw)C%@yaOs=ivlMTj-uo8i?ef>W_m;X4r zpKLRSLihi0e#UixcIZVwZuR8w*s!BWDJ?$v5P9Gx%Qk7lI zzSg=SVVc7Wmh!?HHHo0vOM8{1p0brylMdCL>$e4|rMwpzPPD*e*V%M1_`axV(0XlZ zP&Q;r^5lsP2%#{w56q0tyBUUGFzNzZmzBpp~37s zzG}bsB0!d3*T%=kEtL|e0z=A!1a7#D>g2P*w@)`~ckmItv=Vy%?=X0-#eLU!?~dEl zK%1fsUNbYky{@GD>nYvGvD)@s;CNz^7X%B?Aqnazh-Kbe*PK zK2Pz*{`;IBh><1|oGbXXD1bZrlA2E>ywFHQ+UX-3S$&%L$V$mguDLIJ`4H(xo%oK9 zj>q+`Fru;q9inQp&WL{dmTPY{2u+P8ibJz7c@95)Y%lhW;%+B*{?zA}i_fLlX6lih zwznNYLW|DG$zg=}a)#TRZ9_LyGcEbG-KRrxo%?!xuEnk;;nF}p>uwg8$uHvJbk3Aq zNo;D#k?MCX#f(64f~HEXv-C~^nxyx~r;kipRM!+Y%-)fp$If(=yvU#0maLLt&y26k z(bpOOI6EW7f&v(Jza&cbYx`2nEXf`pB?A-SK5J${itcr`2=6tzGn?lqf>-o8n_wF+RD@i1k zvU8Sk^l1j6uR6xA{iKVe1$cMvhwJm*F2&+to@mgfQ2JI-Rph_#ko8P>lg}8r-@}Kp zk2}&j&Bj#H_kr#091J2@gZCK0c(vylg8{SGGI(dsWfT=iS9lN{_ByYI$XgB5IjMuKgQdPdx~t%JlZuou#b`2#kv&#(ekw747;`ut)TRA>yb zj9QvPi0`wgKrlE7B^L?MK;Kz>M2s&vTy6KiZ1=xWUBLf`BK?c-&gkksl;dd;Ty>gj z7Ypo#xj&6nJamwWv2HF-sdNOZ1%dbj*3|RKYT;_U$S-Mky{y1_=HgH7az2M&F1gvF zTBR^ckT#06we@xk98$TMC{emZBV;@4e7;vx1E|o~^yC~s(mV0hD`vr!tt874ZcT_V z&SYQhR`7a%lnmf;pQa5157`7m#&K}gVMo-`|Khb<5j`mW!st7w{hM%ch2n*y7e3xt4}E%e!>m%JNDF>V5VopPM?YkQ{iYVu+3W1zVJ^2JO)%X3?4Hw*^(2?F*(5h5x|&al78>EK8y`zi)O7P|t*@*5 zrm3dlt-lmMt|_vu!{>)0YFOjH!?|zy>;ec{`QmqDaJVBt#Qkq7-)|6WCZ9PBSS?c{ z9+atpQ(1Pp*S`a>x@Dz_1>MI@^pj)Gb6 zzr>Npcg-ZGR{?Bm-YKZxa+9&4;XtWIjsYED+~}CZK_n^(G=*FJG>C&jsG)!Vkah+d zpYXxuHCao@FivaTSuTWJ&LW8PF6F2~l;blX;8II%CwzcVgW-o3rYjq?eB3D}%6&*g$jyh}R`owD$1j*`0xc=pQ`)JNjyjZm$nN!ynmmn9p zN+U6P`j+B0AmHR80+TzW`xJ921dsOYvOeGX??`M0XG}2hZW?>=SiMb;S&RNHZodaA zG_;0iwADL9>gPi&Cm>uMXZmdNC8ZZjm{UZL#moNaz-?m9VUX|YdwexCsW9hNU#rS6 zi22%58W-2z2u{=(T^}ucqZW3d`2h$1CU?M$Fl6_tP z8Gl=X*q((gU7yp6O)U7E74#ng3`d+$mn<2#)(aS42coe|GKa8No`i*lH}JX z9M_T*Ux?Q5dr@&tcJ+3i5cqB=O2i3d4iWKyt~a|pddwic+&DG7^)3g`iwwyuF*F!w zXyKch&3(N{MU;Pb^5L$v)DtYI8tP>O@6z%~nbzujt9g?CSOFf5;`1W`9eEwBnemsI z@xvI!kdJN5V3!^akc;ei)4rN(yp{$qTc4QtQyQ3+R3-t%Gyurr*hC*%1o*Z(pss#ODuVlAC_2bNeL;_(5P) z(-8CWQGG|%yiKEQBv=5V{}=o|9AOWO>X9nitr(0SBBQaJe#nG~>z};ECcrQ}SCMrA zd)<-?Tlhq51+TSIpXR8E-*vmd$OJz)!u|o;`&QkBdwX^<#r@0Y(cS&lnk0j?D0szz z(0p|-;GMz_JY=P*KSYGa2T29@%x5|A?XIZxg*$z!-oIQyW%7Z=zNw_dfg07nFRK0& z2Jt&&u^z4~ZW*-Nqr-k7#p(lU^d?Fc(1*})a2(xrhof_zTIC2i@%3LYYm$D*~p-F9S5NS-TXug=!OJ>$J<&sL3WeY2^tF#n94w7Y%k9PtEphBZ=jYm zy=mRHZ-;A%<5y|{mi!8}S9x<)zM-d!y?5SguB&xBz9)w<4oLpWQ;6!!XoYXM-Ejf5 znhqv3>CEcxcu$JB3n_+4vYtDcUzc}31+4y%PLsq-ABzu@9!np6Cvmnlr@Y|y0uE5#438KCE? zp80vu(UH>Nl)W1HWk<+_?x*TLgzbb13*dX8XTA?bfi+gf9%nKgHa<;bvJ9DpnCMVE zsNuG7%Ai$|m^cftE>}EP;c9H`bq$1W@qvJyvEuT+x>&W#x&e_pG5Kot8nJ8X2{GP> zm=5L6y7fOJ#^?ngx*Fk`-&MG{F>d@cAP!4c(DgzVh}` zN~j<~Q)AC3)U^SZX))YEUB&sGb^!LaTpDgn7_e)PYMhbUiGb&l7*B1@$$gnX4=_Re zucCgh$Hm9Ims2;uuW~v%^j8L3F@M}1zCq`Hcbkitl$7D?aiySdlrP>1rRwZOClW7` zm4;E~zdAM2U%A>34nJM(L{oxaG%UT;U#etJ!|<-rC^zOtAF-Bi zxW&ei?@|V|pZAcVMj)dEDhU$5f3_8bXslX~{^={FdrkOWFcD3w%s}l=DuX>$Sgxb% zbVlwj>!*jGfx>!f(I<fCXsxT9Q&11=KTfJ1<@HK0Yb(J>2YHB5P&Ug;;Y++e+^(uNp8((+VadvwBfjcrw@DR9Nd& zerv>1bFUvf#(~;V9!iUqUw_F60B!3Cdz6~ym!m=#dQ*5_Ny8Njr6R!sr=6TC8C-eW zhK9xRsHn=K*@6!5OQv!EWXFAaN-^q<*7LkM?20EST)J%AFpTcQOy z?fXv-FXJ)=Xt_-e{l1P>R(WqbC3n9Ymuw|@t&Po{-A-maDErFSOPB2gOn;fvwakBc zI>p7P9WN&X26`{I@6x$VqVeZ5ZFY#X@_wPGK6J$W1e%{B$qQao-sitXaEOEJ7gwx= z_aBn<`(FpD=Qg_V_J_-kXzcvs`8I&bLsWw_j+Qv2BAXa9>YjG?@G`CLi-?iWRoI&UbU7nCh{&fP6p^q@>JNB_1G6}HsFsr_@5$8_Ma;ux# z5Ve%6v0K)e%LDM3u}u{>u0XnH&iA9EE9NW$HD)FgU%$MwdO-Y?(fLIYDVh@Xw@^0O zqsbi=_kDh~KoIZ?V$LpFy^w^6PNY2ibra0a|9&J9I`}4b`)Ysc?PMV%U~l*OzWwjJ zvrr6t0$-+b)7dH9lbF0n$8;0Kqg@OS4%-vDw)WtbrLtjkjJ$1=R>^=LsfV<5n{yAC z_4U|rhj>S#BY7s-JTG@{>rh(7z1 z4|j8B!RKq%nvHFFy&7#wOy zXFl7L;1W7!qRWI#qeKv@`3C=m$gk4Ow9_|CVz~#X&x-H3&Vz~4@d+3}iVr;q2nf_6 zo1K_Tdn06)N_Xs`Sp`H>(xFp=X%#3vrKHJh`9b;pq0xvEy;{rVZcUGo)-f{#)t2+G zjvMZlLyC&f&$SGjTef=2W3?v^(?UQmF;l1?5 z%;RhS9+jJo{(E)I`ixw>@KR9z_y-4|%&Kq~>C0-+6i$xxX#1;)2jmajQu5$xW37J= zz>eVmKp+_J78AuJj$kw(py}aEkHEqbOjO$p#Jn?w!p*-=L}Zy%kN#hCKF;7nRd$qN z*4BQ;Lxpvo8X|I|alYRx>Nf(X-qy8shEzvQn|Uq{ z3RKRY687Ag(jph4^!dLh9xMBj#T68H=1G>P40Xnhj>*{8mMX68ma@#25}jrNpPPX% zW&D_lQ6n4A>iBP~E?cKQ{|(-)*3cuPIJCf#2@Z}XdNSP3P=M3NLXfo10{Fukms7-_ z#MFk?#O93+9;3|fs0BXP|1c48K%8!~RvDeF=pQMiK%%)GL%gwS|H3jFO}JHMuQw{{ zv0mlv{IN#u)tJH44x9AAC!|iaG z6G3NtJ^!3q>o~X_z&+_rRebsr2N3vU*6b2O%wd>lCB*qo8-e&O9M?@qMPH`kc{+e| zj7~$m-aaWz8b0tFA-n?!%jlX(&1J)%aeF=EOzid_-rBGC-2b`=Ip@b>k_*FednS;d zXYFXQLaxOJk7o5F7$^%u(k@v)Gny}C_uGKHRE47IYglSmi$F{mW3ojAIP-OWGu@_U z*W(XEM=w5$pYr_uUZDU@(JVS?)rSN}Vb*BGk?F6xp*?G2wSXOpG!b1xcy4>}`|7x# z`3gnO2rjael;LJd^PL*3-hcBCbB)=UI06q~{gn(hQW{_IPjN*JikC*T?{4uY%4<@{b=iv3p;l*N}T_>qJCC7yD}iYa0-$ashvS2uV?Dj8sL%Qwm!KC3U3 zk?=_N8?72X;^a9)gpJuTqrkkOsJGr27>|udUW;(WcJ`EBU=yrr;SQVlj2%vi z^S{OVF;Rc>x$@GdaB!EI?mp5k-%d<}_-#4)_~DDmJ>1N|Un|(-t>+po=rdv)17a{K z4$BdGDW9gNC4LlO?)LKs6Dll8K6YDV^Y^Ab>;3}C-sjuR0qQgWG;xvO zt&tXsC(GVj4ee*agXyHS;8w5YJq@J?;G2Nf&UF*A{V8 zX;S6Jp*!zzCCgy~%l^#(2qQulp3-%d-lr~lXSvw;=_(PAUD1OZg=K(e$W?l#uJR@h zv_h-k>yW_@agbTV`>(kJ8uz2CSM6VM$N&Dxxf?H%^L6zRO(TSjs3y@}GzfCRbdc=X z9^)L`^HvBPGF zpsNk0a<6QhBGq*{k3F@EBC-Z>@;(Aff%a}PED~MgoxC2LW|@T#s_ne$_(FS|sXcCa zr_#1d)0!Pyg9FG6MLneI&GaHW?G-ElxjmNF)5r@W))5Zy`?W=?lnzS)OR5&(lCT;e zz?W2R{Rap78*A4F$)WtSt};K4k!G0u$}Yv9XW`LP;)+-mMXWL2-L%Sa_`c$?}U$i!014 z%D!&CBdw22!^e(#jw(8;o=@zmmT11EQ_5MJ zS!HOrsX?7Db9s#kP*neE9QZ%SSz5*Yp7)+%5$_b`iHb}Cd;e5x|wmx{P5=a z%Te%0dm9_g%B~|cdzuuf!^>VnaFmTzS!>Gfcm^Luv9v2SCW6%a_j61s3jA2CfGNwG z=WJaDaj5g!?I-C(mC%!$xEQ4Z9zbQfRLuW$s+&iY*>7oABmC-vE3ydK5n;FQidoUv z;huA~@?F#AXXHE_id1azm^&-esuI=D4OWR|bCl^WZz7Q^pVGRj0 zn9%IYcxZe=>csT7fxed}iN*T*2RT87lzhLf{pxZ@73JR$UanSI(Qi^I4eU58>Gw=_ zC09&1rbcDZ4acllrS?*0(7Eg7SaQcS;EGnXSDa5?{xwfKGY7PQRNybK(J;SflC$^0iE3c#0@bVEgedxLv01z`QOS^FOpu(G6~mcx&V{u6qRUkk8z=Y6 zvX;oth2iURBRySM^BvUjVVZ)7LQy03p0iH=p)8oQ?J}~C`ueCH4QRS+07Z`-159UC zlxk1Fe3?@aSDsWKfzTq38fhOzS0Q){3Zdz2)QaJ!I}dB_glHB)6&@;(Ig_IWnO83z zGC-$zAIx?0ZUEOgeqm5H=IAk|QKC(u)IL72VDBJvd53GM-CXDyy^E*?-uK$=wW;|Q zse#EimWsl=S*RN*9O^Z6?CUxcRt&3-y#@&VAmjH(0-aNL?VU3L_|$UiII?@b@6+$f z8iVSLbmloN6{&($hwnyl-1>}U8wsT9zWs@tKWr$7yJCZRA`vebz_&4 zi28EE4kHi)?`ExrjT*cyA%p!oUHW2JtH29{lC12SeHIuY@f^axeO7`Yl_H(>H;?^; z9o|9fW`iZRWLBB`9zEzC@Ma7OZrP8*3vXmImDClaElxUOm4hWCIoBB(s|?h;pW2Nk z)&C5n)zRIQU88Vbg>M+(Quhfb2;w)U0)*r}pqq?$#@Z#se4frvYhO%(j_b&WoBO1^ z(Tl(kM6>gs^HkM~Cu!FMws@!*D3PkLL)E_*DZ~>14w;0pX8uApL2J%g@h>HdbHDc0 zN4jV4zB_#J1NP9e{aqc!zDaqrT zM-f8c$T+wKs0Gg?XJgJBjSH1>QrM-`Y=`nHauf7@rApyIj(D#72>+7c@lg#U#H7ns z(z8vcZ({X^fcnq_@%9QWf>CpZ~`BUbnEQ9n?)^Ju>>&`Q$5 z9aQy3jUdh)=E+SCX6UrV5;>9A$HOF3E8=bxU_T*}Mz(F%CZuEf=*?$k1K+gvJ00Rl zhTX{#X16GxI&1jwzUT80^(^(qe==gX)xgzMJ*>>r7(fmW38!o?YB2=f_;Q{-eU|Wz z54gKM{YS&!mfCBVq3Gt-^}xTw^a@H#Mz4p0hmwOz$IYY#y}Hcd?^m>UqzWj=Ro05b zMI{if4pX^Fe6nVfOgcV|Qs~c(Iu~A48l`1Mca0VU&zaHW@!ix-ULQ4Scg+ym;HWw6Sg}WNEK2u}LM+8}snqK#*D#MUs= zCEEA?fcE2Q;jxQTc|#yS%cU5T1jiQ7%Li%z-Q5b~ujdl&KM)z=SaTV&65%lVms50+ zBA;%0Xi-xiR&v!mDVFrw`GW%PBOsq_);RhC>0cVT;VG!Kl7o)y7Q4L`liBw#Y~R__ zy9_D!Saj^Yp8FVAY}c?jR}Mc{x+(~LPQD?8qKTFz6YwAhgU>jk_=JrRQqx=MmtbpO zQxgxkl+yqn{vxSRVqK%caKKf+GO~HVakJaNT#mk*(WWWx<3oq0(+B*l5XsCyO@PDX z+&y5-HJS=KVIL2e_1>hwQzVbCL{a!QoZ(9RpM2pMqhT9Lx?}_90{6@*qV>$l9^JYA zF)FHfFA}DR(I4w#k4-9ie16b_x^&Xr(lxnbHrb`)!6wfGIIc03pwD+r^BjNbS-4{o zL{I=$fD7uKaPlV;)!@)&s{mv&QlxtTezL_Y}lV0wu{xc$z~{htHmuii*J(5u8)Z&2G0S;7A>^WbnL=(eYrL2ackmHOR?7a?s=yJp@SCk5;TIR9)hX;;IgR@48+ALY`yWiA1;icd@^-X(1&KWIzr=5(%}zO&L~_>Qs! z^#I@cxOCyjzh>(7@6##0RBI9Qq5V>I*Hgc2FoiCbjyc@e5Ne8enXPB*sAo%rSnWo* zS`_P9%ySI(8t?$0w}XgrW`%cbp(R;+?#ZbK){N&->0jvlFXfzS2<$VMvpHRyfFJ<^NT)=Gs<_V zVQPJ=H|@p^YNzb4wM^@OCTq8{MO<`%RP%UlVoxS>PdsiK|8A@|ht)Ip1*f?N8B2s3 zC7|?Ak?;P}EYu_t8bY4*GY1KG(WwO0D9*E@}k1%gU6KI zWE34+-rX?Kh?Rh;s<%(GG56UZ{HWF^=i>VL%zR~Z($=gnX*KZS`Dc?nqhAjuFbOG0 zM%1%luRzceqxy6D@dptUaFnOFc5@iLH)qpzNverLUdmgW_W_15If+T~!UfY$STkqx ztet2wK~ab|9#X_0gk9tyk<~NdwG#|%eQZs7&D*L7YA9M|9z5;tPrIih+U;I`Yx{>? z5C;2e>`tLd0~%OM{(Fu?Ax zE3hj>?c8<)f;~3NwiiQ-`>zdWcqespGN8T(u!z|T4JbzV33<$pc5<-{p2yP0!tqxJ z&sUe$3%B88=3PU61rf9m$#_md=tM$~r>ViTn8%&sJ)ReM6tHoNLODp%eH@=VFz9o# zS4v1&&?=Ptt6m1c7|6ruD--;}6rK5gFls9p>CueF{ufS--0s%qw>ZbZxB+cAmeSZC z{9}(CX1aA6|3K!t#P1da?Vjch)9l@%LaKcPTy(cKVjuyA522D4r?gg~`>WGfv%kBf z#K5hg^O?7^Y=CZLW(|!)&7HuZ(OVm+8FgD;+hpF7W4>%k=sgb!p31x5k+s^8zt9Fm z1CV)bx=${=#F0va>lYt5^_&Ahc<(!CDwfhL4$d29=LBJT#h$#vKzEfwmr zLX+K^G-X^+Z9E>FC0JmL#wz-$c0Y3%vuj)HHsTtKqYtzL{3x-))HFhHZnseqg@4|Y z*3boM&5q9^wNGHpRaXNZlA)=<0-yF*AHKvKHBl>lmWFYf=07CtAe;HgG ztr~l8#ugM@5(xIZK>TiRR+vib^WE#OUZ`iVcYAT826%ylWf%|T{HeSty6U~wCmT`E zqlTNnhv=;jw%!aDnUt*oNZ{qLazy&`p)Lcc-?K(}uG4O`sSzc_cb)=hz7Q}j`XLKC zdWAMLJZ4QbC5j3$c?_yD3RHz+EAI4ZXPV!eeM7%x-WDgR$Yyg>)5r`gXN#Cds+I>u zgo0BTK>d&7VFhTFX(z?)+nD(ZC<5dRx6Tj6N16Q;+yb6KtatrJrA`h@= z0#U2s!xK3`J17BBu)831`glVjR#Eo$vljBuDClww%~ELx$vMchg-8~{ijp)V>T!~U zQS>G9ctyNQNr4G?fx5xCVUQ51Wn!m1q=_t%yH=uiUJd=>{}T97c{|qyD_lG{1P0t! zWo}vauk-Tq2APV^4Z*3LyQ zUCnR=vz@5u9kDYCxB?I4J0uNq=pX@m&G>xm*(kBK{2ZCi;%bo%)bIxJf({BENs-BdY zQ^eC0YP2eM;YGGGBtnC zrnu?ij1!-}1crUHWWh71^T)PO$#JS*jm||u$q0dvci=hjU}I@rYpxAEGiIk>^@#HEXS|EZJ z!=~QOm|tmMF+918d8OV@5(x%~RB)cp+c!gYFQofJGdTPGE#FVOG8BC4yu$;;zp1Fh zRMtJ~Y#)uBbXT+L@cI*Exf88P$f87bj6CrD(kr{hmj1~S>OH?1)@V7|c>5C$Q>BRG zYm#t>QeiEs9F5iP-Tl_i&L9MC#QW(Oz2hCrRAqmKeKN+YY66S>&#~Y1mGvvuKcJsL8j*m;vR^sOv+|W=aru1N74k+@2KVIguRbRJnik0|bh}BL zBm39+WJmv^eS7A=$8onQx|#kz@>Zz4*S-kSG?gDX%Rc7b4h+r4v&Ztin`~eJZV(z+ zoQ3dmB7d^fMmt!^hNG4&p%d}_6D_#GT`%J;a(0KRuYy?sSiNO%4wSffnr3xm48wuS zlrehZ=X~eE6LdZ&BF(1X{F+Os0UhhjA0neCbCi3{YdtaLF9g&DJD+^^CAbUAl*EnQ z^XcypJKgITx+eddFy}M_*=+SJ5Bw%?QXTF3W$TJ4lmR&VWR&lueP8zzs$z9!cqzqW zl2{aQ?_5lwzJlVGQ#ki)8F#vcW_RQGxHz0|&sU7}d>o?+D8q`12FsFM`U?-i!YJjJ zk7nM?WX#svasQcb-I6jPI)HS*$zm0trmh|gjuGczMPG#n3ap&#G6gpN@i&k;XAjfP zIlR7O-GzNU%6B{qMLRzeN9C;TV5CbuA#m~$PRrm?kmr9#aA+heVE{r|QK$ESWX^eu z|1{c!9z~gqkcj!SHP32pa(hxhEOsed?MhxT-&-#$2r`D_E4=9{$;@|DXd@pmPl&WR zWFw&^JnResT8_Q5*C9Hw{`S$Y7$FSSLIesXz(4ax!P#wcfCCPv z)gURl4xXO_SXPl#s7#2||AcX{U*m}^VnayNd4oUMV%C3^3@!@1JF zi@dI#0gitY9BgSBf;c4XW?AnO!>wQhcSFcGCf8CH&Xnk_G~1(Me=KX_aVnpCgA^)F zl20Hkwe&#YO?%9|RF-F7T8J^+xh|D7zycF$Jjie30z(SP?=UBXSC0s4+rUwGXvP(F zZ3H)42*q-7RVd{uEI*=kn@nnPaxbQoV#0G3UVfI%19A>P*=^zmq+?=M#I0-ISp}SJ z8BKMP*DXhmMCuR$TAd}UxX(ql0{ScRB)T)~pH={DS*bu7f54C&MACrkQ=P0x6|gp- zgdH!>G(yrwT3uG6#79)A_xKqpu}n&=Vva9zTgd;%91HFkgDnA<*6hFIKE2ce;h+*w zk9Fsee@2kOTa;_181?B~@Rxz}Ks=L4Kw04KV&T@z+iK1g9bQoq-xvcx(Zm3ZvP^eK zxqI7ro?TpvQ2iHI#sd6QXC|DyHlWT{(#_nHFI3vsGZ|t~aNa!J-7K2cH5ylo0ORPunW@hgN*8^^jO@hx0-ASPVb# z!&4AyfFHBszZvDpt2v>HJb=!&x6SSn0`+#}l(I^gGf#D`s3=h6G{WxZ57KDm3_t;d zXPME;w2_+(@$e#}B@~a2d7V&V{gap^;ho0nuLl??_$X`qED+zh*cZV0YuE<;zq&4uU*=zG5hNpQVhsCpco zD|pSweNT}HFY)^`X{Ln*=VhJQXtkI&;@d?k3*yea&uk52+|oxdw6IU4Gf{)HKvC3A zHy~#TNN)AIw6B>ufcKh&C@K1g*Q-mS-|~Ve0>_hp9QO}IcMp}jU`sWit7)XspyvGY F{{X117#08k literal 0 HcmV?d00001 diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/styles/default.xml index 8eb3681d2..8fc29c844 100644 --- a/vtm-themes/resources/assets/styles/default.xml +++ b/vtm-themes/resources/assets/styles/default.xml @@ -110,8 +110,7 @@ - - + diff --git a/vtm-themes/resources/assets/styles/newtron.xml b/vtm-themes/resources/assets/styles/newtron.xml index e259881ff..65345aa54 100644 --- a/vtm-themes/resources/assets/styles/newtron.xml +++ b/vtm-themes/resources/assets/styles/newtron.xml @@ -79,7 +79,7 @@ - + diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/styles/osmarender.xml index b2c57ecc8..f16ba96ca 100644 --- a/vtm-themes/resources/assets/styles/osmarender.xml +++ b/vtm-themes/resources/assets/styles/osmarender.xml @@ -17,7 +17,7 @@ - + diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/styles/tronrender.xml index ffab2733d..9d13ba062 100644 --- a/vtm-themes/resources/assets/styles/tronrender.xml +++ b/vtm-themes/resources/assets/styles/tronrender.xml @@ -79,7 +79,7 @@ - + diff --git a/vtm/src/org/oscim/theme/XmlThemeBuilder.java b/vtm/src/org/oscim/theme/XmlThemeBuilder.java index 1655f609d..a1ef55b0c 100644 --- a/vtm/src/org/oscim/theme/XmlThemeBuilder.java +++ b/vtm/src/org/oscim/theme/XmlThemeBuilder.java @@ -74,9 +74,6 @@ private static enum Element { private static final String ELEMENT_NAME_MATCH = "m"; private static final String UNEXPECTED_ELEMENT = "unexpected element: "; - //private static final String IMG_PATH = "styles/"; - private static final String IMG_PATH = ""; - private static final String LINE_STYLE = "L"; private static final String OUTLINE_STYLE = "O"; private static final String AREA_STYLE = "A"; @@ -558,7 +555,7 @@ private void createAtlas(String elementName, Attributes attributes) throws IOExc } validateExists("img", img, elementName); - Bitmap bitmap = CanvasAdapter.getBitmapAsset(IMG_PATH + img); + Bitmap bitmap = CanvasAdapter.getBitmapAsset(img); mTextureAtlas = new TextureAtlas(bitmap); }