From 56ea65fb0f18266a9b3cb9d9eeb6d1e03ccee83e Mon Sep 17 00:00:00 2001 From: Rajvinder Rai Date: Thu, 20 Feb 2020 14:21:06 +0000 Subject: [PATCH] Distance Added --- locations-jinja.py | 2 +- locations.db | Bin 24576 -> 20480 bytes templates/index.html | 23 +++++++++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/locations-jinja.py b/locations-jinja.py index 77cc32a..bc26698 100644 --- a/locations-jinja.py +++ b/locations-jinja.py @@ -23,7 +23,7 @@ class LocationsWebsite(object): def get_filtered_data(self): all_data = [] with sql.connect(DB) as cur: - results = cur.execute('''SELECT * FROM Location GROUP BY longitude, latitude,date,tid HAVING COUNT(*) > 1 ORDER BY tid DESC;''') + results = cur.execute('''SELECT * FROM Location GROUP BY longitude, latitude, date,tid ORDER BY tid DESC,time;''') for val1,val2,val3,val4,val5, in results: #rename vals to actual lon = val1 lat = val2 diff --git a/locations.db b/locations.db index 309dabe22ec181201d85424da765f22e5b6dcc2b..ae8d4bf6122726db42e993a60ee0cdaf630265b7 100644 GIT binary patch literal 20480 zcmeI2XIvC#*T%QewhD--ppGaAiVCt+jqXwu7FZC7itG+uMFd2_M8z^-??w^D#fI{_{Wlb6PSO z`!H>sJC&D_#r~8=4N=Dgg{ouvxc2dIb3=nKP`t<5n<+kh`Qcx5BTScSs(`5irV5xU zV5)$r0;UR>DqyOBsRE`7m?~hZ!2jzCh?qpUK4GrRYydBj*T_@cQB)~bD<&$2D!di8 z^4Ic<@~!gu@(lSPxwGs~S+(p3*<@L~%vWY7eJi~r-7Z}y&6I{oyGhL?_a#RpQzQuz ze~G>Ly|_kPE?z9o5{HZ3#1>W$t&Ul(vzlhr*Q%Xmo#j=_o#wmEmzn39N169DmzX^< zJ8AZlS&>#wc%<*T(7UEsx)qyqbr;XX|29B zDkg>+%SGrKXsxaRh#W#}^>(7F{8Sp((tblur9t!|3W#h%YzX(eKS2kChmY%y4-nmt z0wRkLYZ}i)w?C`WbbCFfI;0+=-=TmQ!xHuH=gyc2!~w^3)He_OyYQ9xvH60ShF0x^mZB@G`37OsXI7bTh5 zGKgBCfEY=LmFL1<$=d^Q;@(H5FRe{@ivnTw6`oK%Dj-Rk8}AXHh_;vBc*eqC5@*aq3xCfe4~oQ9z`!#BSQ5zXs1E@vOQ6qDxRf zq!41|#5+%V3xPO$@J4GPL~~I# z5S5~U(6PjxS4Z;`kg(4mIUk||6c7n4QMJ3<@>M{bdk}U6*7@o0$n!V)AL z*KgPj(dQ^2;#s2Z_gZTPh_jcvYM>Uw@1uYi#u5kajBNZBiSwr;6cD|E0%9mj)Tm~} zEkdGk(0Cn0FQ9-J!V;yK(L3G%VXWBjV?Z1O;%k;TJ>9y`P$16PW@JP|6wh`y5OGGL zwx8lrw^ol-8mF%Fe=F)s4_fbp3RF|EMxt(hfcW6)t}2b!bDM*?k7)JSd8pV}Dux`T z?Kht)DJPXinLV@Z4LjPeb9dArjrnz+Q&az_`*3E<*q07KP`iKLP)xgbFF^VDQ_&;` z&+@y2F%RJ=Pp}iwnytT~0>h{%LI~_Tw~8K!gt^_#VA^f=dX(otN=pc7iEs7X7jTr$ zzr4yDM~BCbKxu-gNJ31%Uhb|RqSE+&_e1^FGCEQnkBW?{0Whj-&zFSxyPGE}QK3M*!OM;Uk=1m$bI`vzY4qjrZ2Fvl++E=JML z>taz6VU!O`xJ4(VxB&4&IMx3st(kTgrHP}w31QjykYn#ZRT}Tex&K`>lJ*+vhl&ZO zlw^%H){Y1`iAQ<;)p30m9N`Q~6HR%M9Nkx4I)4!Qm~vsqnuSOi$?kT0uLP+M%F3c#<48TYo9}c{1cE=yXH#f%fXepgcS%4?^(s7I(BO#vI3c z*x#bvid<0e-tSF_jORJRV}HQ4SPNzy{Y<-6rl34Ms9uDye0Al?CHSmVF3;5EWYM9@ zODIhw)sqmsPW_L1Y2heO+qJ1W0apt5WnFJCCFO1;-aGX3RMvJ;X{>5mmoC3ThZ|<0 z!qrp{l4Hi^q|8Y_!uOAkLxqm5>F`hAqo5~uHxhLXcODN5f{JTt@H9EIoLQoc47>!G`|!kN|-<)Q{^sBVOCIpeXT zrWaf-)6{XjGgr_cA2sDd2%f0!ZuU~laVdIX1?{}T2{j~yawg}|5MwuC?inDi>^O1j zwEm2P1{EDlbu|*7_w{y|FjWd2w|z)`>N0(gPJL1E_^t~%O4&ALT@GGglY$`%P3_ zFhv=2yzhQUSyUXZ3aeOjeqq&f{gJNGs8BW4i5w;AEA!X$Ps6o%8rCl9rAzKtf{N2n z9SI>nmi(mgJ{-k=>)O4mb=vnes1d1D2SUu5;y!t<46ZhztF7p;E@r5;2%8i~3q zySgc@x2Scyq5koSrw;s+PCGXcs13YB~A`^^@VSJ z%6@OlCO+1M?2Si-#8d6aQR*kX&)8rE#Hel_CvtVmhps~f4x-w!InICO-5NTK(tnoM z{7_w3c@Qd6OW7NVlBr|blr1h-g;jTWwfUlpK0cp^(x|C6Y>tgiytc5CmHlu9>0+J? zK*dH=b}Uijw0u$|61zkDZ_$NREkK27sn�=mSIZ#{%KEuXO)$U9w()iix9a2_Y}< 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 delta 4387 zcmaKwdsGzH9mn_HnVrW1yP_fygUpP8@(=_;Q9u?KR2El24L(^w@eyAL65on*X{*2bQygX zbSZrbt}mf)g5F8vhnr|I9Rs?E&H-IWH-RpodqA7$%b@e=D2qfn`-3Atg9CDf)9$^@MsSibo8Evs zXMqlugH^^%{vj~Qm?5qNl4|Lr*#^3U{yE!3)9I;v)121((1Tg~-nzyfx~1`OcDS(n zXKVxmG%>}(Mh!hvVJ1~OlX1qr*O#1!$rqk`_;OOX@Vl#QP&*~703Gc2x3dj5J!d66 zXJs&8gnDki()IS57q9wZ#*5<{-q;(?JzmcSy^!(^Hp=OiN>eIRRC+yiaIz6_7F0S* zUR-ZU1VeGR3qKltE*q!*7X=>Tx{MU_YY^irm|5{Yos|dW{z%3m~#S7QJmC;In_a*m9_mgz*h-Nx7H38dUT9ayGyH13;BFqtCHu%7j zW(gmp8umk*A$&wy{%LbY7);5wb_G_F&*)^M%nTE%q=c)&s-u9NAKkd<8NEEUld zb`V@)p$a-E4c>neElxAshCPw{BMI9RsLigI)A}hEDx=5K%oN)(as=}PLxw$`>gi^? zUE2E%MzWIaccw)2l3n6#BBGh>an6*R-IV(yJK4p~O1HMtgrH#;(O*^6Y-gc-dOv6$eF1bN{QxuAsN`N&&iBC>iW+p&>w5 z3t2!{3z z=2V3_l^%1t9dpXUoDw%D7Uo1f5B)#pba8XG_u3(nH#a*oB3g5kvxA7v+~~}>*_h0i znZ2Cb;4Bl-m+QfnCRzu!G|^gSOKhxRu0*SuDbZcblh|luBt)ygk|t^eOB(I0=UCzD za{2z{JM4SN*XFD7W%;7KpL&mbAM>_*>%3#V@iCWUPRIN%=DwK4G37B<^o{5<(SM45 zFnU#Vb@cFPPt=8|SEBYsZH}4~RS*^D`PTEM=PA!Uo`s%($I!3qALuXW_v*<(l$O<@d_Zm1bqKlBOu`f4g6DKk8oZ zp5e}O$I4&Jf0rMZ@0RDuCGzdkRq0*nkhD`;E(N8bl8n#cqj)!7himajXlcGeucQ6w zC#VsPLxWsh^wNkpOhT*+!DKRPLolgig#eQvYeX=qV4VmilUOT)$wZzlWCG6?QqHmk zlQMdS{Vf2#HxZ%Tc}cA2Ak@rHVhKU~PC}3po)BalPY6=X`i>M*!kV1Mr8CDoelTv^mWDN8mR&s&!)ql3uj(U@|}m>x+e+2e)8yjK}M?6 zpt)RgxQ^hO%{7bbaMruXBvTYEw?Uxh)1;w;;nmY2ona?wA`BB@s0gVdq==9#!VnQG z5lkQe+-``F1SEh19PDf_A__<%>s~OqowI-p5-cDIJuDytISa^bzyg>R&tX6YI7f2h zhvu4BSFuKA-Sqb7!=-@@Y(S+VaSR5NNPp)A(3u0?bFnb<{HpD_#c;NJ*np;o^y{7S ze8QCak6_B@|7fY%2!C#71G*m4m*!N#>anyl9X8d+Sv_K66CcZLOuQ_$F^Lf+heY#| zL!x-eAs$h3h|cmG6OAP}CMsk&1O=)N1UGBuF_Bp}kBP(!55c_f5X1`)aq+^_&I`|G zQFu0q!n08no(-b#tQUo69WOjNhoGB4= z$Zn)xq(CWbfZonf8DRtP<4pB8rs^R*U01dLXfJEO)HY}{wS29wdQm;0KA~<^=c|4- zQTbkZ@7b0LCDrI~ywT;__U>DMVC`>DKIfham*<{>cj@qPVsv=Lb~|GDb~~b-H;jmk zjwrs}4v%v%u5HziT>a}!OFRQhJj0f7DsY6KF@TH?jc>O@<*jUoB7$24Sp-Q0ECS-> z=y3It0}5>qIW`LdY!YFk2pd=c=GIKMFj*(AtrcO72&+Z7OAw