From af68db6b0866e188e6784f5b121318b4fb2aaa13 Mon Sep 17 00:00:00 2001
From: Arnold Kocsis <kocsisa2@coventry.ac.uk>
Date: Thu, 13 Feb 2020 12:30:41 +0000
Subject: [PATCH] Removed unneeded code

---
 locations-jinja.py |  60 +--------------------------------------------
 locations.db       | Bin 20480 -> 24576 bytes
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/locations-jinja.py b/locations-jinja.py
index c6a7192..77cc32a 100644
--- a/locations-jinja.py
+++ b/locations-jinja.py
@@ -18,70 +18,12 @@ class LocationsWebsite(object):
             
     def get_locations(self):
         locations = self.get_filtered_data()
-#         latitudes = self.get_latitudes()
-#         longitudes = self.get_longitudes()
-#         dates = self.get_dates()
-#         #times = [time[:-7] for time in self.get_times()]
-#         tids = self.get_tids()
-#         times = self.get_report_times()
-#         for i in range(len(latitudes)):
-#             locations.append([longitudes[i],latitudes[i],dates[i],times[i],tids[i]])  #make list of lists to enable jinja render as columns  
         return locations
-   
-    def get_latitudes(self):
-        latitudes = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT latitude FROM Location ORDER BY tid DESC;''')
-            for latitude, in results:
-                latitudes.append(str(latitude))
-        return latitudes
-
-    def get_longitudes(self):
-        longitudes = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT longitude FROM Location ORDER BY tid DESC;''')
-            for longitude, in results:
-                longitudes.append(str(longitude))
-        return longitudes
-    
-    def get_dates(self):
-        dates = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT date FROM Location ORDER BY tid DESC;''')
-            for date, in results:
-                readabledate = time.strftime('%Y-%m-%d', time.localtime(date))
-                dates.append(str(readabledate))
-        return dates
-    
-    def get_times(self):
-        times = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT time FROM Location ORDER BY tid DESC;''')
-            for time, in results:
-                times.append(str(time))
-        return times
-    
-    def get_tids(self):
-        tids = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT tid FROM Location ORDER BY tid DESC;''')
-            for tid, in results:
-                tids.append(str(tid))
-        return tids
-    
-    def get_report_times(self):
-        times = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT time FROM Location ORDER BY tid DESC;''')
-            for Time, in results:
-                readabletime = time.strftime('%H:%M:%S', time.localtime(Time))
-                times.append(str(readabletime))
-        return times
     
     def get_filtered_data(self):
         all_data = []
         with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT DISTINCT * FROM Location ORDER BY tid DESC;''')
+            results = cur.execute('''SELECT * FROM Location GROUP BY longitude, latitude,date,tid HAVING COUNT(*) > 1 ORDER BY tid DESC;''')
             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 2ba4f4e7bf386423d404498218d2e4318e953baa..c3447b28e73af22c6c60e23218f0df575ac2941f 100644
GIT binary patch
delta 3466
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

delta 83
zcmV-Z0IdIjzyW}u0gxI70O<e#00ogCJ^}#gv0$VR3<3}J000001rPfV^|K)m(GQV;
p7qj>u3?LQ>4#fZu-4D7Cmk)FgQ4cN;3l8WG#j$a#4ztBhI{^|V8Pfm&