diff --git a/.coverage b/.coverage index c6f71242717009048579c62d8013902616f691bb..ff08eea20be7ba960c6e8ec8f6124fe1561d7e48 100644 Binary files a/.coverage and b/.coverage differ diff --git a/server/ModelFromNVE/logs/icemodelling_2024-05-19.log b/server/ModelFromNVE/logs/icemodelling_2024-05-19.log index 000100685c1e97c0e4fc94ec3904b2a504186ca6..184128a8cb849074bd80723de02348789151e89c 100644 --- a/server/ModelFromNVE/logs/icemodelling_2024-05-19.log +++ b/server/ModelFromNVE/logs/icemodelling_2024-05-19.log @@ -306,3 +306,80 @@ 12:32: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. 12:32: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. 12:32: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-17 06:00:00 tm. Adding avg value -15.449999999999989. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sdfsw. Adding avg value 15.025000000000002. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sdfsw. Adding avg value 9.662500000000001. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-18 06:00:00 sd. Adding avg value 35.3. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-17 06:00:00 sd. Adding avg value 67.575. +13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-02-18 06:00:00 sd. Adding avg value 66.6375. diff --git a/server/Sentinelhub/__pycache__/sentinel_config.cpython-39.pyc b/server/Sentinelhub/__pycache__/sentinel_config.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3e2008e29d43e82f5e993a813dd77dfeeb62baf6 Binary files /dev/null and b/server/Sentinelhub/__pycache__/sentinel_config.cpython-39.pyc differ diff --git a/server/data_processing/__pycache__/add_new_lidar_measurement.cpython-39.pyc b/server/data_processing/__pycache__/add_new_lidar_measurement.cpython-39.pyc index ee8da4fc4cea654ec78f148b78faa6642a218b9d..4406a32cd7b1f569eb54226948bbc88b6cdea72b 100644 Binary files a/server/data_processing/__pycache__/add_new_lidar_measurement.cpython-39.pyc and b/server/data_processing/__pycache__/add_new_lidar_measurement.cpython-39.pyc differ diff --git a/server/data_processing/__pycache__/input_new_data.cpython-39.pyc b/server/data_processing/__pycache__/input_new_data.cpython-39.pyc index 1ba1de3faa52b6a385fb82c82e491b30b6c15a10..45cb41f8acc614ec476f2bcc83b3726cecb30b75 100644 Binary files a/server/data_processing/__pycache__/input_new_data.cpython-39.pyc and b/server/data_processing/__pycache__/input_new_data.cpython-39.pyc differ diff --git a/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc b/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc index 00c429468ce27e0ca4e0f6b21e30495022da114e..8a3f4d8f6f5e8239dddfaff06199251db6a4d627 100644 Binary files a/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc and b/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc differ diff --git a/server/data_processing/add_new_lidar_measurement.py b/server/data_processing/add_new_lidar_measurement.py index 09c0f290318565a80360d07db45a5bc02a63e723..b164087618ad6edcb7b0d711efbc57e90c3206ff 100644 --- a/server/data_processing/add_new_lidar_measurement.py +++ b/server/data_processing/add_new_lidar_measurement.py @@ -37,13 +37,14 @@ def add_new_lidar_measurement(lake_name: str, lat: float, lon: float): # time last updated data time_now = datetime.now().utcnow().replace(microsecond=0) + measurement_data = [] content = [] # check if water body data exist, else create if os.path.exists(file_path): # get the areas from the map's data with open(file_path) as data: - measurement_data = json.load(data) + measurement_data.append(json.load(data)) # create an empty container for new measurement new_measurement_data = { diff --git a/server/data_processing/unit_tests/__pycache__/test_add_new_lidar_measurement.cpython-39-pytest-7.1.2.pyc b/server/data_processing/unit_tests/__pycache__/test_add_new_lidar_measurement.cpython-39-pytest-7.1.2.pyc index 7e6274e8a928f4ee2ffbd468e95f95fc35e78608..7f8ee66a5dae6e936bc6eaf16b9a98eedcfc3970 100644 Binary files a/server/data_processing/unit_tests/__pycache__/test_add_new_lidar_measurement.cpython-39-pytest-7.1.2.pyc and b/server/data_processing/unit_tests/__pycache__/test_add_new_lidar_measurement.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/data_processing/unit_tests/__pycache__/test_area__processing.cpython-39-pytest-7.1.2.pyc b/server/data_processing/unit_tests/__pycache__/test_area__processing.cpython-39-pytest-7.1.2.pyc index 8b0f8126b378c7b1fe671e6a619184c6665dd649..47168a75cd5c324ecdec32272eed0aab6335d55b 100644 Binary files a/server/data_processing/unit_tests/__pycache__/test_area__processing.cpython-39-pytest-7.1.2.pyc and b/server/data_processing/unit_tests/__pycache__/test_area__processing.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/data_processing/unit_tests/__pycache__/test_input_new_data.cpython-39-pytest-7.1.2.pyc b/server/data_processing/unit_tests/__pycache__/test_input_new_data.cpython-39-pytest-7.1.2.pyc index 5a59c60c9e3d39232d707bdb849cda1b0662ee6b..ce70f305add7d2fa07d25dc4ceb438dd3cd1cff5 100644 Binary files a/server/data_processing/unit_tests/__pycache__/test_input_new_data.cpython-39-pytest-7.1.2.pyc and b/server/data_processing/unit_tests/__pycache__/test_input_new_data.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/data_processing/unit_tests/__pycache__/test_process_lidar_data.cpython-39-pytest-7.1.2.pyc b/server/data_processing/unit_tests/__pycache__/test_process_lidar_data.cpython-39-pytest-7.1.2.pyc index 5dfcb06993571753922d7c912bb5320171e58fd1..8472bd01f8ee611d57fb1834ae9001d1032efe11 100644 Binary files a/server/data_processing/unit_tests/__pycache__/test_process_lidar_data.cpython-39-pytest-7.1.2.pyc and b/server/data_processing/unit_tests/__pycache__/test_process_lidar_data.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/data_processing/unit_tests/test_add_new_lidar_measurement.py b/server/data_processing/unit_tests/test_add_new_lidar_measurement.py index c4c7e7f1445c4920b79762a7e26d5df69832b52c..77e75bc1547f70b43c08bbe86097def26f20ac4e 100644 --- a/server/data_processing/unit_tests/test_add_new_lidar_measurement.py +++ b/server/data_processing/unit_tests/test_add_new_lidar_measurement.py @@ -31,8 +31,8 @@ def test_add_new_lidar_measurement_valid_lake() -> None: expected = 200 print("sub", u) # remove temporary files and directories - #if os.path.exists(file_path): - # os.remove(file_path) + if os.path.exists(file_path): + os.remove(file_path) if os.path.isdir(dir_path): os.rmdir(dir_path) diff --git a/server/map_handler/__pycache__/update_measurements.cpython-39.pyc b/server/map_handler/__pycache__/update_measurements.cpython-39.pyc index 9f807770e09b37f6ad378e4c78c19cb759f8fae9..12713c483abb75ee16507b8369c20cd8eb33a173 100644 Binary files a/server/map_handler/__pycache__/update_measurements.cpython-39.pyc and b/server/map_handler/__pycache__/update_measurements.cpython-39.pyc differ diff --git a/server/map_handler/lake_relations/fake_for_test_lidar_data.json b/server/map_handler/lake_relations/fake_for_test_lidar_data.json deleted file mode 100644 index 3c6b0e03586ba68b2b1159787fbe7f8b323d9e5d..0000000000000000000000000000000000000000 --- a/server/map_handler/lake_relations/fake_for_test_lidar_data.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "MeasurementID": 0, - "TimeMeasured": "2024-05-17 17:57:33", - "CenterLat": 0.0, - "CenterLon": 0.0, - "Sensor": { - "SensorId": 2, - "SensorType": "LiDar", - "Active": true - }, - "Subdivisions": [] -} \ No newline at end of file diff --git "a/server/map_handler/lake_relations/skumsj\303\270en_measurements.json" "b/server/map_handler/lake_relations/skumsj\303\270en_measurements.json" index d961c8aed18cb28a0c11b4ed3c41619e749f5ae4..2f94e87e6e9f37f67595ff7935a2eac2fd5e3e96 100644 --- "a/server/map_handler/lake_relations/skumsj\303\270en_measurements.json" +++ "b/server/map_handler/lake_relations/skumsj\303\270en_measurements.json" @@ -1,7 +1,7 @@ [ { "MeasurementID": -1, - "TimeMeasured": "2024-05-19 12:32:51.507694", + "TimeMeasured": "2024-05-19 13:25:38.219950", "CenterLat": null, "CenterLon": null, "Sensor": null, @@ -64,7 +64,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -74,7 +74,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -156,7 +156,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -166,7 +166,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -248,7 +248,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -258,7 +258,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -340,7 +340,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -350,7 +350,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -432,7 +432,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -442,7 +442,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -524,7 +524,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -534,7 +534,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -616,7 +616,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -626,7 +626,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -708,7 +708,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -718,7 +718,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -800,7 +800,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -810,7 +810,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -892,7 +892,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -902,7 +902,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", @@ -984,7 +984,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.32 + "Temperature (c)": 16.545 }, { "Date": "2024-05-21", @@ -994,7 +994,7 @@ "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.47 + "Temperature (c)": 17.545 }, { "Date": "2024-05-22", diff --git a/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-39-pytest-7.1.2.pyc b/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-39-pytest-7.1.2.pyc index 261eb2acd5a6466fc4de2661d85459b9a60cfc3e..ea343bdaf1a209e12c21c93228c5ee4db3213469 100644 Binary files a/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-39-pytest-7.1.2.pyc and b/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/map_handler/unit_tests/__pycache__/test_get_lake_relation.cpython-39-pytest-7.1.2.pyc b/server/map_handler/unit_tests/__pycache__/test_get_lake_relation.cpython-39-pytest-7.1.2.pyc index 5d5eae0f8e8d45ee897e410a54847f58928f40cb..adb08d1a376306b685480e3f268f5cea585c3734 100644 Binary files a/server/map_handler/unit_tests/__pycache__/test_get_lake_relation.cpython-39-pytest-7.1.2.pyc and b/server/map_handler/unit_tests/__pycache__/test_get_lake_relation.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/map_handler/unit_tests/__pycache__/test_update_measurements.cpython-39-pytest-7.1.2.pyc b/server/map_handler/unit_tests/__pycache__/test_update_measurements.cpython-39-pytest-7.1.2.pyc index 6294989bf550296395b1796092702b628bafe59b..99a3ab979dad5e0865a8f89b680b214cf7b59893 100644 Binary files a/server/map_handler/unit_tests/__pycache__/test_update_measurements.cpython-39-pytest-7.1.2.pyc and b/server/map_handler/unit_tests/__pycache__/test_update_measurements.cpython-39-pytest-7.1.2.pyc differ diff --git a/server/map_handler/unit_tests/test_add_new_lake.py b/server/map_handler/unit_tests/test_add_new_lake.py index 501e56295423f1709a1f7d87a18a06cdee8e84de..cfb4640b491f14f9128b93ff1106d401fd5dc002 100644 --- a/server/map_handler/unit_tests/test_add_new_lake.py +++ b/server/map_handler/unit_tests/test_add_new_lake.py @@ -22,7 +22,7 @@ def test_create_grid_default() -> None: # Define the expected grid output coordinates = [[(0, 0), (1, 0)], [(0, 0.4), (1, 0.4)], [(0, 0.8), (1, 0.8)], [(0, 0), (0, 1)], [(0.5, 0), (0.5, 1)], [(1, 0), (1, 1)]] - + expected = [LineString(coords) for coords in coordinates] grid = create_grid(test_poly, 0.5, 0.4) diff --git a/server/map_handler/unit_tests/test_get_lake_relation.py b/server/map_handler/unit_tests/test_get_lake_relation.py index d129ab698f0f0d69d8e266a9e6e6f6e50240529c..26ba06b5db5730415a5d7ac220c1af35ec066362 100644 --- a/server/map_handler/unit_tests/test_get_lake_relation.py +++ b/server/map_handler/unit_tests/test_get_lake_relation.py @@ -1,4 +1,4 @@ -'''from server.map_handler.get_lake_relation import fetch_data +from server.map_handler.get_lake_relation import fetch_data def test_fetch_data_true() -> None: @@ -23,4 +23,3 @@ def test_fetch_data_no_lake() -> None: status_code, _ = fetch_data(test_lake_name, False) assert status_code == 404 -''' \ No newline at end of file diff --git a/server/map_handler/unit_tests/test_update_measurements.py b/server/map_handler/unit_tests/test_update_measurements.py index d3bf4811f9edbb75cad3864774f1c9e29b27bcc2..e8942cefeb9bbbd3093610679bf55fecf04ed0d9 100644 --- a/server/map_handler/unit_tests/test_update_measurements.py +++ b/server/map_handler/unit_tests/test_update_measurements.py @@ -1,4 +1,4 @@ -'''from server.map_handler.update_measurements import update_measurements +from server.map_handler.update_measurements import update_measurements def test_update_measurements_invalid_lake() -> None: test_lake_name = "test_lake" @@ -13,4 +13,3 @@ def test_update_measurements_valid_lake() -> None: status_code, _ = update_measurements(test_lake_name) assert status_code == 200 -''' \ No newline at end of file