From d3c829f0ac0866baad515464939c107abaf06383 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 9 May 2024 12:26:10 +0200
Subject: [PATCH] update: legend values
---
app/lib/widgets/choropleth_map.dart | 10 +++++-----
.../logs/icemodelling_2024-05-08.log | 7 +++++++
.../update_measurements.cpython-311.pyc | Bin 8224 -> 8431 bytes
server/map_handler/add_new_lake.py | 2 +-
server/map_handler/update_measurements.py | 11 ++++++++---
5 files changed, 21 insertions(+), 9 deletions(-)
create mode 100644 server/ModelFromNVE/logs/icemodelling_2024-05-08.log
diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart
index 82921320..f818c1f1 100644
--- a/app/lib/widgets/choropleth_map.dart
+++ b/app/lib/widgets/choropleth_map.dart
@@ -53,23 +53,23 @@ class ChoroplethMapState extends State<ChoroplethMap> {
MapColorMapper(
from: 0,
to: 4,
- color: Color(0xFFff0000),
- text: '{0cm},{4cm}'),
+ color: Color(0xffff0000),
+ text: '{0},{1}'),
MapColorMapper(
from: 4,
to: 8,
color: Color(0xffff6a00),
- text: '8cm'),
+ text: '2'),
MapColorMapper(
from: 8,
to: 12,
color: Color(0xFFb1ff00),
- text: '12cm'),
+ text: '3'),
MapColorMapper(
from: 12,
to: 400,
color: Color(0xFF00d6ff),
- text: '>15cm'),
+ text: '4'),
],
);
}
diff --git a/server/ModelFromNVE/logs/icemodelling_2024-05-08.log b/server/ModelFromNVE/logs/icemodelling_2024-05-08.log
new file mode 100644
index 00000000..4134b823
--- /dev/null
+++ b/server/ModelFromNVE/logs/icemodelling_2024-05-08.log
@@ -0,0 +1,7 @@
+12:44: 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:44: 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:44: 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:44: 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:44: 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:44: 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:44: 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 e8071416f0505440aa1abfb89d7f0652e8615e0b..92ac977e4cdc09c13f9cd16db2a2af1f2d983f49 100644
GIT binary patch
delta 1864
zcmaJ>ZERCj7(S<`x4r$k{k*;FO52UKgQ0a_OoYK$7uXmRFd{)vEE{Kp!nTsz%Qnfq
zU_y*PB(ZoBg9Z)J2qVt;v6v8ls3T!NAOwtJni|3%{UMUDC1MEt!1uJwGGaV8_c_n|
z-se4E_kGXl&O0gTtjlFb(A4eidwc6nNDuKXCgG3pFYI%C6u-xkreCp>*~sDj)Ni<H
z!0>1xt}iz&JkJo)9lBF@P0D8oLZ87~Zn|6dOa>SF46hcM{|<59GZ-S^EjOyLn?xpF
z=%?jSvvR=9{VJhVhHu0~LxxX_J(5DFOFAekOQO{*Wsa-~A1FywLHE%`hk+YD-9Z&l
z+o`Xj<}22HTJ2-w*=Ypkt+K<g(Ni|Vt`im$6!x>Z153;=tiUH(pAaK{8e=I_heQc~
zbU$^TvKRpt5kfe?eiF8ZYWS?Q_KXSk25-5wAwy<sEg?asp2@{*mt~i{c%i}w>gaTk
zoe<;9Erv;)CYaay3J$V&L<QHgvtpEeVhwv0t$lt>m}QBsu&dT)yp&<F;Ze*^bIJX-
z7%qj?C6pryC0o%BM2Yc;m)RH|L*rxz8p90@Q+LFBxa+>XrKx3kvbibQ-0~P-d5#qA
zxkCeKni)-JXc3PW@$2VIMXQ!g(|&ERXxpo1hf9<_u=nA_RFC5n##QV$=Qk0jHaL7R
zJ+G8XRz-f&)eX9vt`Pg%HQ?)qz45Hf*#v~%K(n5MY`>H;bz(Ltjayc^+UC$Iw#<FZ
zQtxe_L-lOR-Ptp1LGh;i^Myone)El*<n?FP6_zx8x$%c(vjjJ8#&d|{UnMMT-*YW%
zfWP)A_XC0-FyDJuoKifi$!h^L9hFmS$#ko86Y#a>E@Hhv2=EIQ%(-<#5R6Nasy<9E
zwQ<p9Z0-}Rmjy1mEMm@WT~;uz1ngT{$dzap*^(qzlfsr3_LaXL?`8%6q#zlBW@8RH
z#6Auz#<!VGUczn%`bFw6Y}9Gk*(N#G>RMPnx=puFN(+64L-SS=LU*wD<pg%H@8!e_
z2Nf#`Pu&%6IH}!mjhLwjOf+1&1rpf_k5w0S7Yhdy*uzr6h{Hj>PzjQ5KJ8?+g1kmr
zSg;u7@o|rC-iqpwR$W;|9I0W${dlQUpYCQ@k(=E|+&mW{|A38QE&9Jv{&H04iKu_G
zHZawwe2a0I-KvVl<1mz3#ewfs<?B)T@M;~v9|6wlStPW1T`Q;jZc&$WXagvc%!sBw
z$4y8)q*^$v<iM+~Xi@t|Xm+@0<vmxfW?zI9Wdj%V05o`1E9V0oHnAI_`lI}QRA1t-
zjl*^hFLT%dQ1okAt$!$;*)y2d_GR`Q7#Ymv)SdkEiyYDbIS)Y16HVRCKd+gGH-Y3R
zTryB9!B(ODcbE6NFEL^J(Z@!sk6Gfj);Sbs53A|MSrOGdop%;$lX>aJqK50sIt#Ie
ziJj+HK`}hl!;1kBiUF|j!mHQzje<Wi&i#Pk2h7{<T2MfldMg~qoeA`z+(Eu}u1}!v
z%qf#~+C+d(3z&1ux+oYI6ZY;Tx!CCG7RZd?0zTvObT1_{ONH(v`*YEQ>Vtgw{Q9pc
z?~9*x>A+{+jeg*0<W}hqW!R_D!S-jl%`b?ec_@?9N~cg1_6}wHwNj9(als)Dy8-Tt
ztB14n(9mFqdYG+`?e87OcpIMZ&!Q6f?{1WI;P#2uSp?mAt<*gUT_$!f7B};G{sDk)
BriTCk
delta 1693
zcmZuxU2GIp6rQ_xXJ%)2XLt5zX1i_oue8M$DQ*guP*~bZ8-$ed6AdlFrf?ToyWKUj
z({3d*pz=TrCX}29je_YDmWa{Vm>3d`C4ra{(rwbdteWUUAAGWnAu$@G_wEX%=$*`W
zzjN+6_ue@_^K18Xm*-<yc5-xV&+a<2wc)DgZ}bCr&_`$iK1CPM71(O~9`PXIb8s2Q
z#J~;Aai3r~qG>xVuMuIM)nR&XAi6}~>L9^UJ7aqNMk^A80WF+-w2FypDLEU_EX9cZ
z>q;lnV|qz2{8&LkFkp}DsTr+kbly}*_#EYyV!B9>T04n<-P&}UvZ)w}$L<_muchbK
zxaqca*Cfkn;%Ohe<p@HProftg8xkSGcc7~<$j7jc)I+x|<tLaurjNL<36|fqS6ytT
zAAaVKg(K_&BznU}KbyYQv4gV$&@Y7f08wtmU{pA%#x`15L6e)-=-DcYgV)i56QluR
z;t3p_u47tpQ#Ft*#_*XK@u^1VquuFwjiw4eib>S;gzu1(sXyed+y1-7vxpny2)5Mo
zD#6D#@T#_mirgd~<cg@JdG;^I?<jZ^mz{<2Q^O=PF`OY~G+9P(K!@ufiqBqjT|-EN
zxcnvjCimJkdNJts1mKA0w10>Stdt5XH1Th8tI8PM^K_#<AbBT+4td8K*8!Kj7llo}
z&NXfmC`wo3LxD@QEw}9}9Ud&5e6=(>UTT|IY@1l37%wixi&HN?6lUL3cH>uMZZ4{J
z@5OWN?taSm+Iz5g2V=_b2#9fUzn2R0TFrr7c)pDp&F``wNQv_)W^^AR%J18HL@GRx
zoda9&gHR71XvPc8{J<7S2Ak1QI3B#kixzK4a9IsQgW7;r;2m`{WYrN^R%4=Tz4{eP
zGJNZ4F(ufnH6aQ5wWbb<IM!>CxYxPmBu>kfvl9np4$EZ<w7Q)15lx5bf}3;)85XpN
zOClaxq;6VqZdRn4>E75}h?_$1N{|SJeDag+MZBgAS3+u1J}<Lu(+pEqL`HP|s*Rjp
zXKnOSs$SuzydKwuZ}#iZZG^%w8IG!~OZ6HCY|~$Yj3wZ9_|SzmMp@JA+Za4Yp^P&*
zLvLpy&p=?Xox$@I%7Q+UBl)qi$Yy5Q!L+`<Og4QeZ}jEIbEH?-^Sb^5bLpYb;?YIM
zPcYa|q3qDp*%2d?&%veI@C6oZeSpDX21l7iz{ndT+2PFT^ssR@b9ywFE)?`*Y`LGo
zaS8<wh4_Y{53<FbkKk=)m7;x4D_cwQoh!0$+21rHE&7w6A6)eB{Wh>D_b$Pfx}wk^
zwXbmvFjGewA3C{6>vC(?cLz#Cq;ys<wH6jz3riI1jiq{HN?HkMvoF^-qOK@+T}|OH
z+`Uom8+*4+oU>s{=Xk`purEY~yHRIfGrs$b(wo9}Q!?fETuNU8-%Id)&2T&NXKjXE
zlKq0?)!VZmS0X(J3(*f;txT-s<`fvQbZ3&utZmEoY^GpTKDNxC$>v9likCjd3~~%u
zF#d4t9?O&QY&xYEAQ*q`&^SUbp_#xcS0VpDy^eRI&YAXAj!s`0mFa0XkDRFX{WL7b
M!|+p_=PM`v1HrC{C;$Ke
diff --git a/server/map_handler/add_new_lake.py b/server/map_handler/add_new_lake.py
index 88c42035..a674b4b9 100644
--- a/server/map_handler/add_new_lake.py
+++ b/server/map_handler/add_new_lake.py
@@ -45,7 +45,7 @@ def cut_map(self, cursor, lake_name: str, cell_size_in_km: float = 0.5):
bounds = polygons[0].bounds
start_x, start_y, _, _ = bounds
- cell_width = cell_size_in_km / 111.3200
+ cell_width = 0.5 / 111.3200
cell_height = cell_width / cos(start_x * 0.01745)
# Process all polygons
diff --git a/server/map_handler/update_measurements.py b/server/map_handler/update_measurements.py
index 380b11a5..8b4756b4 100644
--- a/server/map_handler/update_measurements.py
+++ b/server/map_handler/update_measurements.py
@@ -54,7 +54,10 @@ def update_measurements(self, lake_name: str):
avg_thickness = sub_division['AvgThickness']
# Retrieve ice statistics for current subdivision
- ice_stats = get_raw_dates(ice_prognosis_raw_data(sub_div_id=subdiv_id, x=center_lat, y=center_lng))
+ temp_to_date = "2024-10-12"
+ temp_from_date = "2024-10-19"
+ ice_stats = get_raw_dates(ice_prognosis_raw_data(
+ sub_div_id=subdiv_id, x=center_lat, y=center_lng), to_date=temp_to_date, from_date=temp_from_date)
# Ice statistics were retrieved successfully
if len(ice_stats) > 0 and len(ice_stats[0]) > 0:
@@ -156,8 +159,10 @@ def fill_remaining_subdivisions(lake_name: str, processed_ids: list):
# Fetch weather data for each subdivision from the NVE model
# NB hard coded date to december 2024 for testing, remove to_date param before use
- # temp_date = [datetime(2023, 12, 12)]
- ice_stats = get_raw_dates(ice_prognosis_raw_data(sub_div_id=sub_div_id, x=center_lat, y=center_lng))
+ temp_to_date = "2024-10-12"
+ temp_from_date = "2024-10-19"
+ ice_stats = get_raw_dates(ice_prognosis_raw_data(
+ sub_div_id=sub_div_id, x=center_lat, y=center_lng), to_date=temp_to_date, from_date=temp_from_date)
if len(ice_stats) > 0 and len(ice_stats[0]) > 0:
total_ice_thickness = ice_stats[0]['Total ice (m)']
--
GitLab