From 38ed8b6592609ad56bebbf397e17f055703db844 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 3 Apr 2025 20:53:54 +0300 Subject: [PATCH] fix(docs): missing image in geomap --- .../User Guide/Note Types/Geo map.md | 12 +- .../User Guide/Note Types/Geo map_image.jpg | Bin 0 -> 17995 bytes .../User Guide/Note Types/Geo map.html | 423 +++++++++--------- .../User Guide/Note Types/Geo map_image.jpg | Bin 0 -> 17995 bytes 4 files changed, 222 insertions(+), 213 deletions(-) create mode 100644 docs/User Guide/User Guide/Note Types/Geo map_image.jpg create mode 100644 src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map_image.jpg diff --git a/docs/User Guide/User Guide/Note Types/Geo map.md b/docs/User Guide/User Guide/Note Types/Geo map.md index f6b933d98..96b5e7bd4 100644 --- a/docs/User Guide/User Guide/Note Types/Geo map.md +++ b/docs/User Guide/User Guide/Note Types/Geo map.md @@ -17,8 +17,8 @@ The position on the map and the zoom are saved inside the map note and restored | | | | | --- | --- | --- | -| 1 | | To create a marker, first navigate to the desired point on the map. Then press the ![](15_Geo%20map_image.png)button on the top-right of the map. 

If the button is not visible, make sure the button section is visible by pressing the chevron button ( ![](2_Geo%20map_image.png)) in the top-right of the map. | -| 2 | ![](3_Geo%20map_image.png) | Once pressed, the map will enter in the insert mode, as illustrated by the notification. 

Simply click the point on the map where to place the marker, or the Escape key to cancel. | +| 1 | | To create a marker, first navigate to the desired point on the map. Then press the ![](15_Geo%20map_image.png)button on the top-right of the map.  

If the button is not visible, make sure the button section is visible by pressing the chevron button ( ![](2_Geo%20map_image.png)) in the top-right of the map. | +| 2 | ![](3_Geo%20map_image.png) | Once pressed, the map will enter in the insert mode, as illustrated by the notification.  

Simply click the point on the map where to place the marker, or the Escape key to cancel. | | 3 | ![](9_Geo%20map_image.png) | Enter the name of the marker/note to be created. | | 4 | ![](16_Geo%20map_image.png) | Once confirmed, the marker will show up on the map and it will also be displayed as a child note of the map. | @@ -50,7 +50,7 @@ If moved by mistake, there is currently no way to undo the change. If the mouse ## Icon and color of the markers -!\[image\](8\_Geo map\_image.png) +![image](Geo%20map_image.jpg) The markers will have the same icon as the note. @@ -66,7 +66,7 @@ The value of the attribute is made up of the latitude and longitude separated by | | | | | --- | --- | --- | -| 1 | ![](12_Geo%20map_image.png) | Go to Google Maps on the web and look for a desired location, right click on it and a context menu will show up. 

Simply click on the first item displaying the coordinates and they will be copied to clipboard. 

