From f6d2cf25dfa4d5f5fb0add9c59c1e94cd67ba721 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Wed, 14 Feb 2024 17:11:26 +0100
Subject: [PATCH] update: db query strings
---
server/map/get_markers.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/map/get_markers.py b/server/map/get_markers.py
index 608b4009..201d67c5 100644
--- a/server/map/get_markers.py
+++ b/server/map/get_markers.py
@@ -10,21 +10,23 @@ def get_all_markers(self, cursor, valid : bool):
cursor.execute('''
SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude,
d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active,
- c.CornerID, c.CornerLatitude, c.CornerLongitude
+ c.CornerID, c.CornerLatitude, c.CornerLongitude, b.Name
FROM Measurement m
INNER JOIN Sensor s ON m.SensorID = s.SensorID
INNER JOIN Data d ON m.MeasurementID = d.MeasurementID
INNER JOIN Corner c ON m.MeasurementID = c.MeasurementID
+ INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name
WHERE m.TimeMeasured > DATE_SUB(NOW(), INTERVAL 5 DAY);
''')
else: # Fetch all markers
cursor.execute('''
SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude,
d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active,
- c.CornerID, c.CornerLatitude, c.CornerLongitude
+ c.CornerID, c.CornerLatitude, c.CornerLongitude, b.Name
FROM Measurement m
INNER JOIN Sensor s ON m.SensorID = s.SensorID
INNER JOIN Data d ON m.MeasurementID = d.MeasurementID
+ INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name
INNER JOIN Corner c ON m.MeasurementID = c.MeasurementID
''')
--
GitLab