From b521402aa08ba15efed784d8f484e6e8df2a08fe Mon Sep 17 00:00:00 2001
From: vadik likholetov <vadikas@gmail.com>
Date: Sun, 26 Nov 2023 21:06:43 +0200
Subject: [PATCH] Added icons for GPX display

---
 static/pin-icon-end.png    | Bin 0 -> 960 bytes
 static/pin-icon-start.png  | Bin 0 -> 971 bytes
 static/pin-icon-wpt.png    | Bin 0 -> 660 bytes
 static/pin-shadow.png      | Bin 0 -> 1127 bytes
 templates/sar_details.html |  73 +++++++++++++++++++++----------------
 5 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 static/pin-icon-end.png
 create mode 100644 static/pin-icon-start.png
 create mode 100644 static/pin-icon-wpt.png
 create mode 100644 static/pin-shadow.png

diff --git a/static/pin-icon-end.png b/static/pin-icon-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..190442f59e73ac39484d06265c7c7ab6f7af1741
GIT binary patch
literal 960
zcmeAS@N?(olHy`uVBq!ia0vp^ia@N(!3-qDe|%D7U|?hl@Ck7Ra*sJV4LJJ$|NnL!
zogI35+cY(gIyfA*wLN5Qz1zrWuZhXuA3t^(80<GUKj7+m(9-hXpFdaX>(Axq9}5rP
zWor8K?b|Q+?mb$u;zm!;>6Da{@$tVufBydb`PWB}K3>26@yeCAr%t^-a^%Unb!Rd%
zPQ=6<2@Kq0WAl9H&gVOJ+?_LLpS}H0&!zgnP|zs}@(X78!}ODj?aPN}cXw@BA;tUV
z{J!G6WUIc``pPI@4+mp)Wuf>N53e6tH)n=!(60><dl?v*96eneLo80$PA;!r<RH+_
zzJc}VJ#U?zSE3mi9eY(bKDl&y>ihqpdFhc$C2IdaOq@UcKF{Xe4-~b|MtMzp8nSj}
z#|Hl|TPF1iw+Wn|=6!L)1x@vi`DaR{|8(@~a2Edy{=#|G_>hFevP>yvx!{g>E%R<S
z7;ZB0y=s!4VWc_jzSdcm-*rn?Mw^^Iu(U!};uNc}j_5_rGlqp9pNLF&<#%E0$F#kY
z*}wdD`aG_mx7Z*=^YhcaxwrfC<#kxOJtLMkyknWZZ2vF4a&4b28}6pCD0%i2yg2n`
z;r^p>iCot#wH==y>AmngkI6sswFyhP0)MYWEnjBu_I>m1#onv1x;BblJl@av_}%0-
zpA{3EnM`?nuU;=Zuw!muvP&=biQ?q4+x!Nu&FM1clLDR`JMQeT;r`CRWA%xTe^l{F
zd{3Us>+;G``gx;qJnN}HM-?wG{I{cVix2PQegCUJa-Nq++!@@ibw9H9-;=91UeuIx
zGX!)cceqVGe}CKUr>|p{@@({wX4u|WzDWPx^!5Jwr*AUxcQhOC7itWeUdHYcE*{T)
z)jDOSn8IC|hh6;atdqJJ7Rw0-%(S@Yc}%W?Wzs&C5Xa+1CS9h7#9rJg6|q>#BFIv=
zlqb32{^LU@d&{4%Vsf(i5PGV)eUh@1gi`rIcWuW*PK#LUj_eUJS~81+@sg%ck4KrJ
zi}ma9569kJJn>^ngy1*9?0sRUYVNd0DO$4bTRK^FPp6Q~f|q`(*P5L>j#~IF5^8OB
sS-s`<Y7-g7pouB0eV5j@xPO&@Cp_y+xQ_cLU?ODjboFyt=akR{0O9|@5dZ)H

literal 0
HcmV?d00001

