From d135dd41e2e235d8181910a1fef7039585cf91ff Mon Sep 17 00:00:00 2001 From: Sylvain Gay Date: Wed, 6 Sep 2023 18:00:41 +0200 Subject: [PATCH] self icons --- static/admin.html | 2 +- static/self_def.png | Bin 0 -> 1289 bytes static/self_green.png | Bin 0 -> 1335 bytes static/self_invi.png | Bin 0 -> 1256 bytes static/self_orange.png | Bin 0 -> 1304 bytes static/self_purple.png | Bin 0 -> 1298 bytes static/self_track.png | Bin 0 -> 1329 bytes static/tracking/conscrit.html | 2 +- static/tracking/vieux.html | 2 +- static/utils.js | 17 +++++++++++++++++ 10 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 static/self_def.png create mode 100644 static/self_green.png create mode 100644 static/self_invi.png create mode 100644 static/self_orange.png create mode 100644 static/self_purple.png create mode 100644 static/self_track.png diff --git a/static/admin.html b/static/admin.html index 550a40c..f303f1f 100644 --- a/static/admin.html +++ b/static/admin.html @@ -83,7 +83,7 @@ socket = io({rejectUnauthorized: false, auth: {type:"Admin"}}); - setup_socket_common(); + setup_socket_common(-1); ////////////////////////////////////////////////////////////////////////////// // INTERACTION diff --git a/static/self_def.png b/static/self_def.png new file mode 100644 index 0000000000000000000000000000000000000000..17db4b4db20aaecfbe626b28712bad6b99836fd5 GIT binary patch literal 1289 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 S^zaJ+0000TSk|?2cLNqZUF+>HS#Y*Cn zH8Ih|1X>V?5?@G2uoogBF&Y#507z6YMhnQLwB;fo3>4{YE@v+v+A?!yPU&2*?5Dlg z+UsB6-us+=)(qs)E;QE#yIVId%tyn@Cpd2Di(v8s@Z}SXvK*0r@{!1S2ei4y7FedL zi|z|Rk3Hjgg)-2m|JuK4@`MAZaYDmA2?V0iS0)tT=of4JAT^_7gRGuVfT^WLOM%kS zv7n33?pr^9!T`kR+EkOzvDfFMm2E&zYu!Af`lm1>Q}BMadRgs2S99$X2*(%!m;TG(FGdUQyoFI!T`()ubShKLjCVj40o|M&Batu+ zT}z%;Ah0=8&8z^rTWa4zn+K1;UA;8joq z&JYsmbPV$U) zI@>lZvWzs5wrU{WkA3q5L~p0LyqX5e(2^?D@_V^|7R&meqIz>XfOIz3JudK}h^`>z zW)vra^z|TpmvFu7nKa9XDV~WIO$RHz@>AuoARk*|Q6-}DQ0`^{Q`;I#=3DFi4SC!J1`Y9r3&mqFZV%9OoG`K z_3`F+ii6^B0NEg^6|;$9g*%Yw*bgCqDS8y0@|c(FmWr;ctZv#Pk~mM#&FyYk|EwZy zAP>8j=3rm@&3y?ayMxm(Q_~A0fwQ8{tL33>CsKW$_drF>)}M^>lqel;B^y(^!1JNP z4q!^EypkW4Xyi$+$hM|XxlZPvIOCR3u4kEs6XkaK%f*2l(}LBE^17dj8~$K`!$>q+Hy&atOO!1h{-eW z^v&eT)UcRXteW*&)7A0xGpYw>g|_^ns`V~_;54v&sJ|F3c)%SXT3=q>csLX7j4Ptb znx^f*k4afjkF5ueRCJVlo~dre03xV3tRwj-3dKoIGV`HWhK!03#8f0E5GQA4zvvzsB^_?B%j-71fQGMdYhgyNK+_TgguFYwKrFt-2Wvr@oz_Zs!{V@ z&N}(DuGZR9T`hG-^U=unZ@P9B?Z0mTsvNdNGpp174*-k!A;dS7kH&v)DXf0Hh~FIm O0000R;cAQFz)D!Kw> z@f`s;FM(%)*}#*Z)b*B6I{=1NH=crJrB>av0&IPKYl(=2lL^r^(+UtDoVyIDN=Ys0 zY~HhQ+5k}VmMsns zCiQEjHnK5S&Ab4*!+mdnKA!|~mH2=mcFDlxHlVP)dsTnKZ3XCQ-dhc_AvG5pFsK19 zt|W#u?fa^_t*de0yxRiM^U|&=W88iqH0b~%=O&kaL8?>pqZd8g;mKLYFOP4BFBS)4i5(r`NNGU;TVB~y5s1aV2cAjI>zH!w?+i1p z{pFz zY#BQ7%^JWPQHD;tj9tIEd1?fzgjo+cNJ(a&6XYi&=DoH^{Q&^!4)1=%V7)KUh_5r6 zgmV3?A$B3#{@yyohR{5lvbi=^_KV+PML)ERSn~xI`pp5<15{J{eeR)PJiyC7s&GXu z84!Su=MFfPcVB%K9y*V72 z;YnEss%`jg%<3wGCp;2Ex894gIX2}F+DL}C42hVQmPp-pL6S4cdKz{%?S5Ls+6m0@ zLtH-YrZu6|2+p>cIp4`9`UjZ$)@Z{C|3KD0(DqHkkBU42{GK)kN2plnWPPdZpfI!A z&SrkpDX|{UW`0uufVODuKj16@(h99oVaENL1mzDnh@D}7+;ZJzZ+=;Gke{O08vwv{$36l^Vf?^J`QZ;6TR+ZMFK>YMT`SLne33b#TXK2piv|Gj zEZO3BS7U7}M5`cx_8m1Rfg>rY{cSsI&rBNtfQoFNeAcfE)hQUjQr$PS zg?mqTh5L>cqfy-7bRq{(9lm1#svNdNM(!AZ1&3UBELM!h|Ala|o?#g^IRF3v07*qo IM6N<$f&#Q&W&i*H literal 0 HcmV?d00001 diff --git a/static/self_track.png b/static/self_track.png new file mode 100644 index 0000000000000000000000000000000000000000..8187087d5103046dbbfad763c3a8e1def4c8a646 GIT binary patch literal 1329 zcmV-11AWd;WGV_UDJ>X*_A>oH z?!k0*M^DQZ%!Xt=QvzrShMrUO@nIm>!*q3HF8v+-832~GuB@xLr2u=XYl{VaCpu=j zE`u@XzyR8F%{O0FH|?!lGxL@J?0l*=;2NtH82-?xVmdAkKe`>~V^lK5wcVZjYHIQr zqumr>UrkM(<5reT3(7ckEsOSTxvgZ*K|)v(p0Dy=qm#K)>@X@JMuA zBN5D*j=1^WZ)d?6Urb?n4wH7Zmad(c62R{2nt3LYeE{?!-+)ov6Q|KgBu=CK1GuMt zPvE9cYEIbgZ3c{lE@0lnUjd-61Tt#{PqKGQ%x&Rs=FR#yBN{9weqR^HUOA3$~m z>+Z4Ob)b?MIvpIuocjy!LMIrFGrMWCZS0xTv1d#LCt=}rNa0P(5}gMuh)oWFXHXSL zG55dp3Z4g^NjM66MJ&1mVE<$F&ef@BYEgYdkhlXxd#~fRwWEFgN#&M;+i;4DknH$h zpuzzgeYqsO`6$G^byM*9Nx9NjuWDWb@vWP>F5dBWOwZ_>5Wt=`6?^V%5dVS-^cazK zWlarRqt`UyZMdr{^sptm1DNKA@Nkc{`3|AzW=$!?nKw7Vh_)N7@``Z7@izRig6K`Iq-$^ZZn*L@4<1HiVUPrP2W zowrlXQ##u z06@fS9qOydm+AVX4WMfF4t25ZZ_@S2s5J-cPPPQ=j%4DI(cg3;>{lhZO7*`0Ksh9$ niK~-w0l+&LaW%O@ag_ECKL55KH1SNM00000NkvXXu0mjfgQRaQ literal 0 HcmV?d00001 diff --git a/static/tracking/conscrit.html b/static/tracking/conscrit.html index 64d8127..a87c991 100644 --- a/static/tracking/conscrit.html +++ b/static/tracking/conscrit.html @@ -45,7 +45,7 @@ id = "%ID"; // %ID will be replaced by the real id. socket = io({rejectUnauthorized: false, auth: {id: id, type:"conscrit"}}); - setup_socket_common(); + setup_socket_common(id); ////////////////////////////////////////////////////////////////////////////// // SETTINGS -- CODE diff --git a/static/tracking/vieux.html b/static/tracking/vieux.html index 560e487..239ad16 100644 --- a/static/tracking/vieux.html +++ b/static/tracking/vieux.html @@ -65,7 +65,7 @@ id = "%ID"; // %ID will be replaced by the real id. socket = io({rejectUnauthorized: false, auth: {id: id, type:"vieux"}}); - setup_socket_common(); + setup_socket_common(id); ////////////////////////////////////////////////////////////////////////////// // SETTINGS -- State diff --git a/static/utils.js b/static/utils.js index da2ec2a..1cfbc15 100644 --- a/static/utils.js +++ b/static/utils.js @@ -13,6 +13,14 @@ var CircleIcon = L.Icon.extend({ } }); +var SelfIcon = L.Icon.extend({ + options: { + iconSize: [20, 30], + iconAnchor: [10, 15], + popupAnchor: [0, 0] + } +}); + var icons = [ new CircleIcon({ iconUrl: '/def.png' }), new CircleIcon({ iconUrl: '/track.png' }), @@ -22,6 +30,15 @@ var icons = [ new CircleIcon({ iconUrl: '/orange.png' }) ]; +var self_icons = [ + new SelfIcon({ iconUrl: '/self_def.png' }), + new SelfIcon({ iconUrl: '/self_track.png' }), + new SelfIcon({ iconUrl: '/self_invi.png' }), + new SelfIcon({ iconUrl: '/self_purple.png' }), + new SelfIcon({ iconUrl: '/self_green.png' }), + new SelfIcon({ iconUrl: '/self_orange.png' }) +]; + ////////////////////////////////////////////////////////////////////////////// // INIT MAP