diff --git a/server/APIs/__pycache__/get_weather.cpython-311.pyc b/server/APIs/__pycache__/get_weather.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7b401d0fc3d6e1bae0c899df6b313dddb5b91dbb Binary files /dev/null and b/server/APIs/__pycache__/get_weather.cpython-311.pyc differ diff --git a/server/APIs/get_weather.py b/server/APIs/get_weather.py index 14dc01cfae098b26a4b263f9a575883b9009f838..63618e2e81c2774e3817b634d105fb4da5c51dc1 100644 --- a/server/APIs/get_weather.py +++ b/server/APIs/get_weather.py @@ -28,8 +28,8 @@ def get_weather(self): url = f"https://api.met.no/weatherapi/locationforecast/2.0/compact?lat={lat}&lon={lng}" response = requests.get(url) - if response.status_code == 200: # Extract data from response - data = response.json() + if response.status_code == 200: + data = response.json() # Extract data from response timeseries = data['properties']['timeseries'] # Get data for current time and append to weather_data @@ -56,5 +56,5 @@ def get_weather(self): self.send_header("Content-type", "application/json") self.end_headers() - # Write weather_data to the response object + # Write weather_data to response object self.wfile.write(json.dumps(weather_data).encode('utf-8')) diff --git a/server/__pycache__/consts.cpython-311.pyc b/server/__pycache__/consts.cpython-311.pyc index 16e0d17e682de899d1bf7d8e9de0db95305ac2f0..5c3188f8a9d95c5a2766585e72bbb8895f196618 100644 Binary files a/server/__pycache__/consts.cpython-311.pyc and b/server/__pycache__/consts.cpython-311.pyc differ diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc index b2a4d214c3c57af1bcef1da38d922fc819c3f74d..cd584e3466e900302483a0aead05cbe7de1f39b0 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 eb8c2bcd089db1d2de508703427978d4e8455bc5..b469a7719cfa8c317d79ae8ac04ca669b5e88d25 100644 --- a/server/map/get_markers.py +++ b/server/map/get_markers.py @@ -94,6 +94,6 @@ def get_all_markers(self, cursor, valid: bool): self.send_header("Content-type", "application/json") self.end_headers() - # Write marker data to the response object + # Write marker data to response object self.wfile.write(marker_data.encode('utf-8')) diff --git a/server/sql_db/icedb b/server/sql_db/icedb index 6385b70369576517bd28a34b786d3d3de44c6c49..e01a5712975ae037329fb433f502db93106da42e 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 9648d07cd39eee9334b29ff719aba1ba7bc169ac..3ac83acef029146dd4341548e86ee161273aeda3 100644 --- a/server/sql_db/schema.sql +++ b/server/sql_db/schema.sql @@ -43,10 +43,10 @@ INSERT INTO Sensor (SensorID, SensorType, Active) VALUES (2, 'Magnetic', 1), (3, 'Other', 0); -INSERT INTO Measurement (MeasurementID, SensorID, TimeMeasured) VALUES -(1, 2, '2024-01-01 10:00:00'), -(2, 2, '2024-02-04 11:00:00'), -(3, 1, '2024-02-13 12:00:00'); +INSERT INTO Measurement (MeasurementID, SensorID, TimeMeasured, WaterBodyName) VALUES +(1, 2, '2024-01-01 10:00:00', 'Mjosa'), +(2, 2, '2024-02-04 11:00:00', 'Mjosa'), +(3, 1, '2024-02-13 12:00:00', 'Mjosa'); -- Measurement 1 INSERT INTO Data (MeasurementID, Latitude, Longitude, IceTop, IceBottom, CalculatedThickness, Accuracy) VALUES @@ -93,3 +93,4 @@ INSERT INTO Corner (CornerID, MeasurementID, CornerLatitude, CornerLongitude) VA INSERT INTO BodyOfWater(Name) VALUES ('Mjosa'); +