diff --git a/server/map/get_markers.py b/server/map/get_markers.py index 608b4009a7ee31326237d612e95b1344ff52ac1c..201d67c50d95e66f6ae05bd2fe9f702c27afd765 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 ''')