From 86978592369fbccacf70633177fb6acaa1a96ff7 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 11 Apr 2024 13:26:13 +0200
Subject: [PATCH] fix: working implementation of ice stats, back-end only
---
.../logs/icemodelling_2024-04-11.log | 36 ++++++++++++++++++
server/__pycache__/consts.cpython-311.pyc | Bin 498 -> 445 bytes
.../get_measurements.cpython-311.pyc | Bin 4670 -> 4248 bytes
server/map_handler/get_measurements.py | 6 +--
4 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/server/ModelFromNVE/logs/icemodelling_2024-04-11.log b/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
index bd2053dd..b1589360 100644
--- a/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
+++ b/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
@@ -6,3 +6,39 @@
12:42: 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:42: 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:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:22: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:24: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+13:25: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
diff --git a/server/__pycache__/consts.cpython-311.pyc b/server/__pycache__/consts.cpython-311.pyc
index b77dc6c449ceb6b64e450ba47e925ab1b9b5a034..665ab22882bf6b2546aaf16a76e6084d5d314cc3 100644
GIT binary patch
delta 72
zcmeywyqB4GIWI340}yl{7f*AW$ScWcGEv=>C73~zV`54wv!5pW#P?B?Ll~X8cz}u+
Vfw<Uh@<K*u?h6dUKvV?M3jly;5P1Lq
delta 121
zcmdnX{E3-&IWI340}ve8DxOw3kynz@Vxqb!M-+PsM=*mX=fs3mwJOEp)S|M~B7NWd
zl++xzqWoOHFjxKj(vpJG68(al{E}jQKTVE_C!*MHaR&JKhfJ1b^x)zJ8p#O6#h#P%
S8J+oV@aQ*if?yFhP!IrHCn1pl
diff --git a/server/map_handler/__pycache__/get_measurements.cpython-311.pyc b/server/map_handler/__pycache__/get_measurements.cpython-311.pyc
index f8e3968878f7c56a0b929781e777cc9c39aa4023..1535b8fd5611f1843b85ccc7fb383e8309e8ec88 100644
GIT binary patch
delta 1121
zcmZ`%O-vI(6rP#gS=w%Q%YP|91yUk{H4?lSg7}AE&_L8%6C{-Zq?Fcd7oy1)IB+r~
zhCCBVzyvRF01w8C@!(D5ps^+#NHr$LQ@yy}j2h!i`DvTz?Cv-7&3o^AZ+70xrlm%G
zUDI5MkIilG=yu7XUe(#g*+aw-!%-9xGl}9!5+ajQNWzFo^C%=Ud4!G<M(5>_!tiy}
zqGW_f|Kjo)@<Lwx7$Jk-pbvKsSPn~Jicc7`gR`On=E!4C%f;=^+>S{P;t=8%hYvnW
zUYI9-ya|tqzg}H&CRMA*qSMG|w^WN-dE(3spGckN&dIG(D4}IBWT|Typ$-1+4U86^
za217VIbY870_G`T#RaS+$4u=&HCu9Nw&WwMY(=uvG0e(W6j5a-cUrJbPo6Jbb%^TV
zgXEuen`L<xcVV@ROb}r;D$R<VS42Hnvx+fX7?IRs|M9il%(Gd!#`QL`nnEL~b;Tk9
zWL6yrBGiP8!K7~1<aU_X(wEUAQkaOhM^#dTe(J+MNXacyHLHQ&@@Z9{(PIvVl6;14
z8i03l>%Q$2yrBWCfla-*4jf7V`=13BlN`-BdA5w`&5Sr&M(5BXrCo`sn?r1TdT5-b
z@trij3qKs+dA6_4dp><Q937sDhRu-+@o3yIBpzbO9N>YgL!q~g@t6s3U1zZeboDAV
z#8ttB>Vx}glPvB6o~z@fm-#~UUE&r0C3DCoVL0i&sI)mtZPW%c?&HL+f?w_q?{;4*
z#8S76RBPgWYhs6Et+`Wc!X<4Tr@+>};Bwf}<K7<9L(vv>^#-La&$+VRX6bb^?F~Z6
z^R%&+CyI(X5&APLA*23~N3vXjU~x<J6~3Dg?b=}UaWsO50P*4_smN%DV<qQ#{Qh|j
zafUP<jmE>~o^!u24G0hdKOLQuaW)kl=`yZyDwGp9IM@=#co(U2*=HBUQvZ5wC4zCg
Xjq)%gxo|aE8i5Ah@Fz+s&F1<GQa0h8
delta 1538
zcmZ`(OKclO7@paey$|mub`m@8BOB!bjuI%L5fCMy@=y~s(4e*wwWwUjv#}hl?P|S=
z)M!nD)B}PZ66Qc8QsGKfS^<~POHT+Sq~y33Mv5%;#3?7-LoY}m{&ng)E8yRmfB)})
zum2fu_5V1i-VcQ&1T?-ET}(wb)!5oRpsx@?1e+*%^u|dHm@%0=lVq@`V@)>CCAp@|
znS5SI3i&`X0GPjpl0hOE;vz!=x45K4@FkQ89(qMSNZ@*qq;12_<qeR<`MHaiQ}gF8
z&m@?7C~Md$E4^t>Xmh;Rf(R{?SqE1(ce^%!ndLU{wb!VI-+jRbbBl=J1WCY=NYIgX
z1cbhWeMFc(!hOOH3p$qm%=E04WnZA^$b{)_d7~W$9AQ5TMo!QXh}5<Nl6^=yhD1jK
zd#J6k<yIzyz~cGRd-&CMJJDHnTP!P1z~NVrHSQ=5?*!WML~F|{*y{g(Yem@H?WR+#
z_Ay4cpF%!?bhKjub^1`)hax`I)ke1F>%W`c#jzJj&o=8QSxlnag4fU#_-x?YZ`hs3
zocW3f^P*QdmG-fk7P7mK8AEiM?OltuHA_lMCb2Bu!7u~ZM^sh|J@$Y4Iw2DNzSlo7
z@Ln1~cDxmh&>*s|l{MeY<Bs+<ir-=Uh2YelD60;tsC1X>rrX>Idy1T<uW-|{_K8*q
z5>$pay~z#WK6-~sJhQ$|F+aenm53LGbvn%t;Qohc-ex{pjg^)cQY5#M$`O6RSS(tG
zo=KbLq`n%}bv<JgY{Sycw5_KLL^lgrFtA`)m2w$FFWG6kG<hh(ryP2h^Uym?hbl1o
zSKtYb(LaKp>--HXSFkPbDp=l`ud7fXvkW<ncZz1wqF;)W^jGmM+(9GKhcDNqc1LyT
zsDTtXx8*{%E<*KGvpW4$8sa-3txms{a^X3U0<cROT&H!^U<^7WzbBj(!%xszdP5$Y
zf7*pYVK+SbV9A}l<X%a+3t2Z;sw#F(v0cS}92@#=c<NDdKMuC)@b%j8^=d3#i={uC
zeXMkDj8?=4{r8lrGFDT@TxF~gq~FMsk)PuGN%v}|IznnAq<Ye*oiu1ezK^SPOZgr5
zP$yK3o|n(7Xit@9CfL2$xyZ~JcK-}NGeH@3xBmpRY(mFCf3LB~I{h3kHF1#E)I|J!
z(3ZSYr&||*Tca&@lSZ|zLD?DyMP0C9RK>jIrK^WZhP7f?FJ+2_l3lVm`h)iN+VfFZ
z-p^I%7tLbYKFW5{OX>ZwHY@xYoXQu;vT3|&T>+g}y7UFG28%I1K=OL?IY6QH=5v5f
jx&C#423-F-K!t>h3jbaWu88q?10Cap7CVMGubY1WgC$p=
diff --git a/server/map_handler/get_measurements.py b/server/map_handler/get_measurements.py
index e19b099a..307a7336 100644
--- a/server/map_handler/get_measurements.py
+++ b/server/map_handler/get_measurements.py
@@ -46,10 +46,6 @@ def get_measurements(self, cursor, lake_name):
curr_stat = stat
break
'''
- # NB test
- print("sub_div_id before call: ", sub_div_id, " center lat and lng: ", center_lng, " ", center_lng)
- ice_stats = get_raw_dates(ice_prognosis_raw_data(sub_div_id, center_lat, center_lng))
- print("ice stats:", ice_stats[0])
# Create subdivision new object
sub_division = {
@@ -61,7 +57,7 @@ def get_measurements(self, cursor, lake_name):
'CenLongitude': center_lng,
'Accuracy': row[14],
'Color': calculateColor(row[11]), # NB color calculated based on average thickness, should be minimum
- 'IceStats': get_raw_dates(ice_prognosis_raw_data(sub_div_id, center_lat, center_lng))
+ 'IceStats': get_raw_dates(ice_prognosis_raw_data(sub_div_id=sub_div_id, x=center_lat, y=center_lng))
}
# Check if measurement ID already exists in measurement_data
--
GitLab