From 77b0249b8308340282cfe54790889c638020bc61 Mon Sep 17 00:00:00 2001 From: Sara <sarasdj@stud.ntnu.no> Date: Sun, 19 May 2024 12:31:26 +0200 Subject: [PATCH] fix: map test file --- app/lib/widgets/choropleth_map.dart | 2 +- app/lib/widgets/main_layout.dart | 2 +- .../logs/icemodelling_2024-05-19.log | 154 ++++++++ .../update_measurements.cpython-311.pyc | Bin 12100 -> 12101 bytes .../lake_relations/all_lake_names.json | 3 +- .../skumsj\303\270en_measurements.json" | 354 +++++++++--------- ..._add_new_lake.cpython-311-pytest-8.2.0.pyc | Bin 4825 -> 5014 bytes .../unit_tests/test_add_new_lake.py | 17 +- server/map_handler/update_measurements.py | 8 +- 9 files changed, 350 insertions(+), 190 deletions(-) create mode 100644 server/ModelFromNVE/logs/icemodelling_2024-05-19.log diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart index 58b717ac..9ae33a8e 100644 --- a/app/lib/widgets/choropleth_map.dart +++ b/app/lib/widgets/choropleth_map.dart @@ -48,7 +48,7 @@ class ChoroplethMapState extends State<ChoroplethMap> { shapeDataField: 'sub_div_id', dataCount: widget.subdivisions.length, primaryValueMapper: (int index) => widget.subdivisions[index].sub_div_id, - shapeColorValueMapper: (int index) => widget.subdivisions[index].color, // NB will later be minThickness + shapeColorValueMapper: (int index) => widget.subdivisions[index].color, shapeColorMappers: const [ MapColorMapper( from: 0, diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart index 4b088ce2..17a1c82b 100644 --- a/app/lib/widgets/main_layout.dart +++ b/app/lib/widgets/main_layout.dart @@ -139,7 +139,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> { onTap: () { setState(() { satLayer = !satLayer; // Toggle satellite layer state on press - osmLayer = false; // Turn OSM layer off if it was turned on + //osmLayer = false; // Turn OSM layer off if it was turned on }); }, child: Container( diff --git a/server/ModelFromNVE/logs/icemodelling_2024-05-19.log b/server/ModelFromNVE/logs/icemodelling_2024-05-19.log new file mode 100644 index 00000000..7c548cdd --- /dev/null +++ b/server/ModelFromNVE/logs/icemodelling_2024-05-19.log @@ -0,0 +1,154 @@ +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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. +12:27: 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:27: 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:27: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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. +12:30: 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:30: 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:30: 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/map_handler/__pycache__/update_measurements.cpython-311.pyc b/server/map_handler/__pycache__/update_measurements.cpython-311.pyc index 85f0e5e0d21804dd094c6508f1bf40512e2befcc..d2b02ac1ec7e3af46bc64b3dc5af22e76df7c03d 100644 GIT binary patch delta 85 zcmX>ScQlT7IWI340|Ns?&TEgf_Kmz2d_4Tgi8;xoIf*5y@yVM5_yk!v4K~PLRJ6aM qXumm2sFzDfcSYoe!Zk5F^snf8U6l2{BI~`GQ}&%8W9j4{dOiTRr5*DC delta 84 zcmX>acO;H?IWI340|NuYL1VYH>W#b>eB6A=i8;xoIf*5y&YJ`I1X(!sH}GCmw7a5c pw>ev=mrF=zh3AIEH9kA!ujqJQl=ZqI>$RCn_MISO>g1n#J^*Vv9Gw6F diff --git a/server/map_handler/lake_relations/all_lake_names.json b/server/map_handler/lake_relations/all_lake_names.json index d1d3eb65..2cf061bd 100644 --- a/server/map_handler/lake_relations/all_lake_names.json +++ b/server/map_handler/lake_relations/all_lake_names.json @@ -1,4 +1,5 @@ [ "Mjøsa", - "Skumsjøen" + "Skumsjøen", + "test_lake" ] \ 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 6977af07..8e9c497e 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-16 12:15:20.376332", + "TimeMeasured": "2024-05-19 12:30:39.815723", "CenterLat": null, "CenterLon": null, "Sensor": null, @@ -17,84 +17,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -109,84 +109,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -201,84 +201,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -293,84 +293,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -385,84 +385,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -477,84 +477,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -569,84 +569,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -661,84 +661,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -753,84 +753,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -845,84 +845,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] }, @@ -937,84 +937,84 @@ "Color": 0, "IceStats": [ { - "Date": "2024-05-13", + "Date": "2024-05-16", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.17 + "Temperature (c)": 16.37 }, { - "Date": "2024-05-14", + "Date": "2024-05-17", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 15.77 + "Temperature (c)": 15.995 }, { - "Date": "2024-05-15", + "Date": "2024-05-18", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.945 + "Temperature (c)": 16.795 }, { - "Date": "2024-05-16", + "Date": "2024-05-19", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.945 + "Temperature (c)": 17.295 }, { - "Date": "2024-05-17", + "Date": "2024-05-20", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 18.02 + "Temperature (c)": 16.32 }, { - "Date": "2024-05-18", + "Date": "2024-05-21", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 17.295 + "Temperature (c)": 17.47 }, { - "Date": "2024-05-19", + "Date": "2024-05-22", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.695 + "Temperature (c)": 18.12 }, { - "Date": "2024-05-20", + "Date": "2024-05-23", "Slush ice (m)": 0, "Black ice (m)": 0, "Total ice (m)": 0, "Snow depth (m)": 0.0, "Total snow (m)": 0.0, "Cloud cover": 0.1, - "Temperature (c)": 16.045 + "Temperature (c)": 18.77 } ] } diff --git a/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-311-pytest-8.2.0.pyc b/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-311-pytest-8.2.0.pyc index 1fa60ab42b36ea38e76f2aee05946b207da3f382..a499b703655917a88493f438aa3fd05ce15fff9b 100644 GIT binary patch delta 777 zcmcbqI!&E#IWI340|NuY!7H9=+t@bp6>&43o7~7PZk588!k*4l%TxlAh2j*BDh39I z8U_$q%Ur??6$XpdFxD_FV`gAj%{=)Wx41KN3MWWa3fD3w28Pv4FqNhZwJas<FdhR# z77L7B!?KK#fnhZxj9<$-S&2uVm$im58?3vQt%hxK9FL?dcMV$_V+v0VYYk%>(=rwY zhShL0Qg|l|@Y*x7P7dHz7iC2?FOM;WH-&Gq0B@xvUkd*mrYbfDhFbO%ffT_S_Dn`F zk7M#8US&p($=U3RzHBAZFqbeeWbwh+HBf({n$5_7Q?(E%6ejVBG73)?<5OU-;x0)o zF43KA!>44X$y5aLnI==Z$MSVG)8_j+r0@LG{^j=h00&K`A|3_?22G~)wVC${yEX+o zq{}MISbW^v-(hkbpDkY%PkeG}UP)?Ev0h0<$>iC5!H%3oG7Jn1MNSM147YedmcUfp z;so;w5=$~}F{Twcf>g<a2x|~w!@$5$%*nvOpfFj1-=O{_BLhPN!vj%;2EPa5Di3%h zZ}3QdU}cuz`oPL2$o7GOO^~g@^Me2br{WC`g%7OEB5VylUpW{ARTd;)6wqAZcTvEq z!SgE{1FO&ky#<;pVlJ{+U171hz+&~4je(1=BXfrKMLyL9#TPlXuW)LAU|?jGTTysd zP;`pq48w^sQ)D*p<9B7W11q}7qIQKv?E;J1T^6<$&yLI)dKdXLF0yD|VbQz*L&bs& y3=I249Tk`lDzG@Jupd-sbX1wFF6htZ2J)NB<{Cj8Mn!2xtq%-1h$0mR1_l5yR<Qj5 delta 608 zcmbQHep8iiIWI340|NttoQreXH`a}OMcj-NCO2}6*O!1qp*V%Dih+Tlh5<yTu!G22 zrV?hTBv__~aTyZ>!)hj&7$ZXoD~!#+P{WkMfhupxP|IAxj!==s0%O-OFJok2SUtIp zjgzUCWwH*BzAH-&V>a02TGkrY;zK3eFtrQ}S!^(N3TF*#8e<Aq4NDDU8q+cs28Pve zGgG)r_$MbaiA*-&)nsIue2+(6oCRzPBTRQ5V+wZ)4_sBUBu@(O9HuHZ28LR;6uuPx z8n#SEFpqum8eZkeWlV}pwXBmB_{1mQV&vywWJqBMX3!Lv9Kxr-c8jYdwYX$*HJ{St z%Y3$z<@ke*IErK#7#ND285kIDae`#y3ld8*ZZW16If2CGL4-Akuwh_eDCS^bV3@p# z-ynG(BLhPN!vj%;2EPa5Di3%hZ}3QbU}cuz`oPL2$o7GOO^~g@^D7^Npvr>eivpS} z{4NSu?TEf8;L+gum5qT_XoB7X&5JBLS6Fl|u;_ecW8mWJ$eba3kyG{xr|bs?Mpn56 zf}6tx0vJ^;vPfKEk+=Xu#exhB47)@frI`;(vpCALA5>y=l%M=W(4Wm6<Ve@emO?g+ RieikC9~f{DMJfyo3;^l9eVzaS 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 370919f8..5fd6c0e8 100644 --- a/server/map_handler/unit_tests/test_add_new_lake.py +++ b/server/map_handler/unit_tests/test_add_new_lake.py @@ -35,21 +35,26 @@ def test_write_json_to_file() -> None: 'test-field1': 'test-value1', 'test-field2': [ "test-value2", - "testvalue3" + "test-value3" ], } - test_path = LAKE_RELATIONS_PATH + '/' + test_lake_name + '_div.json' + test_centers = [ + (0, (59.24678, 67.2478)), + (1, (78.7897, 62.43578)), + ] + test_path = LAKE_RELATIONS_PATH + '/' + test_lake_name # Call the function that is being tested - save_all_data(test_lake_name, test_data) + save_all_data(test_lake_name, test_data, test_centers) # Try to read the data from the newly created file - with open(test_path, 'r') as f: + with open(test_path + '_div.json', 'r') as f: result = json.load(f) assert result == test_data - # Remove the test file - os.remove(test_path) + # Remove the files created during the tests + os.remove(test_path + '_div.json') + os.remove(test_path + '_centers.txt') diff --git a/server/map_handler/update_measurements.py b/server/map_handler/update_measurements.py index ea30124b..59a51c2b 100644 --- a/server/map_handler/update_measurements.py +++ b/server/map_handler/update_measurements.py @@ -104,7 +104,7 @@ def update_measurements(lake_name: str) -> (int, str): 'CenLatitude': center_lat, 'CenLongitude': center_lng, 'Accuracy': accuracy, - 'Color': calculateColor(avg_thickness), + 'Color': calculate_color(avg_thickness), 'IceStats': ice_stats, } sub_div_ids.append(subdiv_id) @@ -201,7 +201,7 @@ def fill_remaining_subdivisions(lake_name: str, processed_ids: list): 'Accuracy': accuracy, # Calculate ice thickness based on total ice, temporary # 'Color': calculateColor(ice_stats[0]['Total ice (m)']), - 'Color': calculateColor(ice_stats[0]['Black ice (m)']), + 'Color': calculate_color(ice_stats[0]['Black ice (m)']), 'IceStats': ice_stats, } sub_divisions.append(sub_division) @@ -214,7 +214,7 @@ def fill_remaining_subdivisions(lake_name: str, processed_ids: list): print("Failed to add remaining subdivisions: ", e) -def calculateColor(thickness: float): +def calculate_color(thickness: float): if 0 < thickness <= 4: return 1 # Red elif 4 < thickness <= 8: @@ -224,7 +224,7 @@ def calculateColor(thickness: float): elif thickness > 12: return 4 # Blue else: - return 0 # Grey + return 0 # Default: grey def add_test_data(self, lake_name: str): -- GitLab