From c2163e40dcb64ec2b9ab0a7955f6073f1d57764c Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 16 May 2024 18:28:36 +0200
Subject: [PATCH] update: remove centering & add more text to info layer
---
.coverage | Bin 53248 -> 53248 bytes
README.md | 2 +-
app/lib/widgets/choropleth_map.dart | 10 -
app/lib/widgets/info_layer.dart | 74 +--
app/lib/widgets/main_layout.dart | 6 +-
.../logs/icemodelling_2024-05-16.log | 77 +++
.../skumsj\303\270en_measurements.json" | 474 +++++++-----------
server/map_handler/update_measurements.py | 2 +-
8 files changed, 316 insertions(+), 329 deletions(-)
create mode 100644 server/ModelFromNVE/logs/icemodelling_2024-05-16.log
diff --git a/.coverage b/.coverage
index c1cb9877ed27d7fc4b295321ff79da18a3cc0772..c6f71242717009048579c62d8013902616f691bb 100644
GIT binary patch
delta 803
zcmZY6PiWIn90%~%<SohiOkXFh43>X(Iy)5^IOs)2HoJ8dmErs|v{1G-ot2r6wHpp(
z)JuC1-9|hpB32NOPMVwI^q?S2P!RMociBM)qSS*ZNartAq17DT?<M*Ce);l}FR}R&
z`vB{#$`veL4+;Dk-p{RY1-r$obKF4{qf5lPGuWXH8)hzT8WU%y$706J=tMR#m7dJ)
zo17g~!1x`rquyly_;?~?rqbg8!!kh8fm%HrH*&pG#%R<`WdIFGfLa_Bs7GU&3-Q#n
znMmg{W)|3R8?ZgV_S>tGpaAiU7C+Q3@G-8)Z{uFtyN6D2IE*2DWn`C9KdK?T8pV(u
zNP9iW{+C_p#}FM{!#OlYmm?UGgV|m`>)+(kaSXvLBVqf~sn%ehO1csKK`V5FuF^Mj
ziQc8x=~a4;9-u+by61&wMtmgR5*NjbVy_t3a-Mu6@5poVkj#+`IYPpu8~)U1_aTpp
zUCj#oF1WlXFYpT7dzG(AO@>XMTostw8-!d)#~N}Vqah6;O_V@L(lfu)r|0d$<z@ER
zUIGtKlWGbay7K<U(Jw3CtDBFjOG0T8t>HXEI=p}>EEFc-20h?j!`_cc=R3cz&7_-o
zUB1VnpEh$cYAwwBBC)s4JWwBBE|-}A=X7z^oroFw+vC)H2RhsnugwwoCNSQnt`7vm
zrWKp_uic#6YHiH7u`2Df_=S)_duWJu(M~vsb&urCbg62sC`zr!a;->`-GBRu27QLb
fKZU*=&A>q$(5F%#tFlOB6=#v1MS{heeO3Gg`R3nk
delta 344
zcmZozz}&Eac>{|Bvo!nS$?Oj1n*{|@+1Y}nSr{6%Col9c-h9Vhg99kJWHNhz@@Aue
zP_~T=R2f-9Sb)+WBV0DW3762YlICt>;Qz`0k^d$CZT?IA8~K;<&*GoJpTqCMZ@~AO
z?*d;P?_u7hyfb-Qcs+TwcuKkdao^`Y%YBHu4QQPQ_vX6pea!W0+$@Zoe%$|z7#J8D
zj=l3){ynwk|NprE;Vc(C81h*d7?>Cs6c`vdl(>NE+_>(s2)sxE3PHdJ|78jcy4h9?
z2kf;Irm}Ew0@Vm{Zra4e#Q|iAaR@OmPB-Ob2eL)jHvxs^*?>$3wtuP&Od=2y)WB2*
z(}5?SRS%qDQDA2Ust{l`NatYzGNf4Y)=imRH%WE!%YJEQX@1wq>=Qs?#m>Lkb^d+@
Sph)Fp_5&ahYyQcV=i32f&R(4W
diff --git a/README.md b/README.md
index e21145f8..af8add3f 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Sara Savanovic Djordjevic, and Hoa Ben The Nguyen.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation to view the Software.
Any distribution and modification of the Software requires prior written
-permission from the authors.
+permission from the developers of the software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart
index 2946b7a5..58b717ac 100644
--- a/app/lib/widgets/choropleth_map.dart
+++ b/app/lib/widgets/choropleth_map.dart
@@ -28,8 +28,6 @@ class ChoroplethMap extends StatefulWidget {
}
class ChoroplethMapState extends State<ChoroplethMap> {
- late final GlobalKey<ChoroplethMapState> _choroplethMapKey = GlobalKey();
-
int selectedIndex = -1; // Subdivision/map tile index
late MapShapeSource dataSource;
late final MapZoomPanBehavior _zoomPanBehavior = MapZoomPanBehavior();
@@ -38,14 +36,6 @@ class ChoroplethMapState extends State<ChoroplethMap> {
_initDataSource();
}
- /// Resets the map zoom level
- void resetZoom() {
- setState(() {
- _zoomPanBehavior.zoomLevel = 1;
- _choroplethMapKey.currentState?.resetZoom();
- });
- }
-
@override
void initState() {
super.initState();
diff --git a/app/lib/widgets/info_layer.dart b/app/lib/widgets/info_layer.dart
index 2aff7914..33807d4e 100644
--- a/app/lib/widgets/info_layer.dart
+++ b/app/lib/widgets/info_layer.dart
@@ -46,13 +46,13 @@ class InfoLayerState extends State<InfoLayer> {
Widget _buildLegend() {
return Column(
children: [
- _legendItem(const Color(0xffff0000), "Very unsafe"),
+ _legendItem(const Color(0xffff0000), "Certainly"),
const SizedBox(height: 10),
- _legendItem(const Color(0xffff6a00), "Unsafe"),
+ _legendItem(const Color(0xffff6a00), "Very likely"),
const SizedBox(height: 10),
- _legendItem(const Color(0xFFb1ff00), "Safe"),
+ _legendItem(const Color(0xFFb1ff00), "Very unlikely"),
const SizedBox(height: 10),
- _legendItem(const Color(0xFF00d6ff), "Very safe"),
+ _legendItem(const Color(0xFF00d6ff), "Extremely unlikely"),
const SizedBox(height: 10),
],
);
@@ -60,32 +60,46 @@ class InfoLayerState extends State<InfoLayer> {
@override
Widget build(BuildContext context) {
- return Container(
- padding: const EdgeInsets.all(40),
- color: Colors.black.withOpacity(0.8),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center, // Align contents vertically centered
- children: [
- Text(
- 'Color categorization',
- style: subHeadingStyle,
- ),
- const SizedBox(height: 20),
- Text(
- 'The map shows the safety of applying x kg per y m^2',
- style: regTextStyle,
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 30),
- _buildLegend(),
- const SizedBox(height: 30),
- Text(
- 'Placeholder for other information...',
- style: smallTextStyle,
- textAlign: TextAlign.center,
- ),
- ],
- ),
+ return SingleChildScrollView(
+ child: Container(
+ padding: const EdgeInsets.all(45),
+ color: Colors.black.withOpacity(0.8),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center, // Align contents vertically centered
+ children: [
+ Text(
+ 'Color categorization',
+ style: subHeadingStyle,
+ ),
+ const SizedBox(height: 20),
+ Text(
+ 'Each category shows the likelihood of the ice breaking '
+ 'under the weight of a single person.',
+ style: regTextStyle,
+ textAlign: TextAlign.center,
+ ),
+ const SizedBox(height: 30),
+ _buildLegend(),
+ const SizedBox(height: 30),
+ Text(
+ 'Data accuracy',
+ style: subHeadingStyle,
+ textAlign: TextAlign.center,
+ ),
+ const SizedBox(height: 20),
+ Text(
+ 'The higher the accuracy, the more likely it is that the displayed ice thickness'
+ 'is correct. The accuracy depends on'
+ 'which data sources are used to calculate the thickness.\n\n '
+ '- 1/4: only API data. \n'
+ '- 2/4: only sensor data.'
+ '- 3/4: both API and sensor data. \n'
+ '- 4/4: both API and sensor data, with a discrepancy of <1.0cm',
+ style: regTextStyle,
+ textAlign: TextAlign.center,
+ ),
+ ],
+ ), ),
);
}
}
diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart
index 5ca6eda5..cbe61984 100644
--- a/app/lib/widgets/main_layout.dart
+++ b/app/lib/widgets/main_layout.dart
@@ -42,7 +42,6 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
// Initialise selected measurement to arbitrary value
Measurement? selectedMeasurement = selectedMeasurements[0];
- final GlobalKey<ChoroplethMapState> _choroplethMapKey = GlobalKey();
/// Initialise lastUpdate variable from persistent storage if server fetch fails
Future<void> checkAndSetLastUpdate() async {
@@ -108,7 +107,6 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
child: Padding(
padding: const EdgeInsets.all(15.0), // Padding around map
child: ChoroplethMap(
- key: _choroplethMapKey,
relation: widget.relation,
measurements: widget.measurements,
subdivisions: widget.subdivisions,
@@ -230,7 +228,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
),
Positioned( // Color info layer button
- top: 170,
+ top: 130,
right: 10,
child: GestureDetector(
onTap: () {
@@ -315,7 +313,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
const SizedBox(height: contPadding/3),
Text(
- 'Data certainty: ${selectedSubDiv?.accuracy}/4',
+ 'Data accuracy: ${selectedSubDiv?.accuracy}/4',
style: subHeadingStyle,
),
],
diff --git a/server/ModelFromNVE/logs/icemodelling_2024-05-16.log b/server/ModelFromNVE/logs/icemodelling_2024-05-16.log
new file mode 100644
index 00000000..18b94185
--- /dev/null
+++ b/server/ModelFromNVE/logs/icemodelling_2024-05-16.log
@@ -0,0 +1,77 @@
+12:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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:15: 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/lake_relations/skumsj\303\270en_measurements.json" "b/server/map_handler/lake_relations/skumsj\303\270en_measurements.json"
index 349f0277..6977af07 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-14 18:02:13.321651",
+ "TimeMeasured": "2024-05-16 12:15:20.376332",
"CenterLat": null,
"CenterLon": null,
"Sensor": null,
@@ -11,90 +11,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7651,
+ "CenLatitude": 60.7692,
"CenLongitude": 10.528,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -103,90 +103,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7523,
- "CenLongitude": 10.5319,
+ "CenLatitude": 60.7632,
+ "CenLongitude": 10.5281,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -195,90 +195,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7587,
- "CenLongitude": 10.5315,
+ "CenLatitude": 60.7632,
+ "CenLongitude": 10.5397,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -287,90 +287,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7459,
- "CenLongitude": 10.5325,
+ "CenLatitude": 60.7573,
+ "CenLongitude": 10.5397,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -379,90 +379,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7395,
- "CenLongitude": 10.5307,
+ "CenLatitude": 60.7573,
+ "CenLongitude": 10.5315,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -471,90 +471,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7645,
- "CenLongitude": 10.536,
+ "CenLatitude": 60.7514,
+ "CenLongitude": 10.5397,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -563,90 +563,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7587,
- "CenLongitude": 10.5352,
+ "CenLatitude": 60.7514,
+ "CenLongitude": 10.5323,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -655,90 +655,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7419,
- "CenLongitude": 10.5406,
+ "CenLatitude": 60.7454,
+ "CenLongitude": 10.5325,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -747,90 +747,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7459,
- "CenLongitude": 10.5406,
+ "CenLatitude": 60.7454,
+ "CenLongitude": 10.5397,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -839,90 +839,90 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7523,
- "CenLongitude": 10.5406,
+ "CenLatitude": 60.7419,
+ "CenLongitude": 10.5397,
"Accuracy": 1,
"Color": 0,
"IceStats": [
{
- "Date": "2024-05-11",
+ "Date": "2024-05-13",
"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)": 11.87
+ "Temperature (c)": 15.17
},
{
- "Date": "2024-05-12",
+ "Date": "2024-05-14",
"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)": 14.52
+ "Temperature (c)": 15.77
},
{
- "Date": "2024-05-13",
+ "Date": "2024-05-15",
"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.945
},
{
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 17.945
},
{
- "Date": "2024-05-15",
+ "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)": 18.17
+ "Temperature (c)": 18.02
},
{
- "Date": "2024-05-16",
+ "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)": 18.12
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-17",
+ "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)": 16.77
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
},
@@ -931,31 +931,11 @@
"GroupID": null,
"MinThickness": 0,
"AvgThickness": 0,
- "CenLatitude": 60.7587,
- "CenLongitude": 10.5406,
+ "CenLatitude": 60.7395,
+ "CenLongitude": 10.5307,
"Accuracy": 1,
"Color": 0,
"IceStats": [
- {
- "Date": "2024-05-11",
- "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)": 11.87
- },
- {
- "Date": "2024-05-12",
- "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)": 14.52
- },
{
"Date": "2024-05-13",
"Slush ice (m)": 0,
@@ -974,7 +954,7 @@
"Snow depth (m)": 0.0,
"Total snow (m)": 0.0,
"Cloud cover": 0.1,
- "Temperature (c)": 16.52
+ "Temperature (c)": 15.77
},
{
"Date": "2024-05-15",
@@ -984,7 +964,7 @@
"Snow depth (m)": 0.0,
"Total snow (m)": 0.0,
"Cloud cover": 0.1,
- "Temperature (c)": 18.17
+ "Temperature (c)": 16.945
},
{
"Date": "2024-05-16",
@@ -994,7 +974,7 @@
"Snow depth (m)": 0.0,
"Total snow (m)": 0.0,
"Cloud cover": 0.1,
- "Temperature (c)": 18.12
+ "Temperature (c)": 17.945
},
{
"Date": "2024-05-17",
@@ -1004,7 +984,7 @@
"Snow depth (m)": 0.0,
"Total snow (m)": 0.0,
"Cloud cover": 0.1,
- "Temperature (c)": 16.77
+ "Temperature (c)": 18.02
},
{
"Date": "2024-05-18",
@@ -1014,99 +994,27 @@
"Snow depth (m)": 0.0,
"Total snow (m)": 0.0,
"Cloud cover": 0.1,
- "Temperature (c)": 16.595
- }
- ]
- },
- {
- "SubdivID": 11,
- "GroupID": null,
- "MinThickness": 0,
- "AvgThickness": 0,
- "CenLatitude": 60.7651,
- "CenLongitude": 10.5406,
- "Accuracy": 1,
- "Color": 0,
- "IceStats": [
- {
- "Date": "2024-05-11",
- "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)": 11.87
+ "Temperature (c)": 17.295
},
{
- "Date": "2024-05-12",
- "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)": 14.52
- },
- {
- "Date": "2024-05-13",
- "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
- },
- {
- "Date": "2024-05-14",
+ "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)": 16.52
+ "Temperature (c)": 16.695
},
{
- "Date": "2024-05-15",
- "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.17
- },
- {
- "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)": 18.12
- },
- {
- "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)": 16.77
- },
- {
- "Date": "2024-05-18",
+ "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)": 16.595
+ "Temperature (c)": 16.045
}
]
}
diff --git a/server/map_handler/update_measurements.py b/server/map_handler/update_measurements.py
index 0473854a..ea30124b 100644
--- a/server/map_handler/update_measurements.py
+++ b/server/map_handler/update_measurements.py
@@ -221,7 +221,7 @@ def calculateColor(thickness: float):
return 2 # Orange
elif 8 < thickness <= 10:
return 3 # Green
- elif thickness > 10:
+ elif thickness > 12:
return 4 # Blue
else:
return 0 # Grey
--
GitLab