diff --git a/server/main.py b/server/main.py index f44d017532a7a697f58f681b8d04308abfe14188..8d2a01bae1921be008ab27d8b9628038f68d2101 100644 --- a/server/main.py +++ b/server/main.py @@ -42,6 +42,7 @@ class IceHTTP(BaseHTTPRequestHandler): elif self.path == '/get_valid_markers': # NB: should be POST? get_all_markers(self, self.cursor, True, 'Mjosa') # Get only valid markers # NB: temporary hardcoded waterBodyName + def do_POST(self): if self.path == '/get_weather_data': get_weather(self) diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc index d7a54e2e927f314e198348cc16ce57c24ed6ba17..9022d0973498de25e88a2027322312cc421a0be4 100644 Binary files a/server/map/__pycache__/get_markers.cpython-311.pyc and b/server/map/__pycache__/get_markers.cpython-311.pyc differ diff --git a/server/map/get_markers.py b/server/map/get_markers.py index 067f0af6465376460458864cf74a6c9f074f6490..74d2678cf85d0df7f35710cff88cd0138f9b8575 100644 --- a/server/map/get_markers.py +++ b/server/map/get_markers.py @@ -16,13 +16,13 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName): INNER JOIN Sensor s ON m.SensorID = s.SensorID INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name LEFT JOIN SubDivision d ON m.MeasurementID = d.MeasurementID - WHERE b.Name = ? + WHERE b.Name = 'Mjosa' ''' - if valid: # Append time restriction, NB temporarily hardcoded to 5 days + if valid: # Append time restriction to WHERE statement, NB temporarily hardcoded to 5 days sql_query += ' AND m.TimeMeasured > DATE_SUB(NOW(), INTERVAL 5 DAY)' - cursor.execute(sql_query, (waterBodyName,)) + cursor.execute(sql_query) rows = cursor.fetchall() @@ -35,13 +35,13 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName): # Create subdivision object for current row sub_division = { - 'SubDivisionID': row[3], - 'GroupID': row[4], - 'MinimumThickness': row[5], - 'AverageThickness': row[6], - 'CenterLatitude': row[7], - 'CenterlONGITUDE': row[8], - 'Accuracy': row[9] + 'SubDivisionID': row[6], + 'GroupID': row[7], + 'MinimumThickness': row[8], + 'AverageThickness': row[9], + 'CenterLatitude': row[10], + 'CenterLongitude': row[11], + 'Accuracy': row[12] } # Check if measurement ID already exists in measurement_data @@ -57,11 +57,10 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName): 'TimeMeasured': row[2], 'Sensor': { # Each measurement only has one related sensor 'SensorID': row[1], - 'SensorType': row[9], - 'Active': bool(row[10]) + 'SensorType': row[3], + 'Active': bool(row[4]) }, 'SubDivision': [sub_division], # Array of sub_division objects - 'BodyOfWater': row[14] } # Convert dictionary values to list of measurements diff --git a/server/sql_db/icedb b/server/sql_db/icedb index f4914b4c4464c891c8d94884568fc5289c996d8e..b19e3e7766c83a08ad8f1b6aa7c08743c90ab02d 100644 Binary files a/server/sql_db/icedb and b/server/sql_db/icedb differ diff --git a/server/sql_db/schema.sql b/server/sql_db/schema.sql index 864076dc7399c9f23a2f787497c922c608db7b2d..1413821693b00eaf9221756ddf08375bfbc10f61 100644 --- a/server/sql_db/schema.sql +++ b/server/sql_db/schema.sql @@ -56,7 +56,11 @@ INSERT INTO SubDivision (MeasurementID, SubDivisionID, GroupID, MinimumThickness (1, 1, 1, 3.2, 4.5, 60.765, 10.723, 1.2), (1, 2, 1, 2.8, 4.3, 60.780, 10.776, 1.1), (1, 3, 2, 4.1, 5.7, 60.768, 10.845, 1.3), -(1, 4, 2, 3.5, 5.0, 60.749, 10.783, 1.4); +(1, 4, 2, 3.5, 5.0, 60.749, 10.783, 1.4), +(2, 1, 1, 4.1, 5.7, 60.768, 10.845, 1.3), +(2, 2, 2, 3.5, 5.0, 60.749, 10.783, 1.4), +(3, 1, 1, 4.1, 5.7, 60.768, 10.845, 1.3), +(3, 2, 2, 3.5, 5.0, 60.749, 10.783, 1.4);