Then paste the value inside the text box into the `#geolocation` attribute of a child note of the map (don't forget to surround the value with a `"` character). | +| 1 | ![](12_Geo%20map_image.png) | Go to Google Maps on the web and look for a desired location, right click on it and a context menu will show up.  

Simply click on the first item displaying the coordinates and they will be copied to clipboard.  

Then paste the value inside the text box into the `#geolocation` attribute of a child note of the map (don't forget to surround the value with a `"` character). | | 2 | ![](5_Geo%20map_image.png) | In Trilium, create a child note under the map. | | 3 | ![](11_Geo%20map_image.png) | And then go to Owned Attributes and type `#geolocation="`, then paste from the clipboard as-is and then add the ending `"` character. Press Enter to confirm and the map should now be updated to contain the new note. | @@ -77,7 +77,7 @@ Similarly to the Google Maps approach: | | | | | --- | --- | --- | | 1 | ![](1_Geo%20map_image.png) | Go to any location on openstreetmap.org and right click to bring up the context menu. Select the “Show address” item. | -| 2 | ![](Geo%20map_image.png) | The address will be visible in the top-left of the screen, in the place of the search bar. 

Select the coordinates and copy them into the clipboard. | +| 2 | ![](Geo%20map_image.png) | The address will be visible in the top-left of the screen, in the place of the search bar.  

Select the coordinates and copy them into the clipboard. | | 3 | ![](6_Geo%20map_image.png) | Simply paste the value inside the text box into the `#geolocation` attribute of a child note of the map and then it should be displayed on the map. | ## Adding GPS tracks (.gpx) @@ -88,7 +88,7 @@ Trilium has basic support for displaying GPS tracks on the geo map. | --- | --- | --- | | 1 | ![](4_Geo%20map_image.png) | To add a track, simply drag & drop a .gpx file inside the geo map in the note tree. | | 2 | ![](14_Geo%20map_image.png) | In order for the file to be recognized as a GPS track, it needs to show up as `application/gpx+xml` in the _File type_ field. | -| 3 | ![](7_Geo%20map_image.png) | When going back to the map, the track should now be visible. 

The start and end points of the track are indicated by the two blue markers. | +| 3 | ![](7_Geo%20map_image.png) | When going back to the map, the track should now be visible.  

The start and end points of the track are indicated by the two blue markers. | ## Troubleshooting diff --git a/docs/User Guide/User Guide/Note Types/Geo map_image.jpg b/docs/User Guide/User Guide/Note Types/Geo map_image.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce9236e3e7523e00261a5c70ffdf71ec7ee154ff GIT binary patch literal 17995 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 literal 0 HcmV?d00001 diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map.html index 14ead1c9e..e3cf9db68 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map.html @@ -14,33 +14,34 @@

Creating a new geo map

- - - - - - - - - - - - - - - - - - - - -
1 - - Right click on any note on the note tree and select Insert child note → Geo Map (beta).
2 - - By default the map will be empty and will show the entire world.
- -

Repositioning the map

+
+ + + + + + + + + + + + + + + + + + + + +
   
1 + + Right click on any note on the note tree and select Insert child note → Geo Map (beta).
2 + + By default the map will be empty and will show the entire world.
+
+

Repositioning the map

  • Click and drag the map in order to move across the map.
  • Use the mouse wheel, two-finger gesture on a touchpad or the +/- buttons @@ -49,56 +50,57 @@

    The position on the map and the zoom are saved inside the map note and restored when visiting again the note.

    Adding a marker using the map

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    1To create a marker, first navigate to the desired point on the map. Then - press the - button on the top-right of the map.  -
    -
    If the button is not visible, make sure the button section is visible - by pressing the chevron button ( - ) in the top-right of the map.
    2 - - Once pressed, the map will enter in the insert mode, as illustrated by - the notification.  -
    -
    Simply click the point on the map where to place the marker, or the Escape - key to cancel.
    3 - - Enter the name of the marker/note to be created.
    4 - - Once confirmed, the marker will show up on the map and it will also be - displayed as a child note of the map.
    - -

    How the location of the markers is stored

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       
    1 To create a marker, first navigate to the desired point on the map. Then + press the + button on the top-right of the map.   +
    +
    If the button is not visible, make sure the button section is visible + by pressing the chevron button ( + ) in the top-right of the map.
    2 + + Once pressed, the map will enter in the insert mode, as illustrated by + the notification.   +
    +
    Simply click the point on the map where to place the marker, or the Escape + key to cancel.
    3 + + Enter the name of the marker/note to be created.
    4 + + Once confirmed, the marker will show up on the map and it will also be + displayed as a child note of the map.
    +
    +

    How the location of the markers is stored

    The location of a marker is stored in the #geolocation attribute of the child notes:

    @@ -135,7 +137,10 @@

Icon and color of the markers

-

![image](8_Geo map_image.png)

+
+ image +

The markers will have the same icon as the note.

It's possible to add a custom color to a marker by assigning them a #color attribute such as #color=green.

@@ -145,137 +150,141 @@

The value of the attribute is made up of the latitude and longitude separated by a comma.

Adding from Google Maps

- - - - - - - - - - - - - - - - - - - - - - - - - -
1 - - Go to Google Maps on the web and look for a desired location, right click - on it and a context menu will show up.  -
-
Simply click on the first item displaying the coordinates and they will - be copied to clipboard.  -
-
Then paste the value inside the text box into the #geolocation attribute - of a child note of the map (don't forget to surround the value with a " character).
2 - - In Trilium, create a child note under the map.
3 - - And then go to Owned Attributes and type #geolocation=", then - paste from the clipboard as-is and then add the ending " character. - Press Enter to confirm and the map should now be updated to contain the - new note.
- -

Adding from OpenStreetMap

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
   
1 + + Go to Google Maps on the web and look for a desired location, right click + on it and a context menu will show up.   +
+
Simply click on the first item displaying the coordinates and they will + be copied to clipboard.   +
+
Then paste the value inside the text box into the #geolocation attribute + of a child note of the map (don't forget to surround the value with a " character).
2 + + In Trilium, create a child note under the map.
3 + + And then go to Owned Attributes and type #geolocation=", then + paste from the clipboard as-is and then add the ending " character. + Press Enter to confirm and the map should now be updated to contain the + new note.
+
+

Adding from OpenStreetMap

Similarly to the Google Maps approach:

- - - - - - - - - - - - - - - - - - - - - - - - - -
1 - - Go to any location on openstreetmap.org and right click to bring up the - context menu. Select the “Show address” item.
2 - - The address will be visible in the top-left of the screen, in the place - of the search bar.  -
-
Select the coordinates and copy them into the clipboard.
3 - - Simply paste the value inside the text box into the #geolocation attribute - of a child note of the map and then it should be displayed on the map.
- -

Adding GPS tracks (.gpx)

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
   
1 + + Go to any location on openstreetmap.org and right click to bring up the + context menu. Select the “Show address” item.
2 + + The address will be visible in the top-left of the screen, in the place + of the search bar.   +
+
Select the coordinates and copy them into the clipboard.
3 + + Simply paste the value inside the text box into the #geolocation attribute + of a child note of the map and then it should be displayed on the map.
+
+

Adding GPS tracks (.gpx)

Trilium has basic support for displaying GPS tracks on the geo map.

- - - - - - - - - - - - - - - - - - - - - - - - - -
1 - - To add a track, simply drag & drop a .gpx file inside the geo map - in the note tree.
2 - - In order for the file to be recognized as a GPS track, it needs to show - up as application/gpx+xml in the File type field.
3 - - When going back to the map, the track should now be visible.  -
-
The start and end points of the track are indicated by the two blue markers.
- -

Troubleshooting

-

- -

-

Grid-like artifacts on the map

-

This occurs if the application is not at 100% zoom which causes the pixels - of the map to not render correctly due to fractional scaling. The only - possible solution is to set the UI zoom at 100% (default keyboard shortcut - is Ctrl+0).

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
   
1 + + To add a track, simply drag & drop a .gpx file inside the geo map + in the note tree.
2 + + In order for the file to be recognized as a GPS track, it needs to show + up as application/gpx+xml in the File type field.
3 + + When going back to the map, the track should now be visible.   +
+
The start and end points of the track are indicated by the two blue markers.
+
+

Troubleshooting

+

+ +

+

Grid-like artifacts on the map

+

This occurs if the application is not at 100% zoom which causes the pixels + of the map to not render correctly due to fractional scaling. The only + possible solution is to set the UI zoom at 100% (default keyboard shortcut + is Ctrl+0).

diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map_image.jpg b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Geo map_image.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce9236e3e7523e00261a5c70ffdf71ec7ee154ff GIT binary patch literal 17995 zcmcJ$1ymgEvMxNhLm;@jLy*CP2M_L=;1=8=1c%@b!QEX3Cpd$<4(<-YgI~UV_t|HE z-#-8P?>+bIo;A~}*Uaka>i4Otr=F^QS$J6oypffZkpw_N0RT|1FTl$ZAP|5E503y3 zhlqfHfP{pIjEaqhih_blfb|vwn}m>zl!TC&n4FrGj+~O2ikO(5hk==m9S8)H(eVlL za=d5d1ad$jAt9lnpyH#U;d4+BQ*iuWZ!etyOhhO;XcQPIOaL?{6bvTROD|OJ>ovkb z{cQvMeS?CAfrW!dKtw`Dc>{okf`NgCg@J>Eg?;^{_v?26SWGx93U*QWx5|bHln&S& zez7@-RAMzAyILv{K7GEoJ7W@ z25!)t|6$VKEc!n)$p61((LW6OhdnP404faB>w>{x0)zoqVTZiXzQ_Q2K=!|DSLM)~ zbaFr|%q9URWu}!KlMTHHvn+Ilk5bQxkxacucM!H)=Cw$ocDi0}1%dP!QOOWFU!d9& zWAse;@P`f#PfW2(*U+7+4d}hecln8D)4^s*>C)xtJ+tv$U zR?lUnFe+6?a<^3Ujo43FIKu(xB2{n6iY5(p8N^5}OnflH(OgFNPHdkXG>;OIyZq=$ zSIL`2*IL$1&0UfX*>~Q(eW+0>s)>DQhJ>Hkja07`JK zPdkTEldN0U?=hxeT#6zUVvI}Fb#T1W(K-sb^$8;?+ z`|X&ho{5G{)D0;VW@OV!RKEH<3MdunyRgd%w<5!ZV6iMqB~iEp-&w5XWa~itLBjN* zPtltsj2iy3os=Jaz)g>J5;0mmRUbG1t!_&X-JbR4%W1@r4~(eO>P{FUK>G8LG*u1` zM_61PvB~CX=$sQL;_gy#_nCSZ@%;PZCLwpC(sT$X2b#VnGCLmQdM`YYbW&u zXPm<`^;BkI^{q27Bs4*`<|#^Qg+XLs%Z_0CZPyrwpoCbc>36O=u5Io!i*ru!uA!cQ zu~p+rC-0r_z$xO1xVY@`#M>l3UCRZ}M3l#Yf*if@GI1R_|NN(zplhtk^WV--Ryv}? z7`u<~X&~v4bd$*Q!8l5IA9P_I4Wk>CgW^ax+|zgDFw^$JbBRCN6BWi!*~_Nhum5|Y z!`S=)+!cQ={b(z^Vhi54VDTDSkyCr~>WQ#(YwhV$)KisbE#k4`Ipw97G^c5*^%?mR zu*n*ZZ<`Wz$8u31!A1DoS&=?_9u(XIrK)RxT^6e*i4l(g~xcyOGUvG zQ|VhAk2dWvZi1z_#f9a^0xr03Oad}R-mBHXPk4}A%5#xpFz7btY#$1FcAF(czhga> zT$M!R#iz>zSKpS~5$PSY&^!nguGoe-WfBvoN87bVg6*mc+`~nh!?vx^XsVZXYiYMG zaY)9i!MuXf_(x(^5Pu6%+(Hhd*r;#6S|J!4jbVC|D0$qi7`*?+bolpER|X8XyO6m| zd)$z3`mfe7D~TwPwry$jAIG|%V6h9811{m;A3a>p1vnHN5>B)CVOrwGP@=Tg?AX^6d@k< zr29AKw!fbmO3w#;cN2a;@oDjI=KN~!q3VI3jBSc@xS!+VqdFUa#K$WzEaK#^5U~k= zu{@HK+Kq$!&{AEZ)qDRKSb&syCC~v;zcI_n7$uTLcSh1a2xwYU7ZxS z#CZ}L<6-;mmbG1W|Al!mtgHf6z&3Vo6y*amM^z@i}tGi_^vrt!H!yPXkJ4NMNhJ|{GqGUOpn8U0Mm7T`yCTH$5|QC{~@9Sm5n@iNQ1!%_)z34^(zYD_k>>kbamkvv|~y2 zeZTArfDvx2S6=X=uM~CZNe}P)#<@aA+-K(Vh)l0^LiKvz5`m%P6%~c!N;dbs3Wp48Tdl9X>oC)EX`XrrWe9)( zuuj&;_lRj z&}LnYHHqz(7r>7fK*%#iYwbMC)qKk8*mlCj!Zwu)oHyV4ll4~|Z9Xra#yb@L&gl}- zIoYXbgXbc{&9VM?BBYhhW3@c7!dmbPmC^42OuS5Lqnic;|r&(wZ8O{yVa3RaJ=^sHpM z(~?i(3Y3_$TYF^Rsg?2+d|>@9!J87T*2T7)SYjI?KFZhS1$cO7!0Cn5n7`ujZ(fGX zLl`yK2P#)|a`f3rH|D*ci!E|-%cU9CWdVniVb|UTD165_O(uA(OLfa>WV>TLGorsn zGHk+yM7Bc4Jnit&u7I+c$>A+{oC;GKKqgB6zo7p0U!YMMm~6YgT^b_HoQo(pj7oVWCC4j|hB5?;-hdZqaO zFOeQbs`HZW=B-x1!!Sc8Ey*t#^5>2MNeZv!m9YqcTbqT;XhL_ZBgr{dRux=pq-_o< z#^^*xr}}&2#^S1s3W=%27H46xp_;36Y-9MRtMd6nt4D!fvonx#&-M`(l5)V0@Cc6x zNqE6vrz}0Mc?0B#+^78dlP6E&lwF~8%lGd|wr?+_l()i*M^g2JecWw@CZw`Od`g~} z7P89=-o^e}2=V$brd_vMJdpAUi0GaT_s;~TB>P}^lf~96EvIE{;^c!MN&5?cc@9K( zoL$k1taKCCx`_LzzlC4%$XEI<1cZ;LK7C5zw`DT;Jq1TWJ%lMBB1#b5x{7r;y$1Wa z4q=dbtupeo<&GpiF2baxz|k9~|E>O!qq}i0u8d`+6oF$kPYUe8(~h8~@QT$qUa};% z#yd1tD?52-%Ny?}rRG$tw@1HIQlHa*lFY3)gNVMIj?Ifs5-nYh8Y+C7Llc}F)F2&m z)8$yTCdUK*Yj(nMAqsA&Gmo&1{r-V8e^yj~LB&;a-~qv}jrX=ud?bBq#PGHt<^_Ow z^Blm{7vASs))B{_gE$qmHnLeM#CVj}wqHLiU6G#kZdB9AXIYpij=Z zo_YTpb^G~h)l*_g&zGcC@g_D&aVAtlKkC$@E+ex&+WU92Z%;@p>E-SxCaNv--a_;) z1;HP)a9)`P%br8RvDr=6%;*WPCD1oM3TrixqgwUY znfP3Det!OL3lVLzhqi|M`(TKPl<@IQMUIfo7jycHYm%Y^jXK;IkMC+*h&vLd2J#km zGL0oUH*y7}pKb!ahkPVoi@q((N@dDvpCY=E+5BE-g-2(x1?4lCmsSzvL(y&ho2^#Y zJKNQLK=rr3Poe;=Abzx954-SUt=6?NVtU+~<4vS2O2YvXijCdc^YAzy@TN%*USSUDrb5rskz= z$=KEMOGPj0X~v_k{?B z1azbGdAa~ROJ=^)$cnARGiw{8+pLlI*zp#Sh~sk}{=U&PXR3;eFl1>wfT=F+v97Wpl9NyYJYE?3);|AY$@dGuEm)K!7=u$ z+bT^ondyMtl^4LL`GJG(X}3Ke3R_c+bB#Jm%<48v@NJ^~T7{>N5xwJ_qsbAi)ra@Q z6BILlhCGyk&-G2uQ{4+7I~6%fmeMUS`3qdS`kDk{h zcuODCzXDyVWg&=1R&NEpQ9WGd{4989+HhvXl9LKI)Hjj4+BPI-GY>_l61t^g*z1!w zNJAh|S}k1Wlz(WxM+j~@llLR{!%s_+w6B+qWn^vOs%gREs!upkS-|U)MNj7s&8h`u zp3ihhB}cXH(VujKRg!MDZk03FK6#dODTh$5oH{zS)a~wDNI0ZB>FoyXX90V)4H6Jt z{-RiE{%pWY;uP_TbicnT!ZUZ^a@MS$XZb3c2hKU-F&f(>Q03&kGeulM62!pajUY?H2my)iEncD?w+B1`F~M6y#1~XqIssfk5=A zR#6D&q}E|hCEnUoIq1Qrhm`sp{cHdN((757M%ZmbWf~?bjqV+@Mnotyd_ch3YIA8< ziQaw@^=!DdQ2Lx?pme6eM)P;NJmSrm2I>J4PPHGWPU`;(FgSq2HDD?pYjU4w?#IYnwSVr81>u8>vY1Cg$tl^D7-dW|WQRr2e5G z99Ja$h1uGt5%Gu7!78l$yB(*AKo9lEaC2q}k;OXOBIp#FS$ynX{(oUmTWzXEcX(ol zTz7xJaQj5A9Wxx`ncYUsJmd7t6}O>MPmEWhD!b7)Q@bN2fvCT{>~9>yG{QgX^|665 z)T~}S%!oGo&t(Ce*H2uY<2VN4;rj_S0bF`&dgzglwM+HPV%2vEnTZj(TS6`~b1bs& z3+$!$rAMtsLf!f6HrJhNS zoIA4DjWT|Ax$Fv<#HH*D$QG~p)6M@|1cB;y&r^7yIZxv1b^6+~*gBsRSaPF1t|9nQ zOVi2M^Bvuh9FfNAA!8ux>1djqB`p?>3I;(V7DZ@{J9JX-e? zb0;$Lfe7yl7MeuZm(|9G1vn0r(x!i1Rsu#ODihlXHVZ;mH-axa8&J>pj}_P0=&~cJ z{$jq=>ZHmxfhUIXnX@cM)(J_;WH{x?=pUuU%+Gj4RT+xkc{vpGeUUua85wN)T0|72 zwd#Y>ibJ7<%EZ=PHtp z(e5vd^W)vAOJaSrRG3Lrx7X)>PzDC6abls`u>BvJqXY13Q`GLd2{0$t^wzX6O zyUL!T-=1e0NnR;ea%uZplO{8^VFG1UBRblS!?^3cc*CEGVPfTZNVSGH-5we>FF}vj zat=etHlSL$vqi`Yfaz-4yCd9rG5hBS+*{4Laa0HKA}b^(wBe7g{kS&a^{24hJL{;I zYDKh(NvCT;X9w0#b2O7-D+kukS>7kNNfoTulION1#>JvHCXG|;4A`1x?s_R%tofx* zk93R}!^=jAcq2u0D_`5^?@k$GcOq0SA1Cv4i8uZQNJ?|S^AgJ`5%ygdF)zYmnSRZ; zni}lDGZdf*Q5@%tucdtR&~Y(@abTaKCJYWrO)Y2`3UKmKy!fB!%YOzxm>+Xrd00*h zS;-+(4k_?nbERcU4s?l5dhMp!JzugLM`pt$qa;hkzOw-e<-xvi0G7W5`&SVW&iJ9M z(phm{IK0OF{FPm2{#a11j1B4}q*NOH zaoeX(S-FTQPnMz2t1nZKexfc_LsMx;RCR!|HCnLjpVR0c3;_w-h{RT2gD+inj$H@w z#-3aHtku=)w4WW4%ihRyo9g3OQzYD!tnSlSbWdR3({K)U!zp-dsP=B>5)`6oKxM8( zSnL0UMufFSi$@fN_QA5Lc*%WrZNr=F?$qk2uK}`Rec19$c>7L&Y2~niv!~P=jd@qA z5aeae6)d1lC6MUP+3cu$2K}4L7r|)}WY(zjjN4dHwM)8a)xu?dxAyq`=fs5v#!qTNZVTfygiA-$UtM8{HSBvGST}Nw}39q zPE~4u4nvbspyg3WFyYM>x-!X{eGI9zFQ=0!UHt*VI>wyIyWZ z8!hN-NOr)P!UsvBm@N@|1m-wAzPB%`WYVNA7@qeTejE`@tMhr+->Yop>3kb%jkE6- zr;4iLf%V-q#+*JL8?(+{62=AAwSX{8*YmOU1)$GGlt8W zlW-Iv3Tc+v}y)Nc1QQuMBF8Xx+`35jh)yoVcOqD`NHtN7*Z#j_1dMl8zByi>sVR-R6jU6 zSlgB>py?=Xgd}AZE)UvyxKqWEbXYLK)=Js67Nt>ANMG>Xec#GVV0<w{-VO=6{# zclm*i%j^nh^qIPL>86Sm;-LW;!so1|K+Y#?lO`s02j;18EVcjiLa0gJ@QKY~He*1> zDk7QL##{)iH=7Msee=&PLauGCnYwCql2I6$_U~WsK0T?o8qbM0ULA?tsjLJ)znG-z=5k9WK?z6qqC&`gslw*mRU#Pk(w5y+R^gpfr)?u-N=n`pVJ2p7tr=X_wFK(-F z5O|PHHP3w6acS)s8vJIi8|M&IP;0&C^(SI7A!oRC+o2<4e%wY#;z5fE^f>r5xHf2A(Kg^b%wov$NLHv=gyMds zJDaR3HH}wrdYv*@boov^hVT-yxABy*ZU*N_6s|{kb_3=s3*SOH1d5Eao9%{*$j%(?&pNc)pBbL{;}I%22(a2<`V)&aD)5a)!$vI&((*Qm9TCg z&h_P8;tPP8-O#f)F4X<(vcc~US=p69cg_Z0OQX8Rl`0VhV;NN)m7z~B06*0azpfw} zCHeZ^N&OJ)_MdG@kSTR`2$G@t2V&N(ej(+Etp0l0QI;#~vpAoa9TgS<%hE^6`CYMR zGDF%LbGL%E!w$pzRn5jws~0{O;m*M21H8873JTc!y&@C%@_P`Noz^LyI) zBYd)8%Uh?+st@a!3H*tMF_LJ2dWt%ux!Cx5{Kuy3lE)8MSpPuzpE3Xcbi^S8t6U$M zPCwWOBYWDXZH6VjYh!9*qG4*A?QHUBZ&C8j}w#)_@#g@RRNH#9`iHBtR@ld6Hk9Pv?$A=v#=Bz zE`p9OvTq&KY5>;Ltv*X@`3BkC2q|Az=8o!@VQ*EEr@{SH(qAsd2HG6i(JByR0X%d0^IXQ#(^^LbAJyyME z9GEy$C)AXA<>nU}Y(rHp*^bmx-(xWzCkCVN>AM{f{fLWR?>8Lx#<9;p^jlI~ZUW?d zZ+e`CY5Z{HeQur=YL)gOw`Ki^4u=l-ZB^Q*K6FQ%WZ0`c@(J8yJIl+IY{+ur`aGQ0 z#n1|RsmiWS(l7R?SzIoB01Ocl*b~+%@qifCsc)AYVt?pHaRo$Y?Ly5}8)NI-NS>I$ z(lALt{2z2{Xa|uuL`_iOANcq5ERV%Zabn)ZJoilnPR|=Kmq3j8R>38L|{(bUgCq`~$qZ2Jrq5R(dyFiFtI~6-~zlnpGLdGlo6{T_LTAtC-YN#yYEsL0E_)> zS~${@FfQtQOa10bu#c&D`q@`c^#>0v@Ir4A6K}=#a;a`q(-;$~njjs}%m(NODjO(WqpB3Tl2|duvA46dO#3ueb zE{HgSBVz<08O&xDzZw2E1uZB->)%XG(SmW&S*Y>od!LFhXfxoO`~6Bgu078Pzc$q7uTg+J^*wL{`%624W!DB)32B+OFxgXkaVLwd~aDgkD8+j4bD{Z~J%A8``tU z%-YVcqOIA%i0jyZSO=714mHM+p7fc&f=;Bm7B(dVqz&C?oD1#HoPqlkT=IVJI>#dv z&CG}06*Jen0P5J$XAu~4 zeiuuwK}b zBq%VP_81@wk%b$(w@{pV%}-4753S!#j}?>Fq7~=-w@NMQUIBy*phI@n@mF0}|H#Fl_ zy>J{U-O^9NH6`tX%X!7RZE+sM5jNZ2OqD?&l9@P4;Gee5HI-j6Kgumi(gQP_3|(E> zzI4NtdqO3)A8#IKFV67Z2*OyHOj*Spgnz`NH@ zo29huMGFN{$G_q&GAifY5|qw8W_7ygoftB97q7|IK{vSINUJjW=RAvxh89h`e*ydqETb$ZN}p^*>`*Crdp$e< z5s2yk5s0BgFlDhM*b~<>^QQb0=kf@LHhBYMr3Z?#&6kC#Mp;c(!dpNP++pQZh_=uq zH1DUxZttD5Rub@3Za&{^JS%tjL?g{SM99Q@vXKfp%y|YElA<8r%E3S3Z>{>KNt}1+ zTjJXerX5DypM{sK8@?jrAp7N$Hyff?N1Y``Z}`~&q`F1MB2YsSl=0WVPCj}bs3sS% zY!W4%9+oIC47D)`orgg}kUv(yBkEi%SG*B+Z%6NH@cIUO3u_jb=W%eCU=l#+-#f%6 zz2VK&ta$qsjGcG3(D9yuS(1bM-ivS}ND4`BPKL{vLyjRY)Wo0|WWxjP|`Q z#s^o~9YLQ;4AqsziUH`pO5(2*2(Ppds`c_#@@(gBLcon$i&fSR6HoPNwIjCJg)$?J zK@{ZtZt+xld@=vgo`JvmRM?!7M@F?+#AkKd4ueBYhDIbL-tS(ScFKmL zf1bwuIL1(UTlj>%&#b*{O)NdPfpIXDxHR7(2)tt8!#~O7g2x@0LXCQJpk~H?T+l+X zu0o^Q6Ewc=U8C;P;S2opB3( zs_A2n+94JaOBempFYF(`5MU5?`GoSY@1`|b=OQ2CpW=1h5`*)It*L6%2@LW3B`2hA zeb;YTPUKRlqd|2uITo2)N^v6D@M4SO7@0kEG;E&dGEGY&W(l%t?3X0L?i$5dqzV`- z#%GG6(a{MSyv!nlBu5f8`El|KQ5Oq(B9Z{Zp)61P_=rkV72<)tqx#n&+{%!l7K?l4 z0LLe<7eFLjyRl;*?Ee|`{)2-D2C0mQz{JS|G}l6{2Y4qG@sp_hbhw)Z-;On`k>z+&(9+U-WJian zay($YMB-Et-L8r9QTm)ho1B`7taBm&gEvVKU;q-UyVQJP3>QyaXBjwXkn7cR~FOa_u2Ame2VLPhN$&;Ay>1u&< zqj&T;-E8u-9_jt%63`t905+M%0BoMU`>TSX)xyjnd3{@cf{NcCnnIU&I~|_oxj{|s z3AvyTIiYmCNBxYp5`E;D3lkjN(JW-b_PgN}>~dH{05;Mmc|ufwHB)H!uD3SB^!uGI z2*1V{D*L)+ARJ2AYB5{(9xF#FNfW-0fM*{jBu+t)}$l`$rLsp~hM{hYv+<3e)hjcKwCGv=|5K11-G z%mHFg-M@~(n~ebIaWJ0QtHMTAI^R0;QxuuN#*WE;Xc{0*lu70BmI_GC{V4GJYg%Dv zcjE|CX?oS$sB#YzjSAEO)~+{q;kS7L;OUNoROH|rIs_`J0@$Gcl&JpyNhOql=-#r2 z&&4R8!=V?(k*KxA-|$PEgj}i}EyBPZ*GecKEuF8;V=Lcj4tQD{i;J@;(={Z4NG>01 z-KSd8)UY%*L5y%PGrEh1NdfsQpwEd{lKF(v8$~|9kzYN+X{h5O12gZj-(NB&TTKaY zRq48VyhvRy7C+zNnSi3f&1#J9!3+hYENTy{(-Fr?F@`hk$Fn4l^Yr#11ktXR|LCJ! zAA?r}rir6pvwSxu9>8l{6`p>4P*R!HbK+H!+2<>A@F3u65njT{4_0K9(l5t1)pLfu zCw9XD@wb(BsW7TA$gsAXBS!X$;_aZfD)?ae6jVd z_^xuxsqmK*xgi#_U!)89)U^@8AV+=SKoEDv#J+aS4-=XcN%iRSs;U|1*KrLSmQmVx zy@3SWmB=Csf-xUiNu!Lgf`uUEK_dsh>)amM(}A#6=@hLGhn=MMp57KRxdjAL&T6{Jd8w+g}qALj}*44&rozg>J{-bOWMxEJ^N@!86ROOXTU+CKnIS5AQ$|nBFepqNEE{8lVj{(jJ~+iqlbQbujfjd(of!;3 zjkACzQj!G*zA-Uc5X$I~MNYb*%Z`O7RF7!sC*pJ6XW%hWGj`RA>B2V9BQWx?#86d= zx4mFg(WsYZ5@*YXQ)lf`Gl}<;X@%D0w#jLz;Y+gUUD$K-3)?PH9+s$CQV5Ve&`YVR z2$4yQatOSOKG4=$R7u;HX~Rb4=zN{9N!75?i_-LBk7RlS2=%i|!0p__4pY)yjuZT; zQ(8?Sxhhy%VMNs0{1)xD6oY}#w)41mE34;z(gr4n^D}B4Kv1TSLc75{LxTgI+gIW3 z?(ztSih<5?R#BlZ|hHrP88hl`EqY=MwH#YOf(?$dw=1&H{7 zD>-!8PJH~#`Ym{4Z7PdO_wC>^o@Tw)1)&DgOu1Ahit#VN-c(%SP@K(jE0BG;aDE#m zHVP4#M~C2SN?&3z@|!tnUPlGLIu0I2uv+T(>{wnp7q(?_u31cyNf63<;_@;*)mq1f z-gz_=@W#@b&ThmW6wNqw=FzcNc!9C+ey`4_`$4t*CTbvO%6 zn@C}5Ti!i}uKF^mimAgy6aJ^{ea03G;?udPfOk6dvu25@9BoKyrhaq)baWZILNs9t zNxc?lhQ3lrcc6DEPo%b39d!OFFS4Z2jp$~4z&@7D5tgOx2Ixm)23|6gQ;3Q|4S@98L{H!dio+$qhrt4s{7mnifLI5GO8-UMrOEj*tjvY-C zayk)gF?8m_ZA~<515S-K4Lh-+km`MF?3m#N=L7DQG~Wk4Q0q5F=SRL)1Ogbfg+iK% zip8&!h&nJS!AsxAhYl$3g%K{vHbe}VQKuR1Dt<((efH`0-O&e2IS@zIa}zz3v-wbo zr0dZ9W!&PwPy?V0wr=C35X|nfo+e)a^L=nqe?;dXfWdTm+qR|Yr^H}vGDV%;GUXx@ zXVs#@0wfA{>48Z9{0P^|z|%^j+d52LSFbnr66`>JKP++LDQ=c|4y-)Be)x^}%r#bP z{z#e<5S)kp6%b3ViQP69OvLl!3FV7Augdav()H1JO{JHVQ%&os6m@EzY=6;v}fJpsO6)Dx0$kSP<*Y0}C(_f9CKD*y?pYXHsH z=^8rw#~8z5P-rSGrPB9`F}3r|J1)%@v2C4;#En+-<(e;IBZ?^u{f_Pwo|)|XjHwJ= z@4`>XSV{*OsiQ6$P}sk9dO~&Xo#+2(&jaOUZyA2UX)B)MwsoW5CiUrka`d*mtYsat z_fA5Qin7?aG_+&!)jQn_i0&_2wG%sRwF=#yX0gpSfxWZqf*`=8`}IqyN(qRLZVL%8 zxpJ0C665i$oFXW67iB~#n)!-5pwvi4selFY@1%u_NPJ|ePnlG0AFw}?uda*(r|KIH zVa+{MI5=bSq7(o{6^Y>yX>rQ3{SglMxlx?MP=nWkF95wcJ14^ERQdRAs4!Tzr|bLJ zdu5}fQH<@9u03M2l9SJr%?-N6{+t{eiL){5WefvU=hr#hf#$*?9+?{b!OJe0nh#I1_J$RaQWt3Y*Lk$A&1CR9dJ#%t;(u{fhJ9LGs| z3=Q};p|fq_6Wn=WeDvBaO35`R)#h3Np{EghCL|k9X1j+m>pDf84APMuqYEd}2_iNP z)<3uxYO9V!NH3U4kq0bH6fRnoSC|*iM3&#?j!Z6{4sm{6_j>#I{{H;K>^&aM30G8A z$$L$k?G)%T8#-sd;4z^@2AYy&rtn$351A%bzfBPkG7(2rtJyc29%i%wQ2u)}dso>^W~ zm*vWOyjMn?dL}yre(UB&Da;gn>@Ga@<5qk;`zU&N`2~=56l#|X3J3G+*M3sPO4s%dt0Sa8~aFo=WMECr5Sc~kLw?mnF%6H zNqk@Pm0)`?s43FR_@UQraNEnMq@CGrG8I%5X;$8|}c-&akiH}L3BCLwq z)7eRmDe1%a0Xgq=1grMGX32M0oi<4_hH*R>w=E`U`P_5F>yJfo4iixf7s$Q#)^lOg za>Q?IIE4;gn_B_?9)e9z3{9y+nzhF^vSNJh7urqq?Vk=#8Q;=Kw0{3_5ivB{9JL9x zp7rrtLild$&i+Ty)uKZ*4%|_Kd17n!fXQB;JhG!O(63~)tUREaiFs3rq&N(;BqI5g zs}~f^2yA)9g`3vxwl;Q@G}^LReG}J$2SQEG_b6`G6ka+=0r$lBO4FyQ z{EsjLt|eC_XHy<2eU_I&=sY&u!A~TzKpXghRog%K2wr-arn;P^3DrsP| zrhYUVKCb!c9rAnk)@rvc(dc*0Nig|0QNvTgMnr|Q3mN2J9OcOGCA#L0jT5F1j8gV5 z@mGy6y~oVVYZqoBluMdF+E$3`op^gQ5a;dBM@F9alNX`kY(ABl>lZ|JKXvHHyQQEF zbtDWXI962kY*4s>7DUs{a5(r_mb6o;j`WNZ_(u5csDl4)(b73ty4W}c1Y@L!INI(& zUZQ45R+tKRccapb)t#(c5YDw5nGu}9*DMe-8^_NJ(L@ZOp0c5F1*W-5bR0Kd&az*Z zx7Qw9ADb{t)AYN&Q`9k7Wc54N0#EO$20^v=sZ?O{tGs;>+9FuIn>;akXG)3dul6v> z`^Y#GzZkbg(?V5B{o3b1-XUEH??sVR&=FR2copa_ zQ2GS|Om%_0#5-qozN#~vBQf~u)$$HMp{ysL%VX2l{m2bC*do>K*C~}wSU%CCwIg}z zh(r0om1O6whGSwMr1G*yIAzU@NbUsD$Zf{;tdcXmnh=hO{d5r4=UT})1||wVNt7{% ziTf~(x*FvYo9mCEW}(K`9u!Qp(=F60i>k|B-ro`+Hmf_O8ui&%L}U;eRZDJ4{SL3P zfeZnA4CDCrxRBU(K6ppLENe=XD zy=Qmd00@2+F+0j^XZ6P+&{6xFTnxr4V5fJ~Jm3C)P`AsbGy2@Mg%)961)`AAPDvJd zmG~LDyLRYEhI#3(z$bB2=WkV#V@l}`HzM|FYUkX|-JjcmFf%YBL-7cy2kJzhLwU>z2ERmaW9&(ZH53(n znn*LE3{C&LK)))`l5 zO|l0r`JtQI=Q!NMl~bJHr@ZRx`{}?t{gKz=m(a_t(Yq?zh^Z0>`-boJvFm{{F?kY3 z=GGxkjHK!cme_Wgty!}n3K3B z?a)C{xaV;BJcRE|Md|;ir*rDqmtTfvmk7|Wix-ERZpCD zd(E?hw#ILQ3N8;?t2M3g=v5}e`_H%K6v|+6kLify6r6m_9vkLzj)RP)5HUFZI-7zC zHOsOD+Y_OI0pGY*Nu(!hE0wm7=Xfr}t%(T3R2T-Y&9K7 z6LdysNVS0zi{JMKlIeu2-DjJ935RBDQu~nYP9+9>WguN z;dGaM*!iu3Vq(0;$akViKn-Gf=K`wU1!UyIQ2BuOT5Wa) zq}QN>@1gFdCbArbe3I{?biWP}?8NDZL~eg3(}S7|zd;aWP7H0UHpOzGi}H*vpb~H) f9+H&3P~c28#(`4r-&_=w2M9b`;5PxGUKalsaeWNf literal 0 HcmV?d00001