diff --git a/static/pin-icon-start.png b/static/pin-icon-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b9c7e84900e0166c347b983bdee3df61167a9f
GIT binary patch
literal 971
zcmeAS@N?(olHy`uVBq!ia0vp^ia@N(!3-qDe|%D7U|{49@Ck7Rav2&11^WO0Kf@FT
zhDi(zjSLLU3=C}y4805t6BroU8Ca&WFmy5e{`>p;pYQSu<+*2aGxRV7ZVPnV<Yu$h
z#$=TV!$gLUKR>?w_VW6>>-(PUn|66x^1ft|xgw7~Kf3eb&iU8pSKVGU=h~c-qa_aO
z9nQQubK=E`Ef2PIob4z&Qj~chQ*XJR&T^fPb*jgJp`lw6<QL5Fm+9x1=l9w6ZCR0@
z#P{a>E-TLWeXaGCCB7aG#_Gz_Lb2D6uA4I>Qdfc}HOM4*{Q(9BCMQo9#}JFtwNsv#
z-Et6cb6@oRo^NsQTpgWB4qvjE`?9O<{r5E59JR*j&F|*su<td-Qg69(uDs6DoW-|%
z@zSi|)?_F3){s6<k$SE9oRzI^b_eFD=)Zp8vUbUg>6i6aId`0Hn78cpu4|JGH%`!v
z;LSK}r+&>i*5ltN$CX_z_a>C{7dR(-tmAEZHj~5Ph_2HgNduJ%CYL~t+9)&i(??$)
zd6IvsvT5GuDPA2dSKs9sOWE7#`v$F;@SdwzVkdKq(f4?3vF-bpRpbWjo+y37O`|F6
zjrm;W$Kt`)I8zn~Zc+Mi%4>q=`a4{KNdX@hCnoeh@0+Y1Tqe}IL#gY-$>!5L{x&Oy
zsPPz@nB05Xz45ff*^3g33fWRK&$!Eq??1W0xUctOoRnaPck<3c$;YiGpT6iUy8QdS
z-s8Ncwm#=v=ef@e54%?vPW`F*T<#A`r-_u+@d<04f4B*<ZJo%facbq~tBYfkJDH9v
z>98@(l<A!t_Rp?&tzP|_9W}*{x6YeCx_WlSyONE!?efY$YjS4K`q|3mar^r=$BObQ
z`=jwfE8I4*xoDqB=~CtVrLrMIj3vCTb&BKtdnb*1PjWaunzPWUZ{stMdXMjgZ;e<c
z`7~&D*#v!ZdC27Zx*;lrBh7jGKBF5k?K2;>E{%S$KrA6nF`!uf-=_1)KfJVdc(}~8
zR=UK*|8+|6Lg8u`)t3Q(3N74pEu&7JF5G{ei`)F+ev=>{vx$uQ-;STSdc^Qmy1nlr
wfu?d!(T%seS!x`%J@7Vv=p4oRe#Jk=N$qnl3khE?1|~xWPgg&ebxsLQ0Jm$C5C8xG

literal 0
HcmV?d00001

diff --git a/static/pin-icon-wpt.png b/static/pin-icon-wpt.png
new file mode 100644
index 0000000000000000000000000000000000000000..393d49ed47de3c21e2a120f4ec164a81ad310bc5
GIT binary patch
literal 660
zcmeAS@N?(olHy`uVBq!ia0vp^ia>14!3-qzR3@GUQWFAvLR^6~!@Bo_2W9M;{0HbH
z{gNQRV1^$ozdl5L5#eXQb7Z=MCHL!R53cn!1-Tm@+_5${UPoO;^8CK#6}3e^a+?-~
zwr9Hk5dr#<vBlHHF~s6@?Um=#nhXS3AI#PX)$|fRvUSbgH|Kuuzq`tVjpyTU_H@4;
zGYuTW_waH57F%b-)3vx}c7zj$wq&~T-V^g<b&~v2kH4^F7yH^-)!A3%v#aEq=8uJn
zomw|@G9!NdnsDaClDtQ4!bXB-@19IOqs4!q$SduUVA;j)c=p|2x+B<5$ZGm+n>Jx~
zt@@1{N874DZk=ASY3ISqLaN7SRA-!MXcn1adF7Xz_LJ${H=LGs{7?`Mo%lFfb^DGa
z;~>%fJ2*wJxM@FH!S1qW>)ih7dv2FcFMquy@UZ6lGESBw{q=GUJ3KsR9(TByxoO3x
zqlxbXZrc|vPchRhoIWw~?dNMHcNq4oO_mq;Z&hekmYVl6UViPzL+O{NFMitBK0ShQ
zzWB+5cTP=cy4hsHUQ$_Hn{obyrRDp#F$>OzCm(M9q&6$V_-xy|4sV{bSuQz3Ne3oI
zC>-2!uXw*{>*3{gXZ8mzE=mkg`;ss>VM~6}uLS2rckh~lO;;KvPBi2zHD5J5l3w&z
a?z4RNiltYkERv81B`;4`KbLh*2~7aJr#Msq

literal 0
HcmV?d00001

diff --git a/static/pin-shadow.png b/static/pin-shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..948646ead531cc90a28f4d03166033efd087e4b3
GIT binary patch
literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq001%o001%w1ONa4v^GFG000CoNkl<ZcmZM<
z1*2dTjDk@x3P!;w05nS%YmyW}9Ka(ZrKDwjzi)AOhb!)IhBN*e?DH^J?#vl?cZc!m
zlC+3mwtE++3x|KScUAn-{%q9W+DHC4GSn17eP4?RFvzL;)5xOb_2^ZL5fh4HCG!GU
ze9&A_$!E~&0{p{>0=yn~aG&-##!e^9NXSUoE#@M~V>VRfY3963m(hv<{}BX1U9P9P
z&_;^^gF5J_lWsMmM^KCaN{}j=<SLb+jugubv@)NK`khOp&(R}uj&*io(Pl%Yv(a?M
z>#$b|PeXt&*-?@A$FbkvP5Rt##RK^?0tPV0VOfr!1X?q(N1bs~hXoeovK`s%HtbhM
zG-<-G5J0h}Bk^b$wbmd^IrC?{#Q*^2jU~j20t9`U*|CRQU6>L}UmdPe`CJiQvf;#x
zG$SD(D1gk&>v7gk%}uP*cJgVQ*VG(Y8`$d8Ok3<P>yqnSL;XqpTt#Je*+xTi0u(D)
zoGup12B1kVy9?}02i#T@m?OU}tSZ1W%&eHydXz^OOkN&`noBNok&I~82?2Rd04&ZH
z03+{#>*_4{Mq1c~7XTE<vW>?J>}D|;;nYsYlTW5<lqxC6u?0+cat`yLfFL1BM6Vj$
zIdju*@{aDnf1H4p&IFXl!_L)bO+MQ9$&@B}L<L#Utba0oK}H7B8IlUzVRNMUrWH@A
z%4-a=e7V#u3N)B~#i#YRBO31!RdS4grvMaSWF$+PAgRPrdT5W%ws&NfyEZflXb6Fs
zx&*;wyHS`j7vjjW`7vNf6Ozq3naojw_|%=<tj(m!ZQDZx0v<%JhXZP&-qzNzi3T(y
z;{rfN(qytuE}LkgL>)qZY0uq9t!cZy^^hPhh(RPsg0tX7$T07&KoEe<9B@g;BHCz!
z_2jSXcl&L>(}QpQC^q>NF@OlH%B}>qbP>HOPNEnFK+*XG;7$O(@XBA`AL|?6dh2zd
zSf&H%V**|fgNTx6U@A#^*)Li&Yv!yFbGZkYQ2MgB{k?tFDbGEH6hng4<~bnqf<a`F
zqp%^>URjD{6N(a@s^EOx>+b&UaA!K_eF(8hoS0_(@h^cP<Q8}nYA~YNkV&<o1XPBy
zbKU*zv2NVi-USMnKFpuf8n5y%+Ych5Kpj<|DF=#NVxKbrM%UlloYo%bMxFCI?#4D}
z`kXJ9<G%q6Ad9ddr)&eVD5Pt`4Q<gJ?Dl)~Awu4w1N<-ptSkWrkQZPK9c=T*(e^sj
zd~b67q?>k?hX8q!KjbGEL|`~(*+uKH#j}(><U3@Pi?q)l=rK%EmEWKT`1;}ggELV8
zEhBvp&XQ|XOEpyq0>qSO^fW&yAn?1R<Tw9W)i2rTytO(?K^092Q>3rxj{yV7gLt{#
t(Ls+@BbiTQ;5X<g{{6r(GMxV#@*M)9vd3DsRB!+Q002ovPDHLkV1kt66E*+<

literal 0
HcmV?d00001

diff --git a/templates/sar_details.html b/templates/sar_details.html
index bd5d371..ce8c908 100644
--- a/templates/sar_details.html
+++ b/templates/sar_details.html
@@ -11,7 +11,7 @@
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
 
     <!-- Include leaflet-gpx plugin -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-gpx/1.5.1/gpx.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-gpx/1.7.0/gpx.min.js"></script>
 
     <style>
         #map {
@@ -40,11 +40,12 @@
                                         <p>Created at: {{ sar.SARCall.created }}</p>
                                         <p>Last updated: {{ sar.SARCall.updated }}</p>
                                     </div>
-                                    <p><strong>Coordination manager:</strong> {{ sar.SARCall.coordination_officer.full_name }}</p>
+                                    <p><strong>Coordination
+                                        manager:</strong> {{ sar.SARCall.coordination_officer.full_name }}</p>
                                     <p><strong>Search manager:</strong> {{ sar.SARCall.search_officer.full_name }}</p>
                                     <p>Status: {{ sar.SARStatus.name }}</p>
                                     {% if is_logged_in %}
-                                    <p>Category: {{ sar.SARCategory.name }}</p>
+                                        <p>Category: {{ sar.SARCategory.name }}</p>
                                     {% endif %}
                                     <p><strong>Start Date:</strong> {{ sar.SARCall.start_date }}</p>
                                     <p><strong>Finish Date:</strong> {{ sar.SARCall.finish_date }}</p>
@@ -61,7 +62,7 @@
                                     <p>Latitude found: {{ sar.SARCall.latitude_found }}</p>
                                     <p>Description: {{ sar.SARCall.description }}</p>
                                     {% if is_logged_in %}
-                                    <p>Description private: {{ sar.SARCall.description_hidden }}</p>
+                                        <p>Description private: {{ sar.SARCall.description_hidden }}</p>
                                     {% endif %}
                                 </div>
                             </div>
@@ -74,8 +75,8 @@
 
         <div>
             {% if is_logged_in %}
-            <a href="{{ url_for('edit_sar', id=sar.SARCall.id) }}" class="btn btn-primary">Edit</a>
-            <a href="{{ url_for('delete_sar', id=sar.SARCall.id) }}" class="btn btn-danger">Delete</a>
+                <a href="{{ url_for('edit_sar', id=sar.SARCall.id) }}" class="btn btn-primary">Edit</a>
+                <a href="{{ url_for('delete_sar', id=sar.SARCall.id) }}" class="btn btn-danger">Delete</a>
             {% endif %}
         </div>
 
@@ -105,23 +106,23 @@
                         {% endfor %}
 
                         {% if is_logged_in %}
-                        {% if current_user.id == comment.user_id or current_user.id == 1 or current_user.id == sar.SARCall.user_id %}
-                            <button class="edit-comment-btn" data-comment-id="{{ comment.id }}"
-                                    data-comment-text="{{ comment.text }}">Edit
-                            </button>
-                            <!-- Button to Open GPX Upload Modal -->
-                            <button type="button" class="gpx-upload-button" data-toggle="modal"
-                                    data-target="#uploadGPXModal"
-                                    data-comment-id="{{ comment.id }}">
-                                Upload GPX File
-                            </button>
+                            {% if current_user.id == comment.user_id or current_user.id == 1 or current_user.id == sar.SARCall.user_id %}
+                                <button class="edit-comment-btn" data-comment-id="{{ comment.id }}"
+                                        data-comment-text="{{ comment.text }}">Edit
+                                </button>
+                                <!-- Button to Open GPX Upload Modal -->
+                                <button type="button" class="gpx-upload-button" data-toggle="modal"
+                                        data-target="#uploadGPXModal"
+                                        data-comment-id="{{ comment.id }}">
+                                    Upload GPX File
+                                </button>
 
-                            <button type="button" class="delete-comment-btn">
-                                <a href="{{ url_for('delete_comment', id=comment.id) }}">Delete</a>
-                            </button>
+                                <button type="button" class="delete-comment-btn">
+                                    <a href="{{ url_for('delete_comment', id=comment.id) }}">Delete</a>
+                                </button>
 
+                            {% endif %}
                         {% endif %}
-                    {% endif %}
                     </div>
                 </div>
             </div>
@@ -156,19 +157,20 @@
 
 
         <!-- Add Comment Form -->
-    {% if is_logged_in %}
-        <form action="{{ url_for('add_comment', sar_call_id=sar.SARCall.id) }}" method="post" enctype="multipart/form-data">
-            <div class="form-group">
-                <label for="text">Comment:</label>
-                <textarea name="text" class="form-control"></textarea>
-            </div>
-            <div class="form-group">
+        {% if is_logged_in %}
+            <form action="{{ url_for('add_comment', sar_call_id=sar.SARCall.id) }}" method="post"
+                  enctype="multipart/form-data">
+                <div class="form-group">
+                    <label for="text">Comment:</label>
+                    <textarea name="text" class="form-control"></textarea>
+                </div>
+                <div class="form-group">
 
 
-            </div>
-            <button type="submit" class="btn btn-primary">Add Comment</button>
-        </form>
-{% endif %}
+                </div>
+                <button type="submit" class="btn btn-primary">Add Comment</button>
+            </form>
+        {% endif %}
     </div>
 
     <!-- GPX File Upload Modal -->
@@ -210,7 +212,14 @@
             fetch('/get_gpx/' + gpxId)
                 .then(response => response.text())
                 .then(gpxData => {
-                    new L.GPX(gpxData, {async: true}).on('loaded', function (e) {
+                    new L.GPX(gpxData, {
+                        async: true,
+                        marker_options: {
+                            startIconUrl: '/static/pin-icon-start.png',
+                            endIconUrl: '/static/pin-icon-end.png',
+                            shadowUrl: '/static/pin-shadow.png'
+                        }
+                    }).on('loaded', function (e) {
                         map.fitBounds(e.target.getBounds());
                     }).addTo(map);
                 })