From bf0beb150691e87c56a6e2b9d2889fe2b9fe67ba Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 15 Feb 2024 12:56:01 +0100
Subject: [PATCH] update: sql schema and db
---
.../__pycache__/get_weather.cpython-311.pyc | Bin 0 -> 2597 bytes
server/APIs/get_weather.py | 6 +++---
server/__pycache__/consts.cpython-311.pyc | Bin 602 -> 602 bytes
.../__pycache__/get_markers.cpython-311.pyc | Bin 3990 -> 4140 bytes
server/map/get_markers.py | 2 +-
server/sql_db/icedb | Bin 40960 -> 40960 bytes
server/sql_db/schema.sql | 9 +++++----
7 files changed, 9 insertions(+), 8 deletions(-)
create mode 100644 server/APIs/__pycache__/get_weather.cpython-311.pyc
diff --git a/server/APIs/__pycache__/get_weather.cpython-311.pyc b/server/APIs/__pycache__/get_weather.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7b401d0fc3d6e1bae0c899df6b313dddb5b91dbb
GIT binary patch
literal 2597
zcmaJ@%WE4)7@yVd>ivpWQldQk0LzY(%5u{*mfa|(B!xUwH;}ZYsuM-ktZXULuDUy_
zYq0_yaxf)Ox477l6m&{ma_P1IK`w=rx?nLh5GXz5CP)h<r_QdPmPuzv-+c2ue>3~d
zXn%6K?0~dSUjN2FvjXs^KIt}7hj}$em>mECr1GFZB`8YgO?gwoWQ=rzHby4FK>7hl
zu+Vf1%rGx?_ZbRXB>u}1FQer&)d{E%7V@LX@6{iK?f^8PQ$VgagH%wrHrf*+ecIDh
zC}P)z2x@w)LrtNEd`!sJH_EYHUNP0oU4C$cri1<mXBAqZA>GGUVUWA;ozqunv>Msi
z!|e$XJ?)8W1GsuZ0GXkT>?)|3AzQI1%oT8_QL!r4n(+erK5Y(~hdga>w6qLa+M!jk
zJp$0C*dKu(nTi7)?MKh`vMG)sKd0i%IlGq7e&2XEQbuvsn67kiJh=XfOL0L*e=ni4
z&sW@vo2)ik@hBeX>dO_jljDp+uo9hnK<9y;{tS8_GZn95uDJ#gba};la3vI=fIvN5
zP%N;U!36CU%fnya6agO55x|kh^l+qyzbl|NP!-*r04PKIP61-+>FfI(<e={f+0CcD
zYBy}XeTzPKa94G^+>x%fHqzw=#{(yV>uQvt`l<Q4n!)k^&xd|Zkc+^-Ty|d;1;h&|
z9Os2qv{q(IC=-rib6ON7D3?b<pM^t(a0uQGU0n=)xEQ*X$o@?ZI;Qg}M2N6jURpz_
zC@)4LsbY4vz@u3~jI8r1w8l$B63L6{6v~Q1MwIw;N=A`$vvZNOSSY5_Xo&=gmD#Dh
zD8ybqBk-}kD2YX0LRntMc9bpfGB4>oqx0B-_yW<UP)Xvkb*)s$!YtaDVX!q$a-b6A
zu`MnNt8LbCd(ir7$GYrV7RO-<rN%R2Nq{pnwva4xYL!GJa5_;4qIQ(Bv%5iPqsW)N
zsbVpoZLcVjlSN_1kLj#{uw{);L0*zED`m2I9y1b|V@5Z@Y+g)38Ji)W770Wv$<7<=
zF_%zU5ZAF)MpDL*(5pPc*3PvoV~32$V&$aaXC}FM0b-X-Xj0<kqA18@Q;calJ$C4-
z9+Y(h3cD_45sz6|DijF{UeKe>9Knpt=QG%yZWll@ZxjHw6-5~(^$o(#4vzNBVU$Ex
zAmC-}OqV2ylugn=?d-howxLaj)`rX)K9YWeOZugY>5`P!*Vn<$=y@dl;=(M6CT(DM
zH<b8Aj!z?5KO*D9?e)Ut#g&gqX~-)A5=tvqc=<jOiz}pfR?jWW&8-mCSG=_H{>^Lh
z3fa+QC+KW(13L!h(gKOD{{_g$$N{c`zx>B`eUDG7Qx~-0eBB?_{L$)i)9c%|?|8oV
z)ZBG%MDs?f*Pe4nw-<M_`=hgs(b>KA`slniI$!6a8W*j`n<JyUUuz?$t2h2J1K&xF
zo80HlHn_8OF066keeOboyP(eBsB>|Ri&x_<ViX`=UaoqL@FS;M;1rvp+H{j`y18$&
z-(+{$x_eY}k8aY31jNa6k5X^mQr$_tC+@VFP5L=^V*6r^u5*(F#HRIygVP*iwRakh
zDb+F6<WB6wzK?ykw7s->r5QZ6o7aM8_u^V`Ve>i(d3>@3?5^Vm*<zdAvE9IStQK!@
zb1FCYVsg3}I^CRpYwwOW{a$l&X77wP`EJX`P6b+kkgesG8~7*oebWu!^q#x!o7a5v
zs&BsO3vPYT;(+h%RseW|yO$fDG1W8HJUO;y`<Enj1^1m}4d>Y2N6$F*^SkPJlJvUs
zp60x#8lBj%wtXhhU;<kkb!I|iCRApk$yoOpUxV>&-Bm;LbtbAYQI(1I#C0a1F#(kc
z814_Qw~c?ey`88z>;ACj5AXZWH~i;+`LynjY5rK9xuh|d)NX%83IxoUF`LP!<olBT
zIU|kh<fKmYzcQnaeg@K_&PNG(ZM|3!VJXjFl44}4e;LU)2x-w2MKwWCJ=mMTQ#GCe
S#!)q%mi0Wf)B=Zzk?cPa_<1@2
literal 0
HcmV?d00001
diff --git a/server/APIs/get_weather.py b/server/APIs/get_weather.py
index 14dc01cf..63618e2e 100644
--- a/server/APIs/get_weather.py
+++ b/server/APIs/get_weather.py
@@ -28,8 +28,8 @@ def get_weather(self):
url = f"https://api.met.no/weatherapi/locationforecast/2.0/compact?lat={lat}&lon={lng}"
response = requests.get(url)
- if response.status_code == 200: # Extract data from response
- data = response.json()
+ if response.status_code == 200:
+ data = response.json() # Extract data from response
timeseries = data['properties']['timeseries']
# Get data for current time and append to weather_data
@@ -56,5 +56,5 @@ def get_weather(self):
self.send_header("Content-type", "application/json")
self.end_headers()
- # Write weather_data to the response object
+ # Write weather_data to response object
self.wfile.write(json.dumps(weather_data).encode('utf-8'))
diff --git a/server/__pycache__/consts.cpython-311.pyc b/server/__pycache__/consts.cpython-311.pyc
index 16e0d17e682de899d1bf7d8e9de0db95305ac2f0..5c3188f8a9d95c5a2766585e72bbb8895f196618 100644
GIT binary patch
delta 20
acmcb`a*Ks~IWI340}!M=I=hkEp9ugw>;<&|
delta 20
acmcb`a*Ks~IWI340}w3pI=zwGp9ugv5(QfT
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index b2a4d214c3c57af1bcef1da38d922fc819c3f74d..cd584e3466e900302483a0aead05cbe7de1f39b0 100644
GIT binary patch
delta 726
zcma)2&ui3B5T2KpY?7B`chj!f#NFD|9~E6GVuk9V1%<|gB}D`k6lBX=3zjNua}lzj
z^rnXrMq0rN^`fG^ExoFzJ=v2NkNyMV7JBmJ%dSflL>zeE%r`UN%<$GnxBdKU%VHpG
z>c?(ltC-|(7S7248=ylhHJzAjC67uJI7v2Y$-13<o~lqU?eAGD7b{%OIF?Cpl(WrT
zOBDqpD+p$0j9a)yDkP8J$QXViKE5S~F)z92i&>9Q*nhC0j793;007Z9>;WdSljo&P
z8mo&W))omrfUD9Hq4-@oc7-lUsi0Yk3Ym~QuL!_9@%l!9ms^axE#sccy%vk?K?UHh
zK8RzTE87RLK_^ElvH2WcNPnM#JM=cK@)0b{E94M9k&kGjVg04JgQ2TNSW}+qr~HM9
zu)f@2IIT_M2hG4$?X2*Zda<X^r2fRk`~1QDo$K|e(exMm`OsgU=#ey^s{QF-V{j*T
zP3dp2)pGl|YLVYoh!oCgyC?s99K%%dUNhUCK1Xll#1E`I756`cu5^_sm9Ivz3y$u6
zF^AT|$6*&(wYUe&viDOEbO0_`!~G7u>h6JVdHX4Jd*HM`nwKSKb|xUuAuOoTj^PC3
dv@@;*H5@C<o@TcQIrFB}h1CBWn-|29KLLlKo)rK9
delta 518
zcmaJ-J!=$E6utL-%vW}15;K|IaW`fQ1zCg`Q;8%RG-IJGL4wT^Lf}b?fW<~^oB=x}
zO&l&5goThs1Bsw)p(t92Y?W5<4~XpqQd;<C*RY)j?s=SZFZUhpVg2Ql_r`S{(D?Z2
z=)o61^IE|T0k8u$BuwE3D|+oP+iPUIRpi;{+pdTTuaDHANsQ+cshpvyMmk1nYOgf(
zv~q_^c^#HoiIIrM(7s7OaE88P9Y^UGUZqPc5_)``uCa&(5xrw&Pfc`qVy<Iit)mL*
z3EMzHzuARZ@h@QT$Un^lpvtci;6T>^2&$4gDoRHlR@7O#&a2!wtkMdf#TsS2Ec;!0
z%UAiNI!C_PG^Yj|=sgQ*SD3QiTwYtIB{QI};!pRR<VcRWh<Ce7=0&6hJEB+C5j`{J
zySeT0mee0_?&#Y+g`C|(S<MY7jlH<FHTQh(XX(s#bE}zyT^l_H+Z{V8NXt_S!5tq=
zShdPASZ;JuP~NAYd*8jo!kEPpdeVufdCw2y2JbawJWU_`#miO;@yh=B9E$h<++NT*
F{{j=RbXfoZ
diff --git a/server/map/get_markers.py b/server/map/get_markers.py
index eb8c2bcd..b469a771 100644
--- a/server/map/get_markers.py
+++ b/server/map/get_markers.py
@@ -94,6 +94,6 @@ def get_all_markers(self, cursor, valid: bool):
self.send_header("Content-type", "application/json")
self.end_headers()
- # Write marker data to the response object
+ # Write marker data to response object
self.wfile.write(marker_data.encode('utf-8'))
diff --git a/server/sql_db/icedb b/server/sql_db/icedb
index 6385b70369576517bd28a34b786d3d3de44c6c49..e01a5712975ae037329fb433f502db93106da42e 100644
GIT binary patch
delta 169
zcmZoTz|?SnX@az%I0FL%7ZAe$_e33IM)8RWVjNsYx#js5@gLkQDB#Yu`6$<YW=6iv
zOZj9O8TltGa?4D<&#%rgpMn1Y|9<}YKs6Kj)#aF3899x`nT-sLOmq#5bPbIa42`S|
w41mZtE5A5Vo{5!_(O7))1$j|buz(yRD<@EZ38KMJ*T7K05TqKWVUa=u07f1q<^TWy
delta 170
zcmZoTz|?SnX@az%2m=EH7ZAe$=R_T2Mv;jLVjO&n_z!X&<(A(pDB#Yu`6$<YW=5{f
zOZj9O8M!Aba?4D<&#%t0j)DIv|4IIJn*|jX@CQjUvodlTGcX$&7@6oA80i`sD;OGC
u85jVO6cZ~WqcH;$6HLy)M8VJyA}7hn$_bK#NEzxH7%CWo^Z?N!g$4lOQz7vH
diff --git a/server/sql_db/schema.sql b/server/sql_db/schema.sql
index 9648d07c..3ac83ace 100644
--- a/server/sql_db/schema.sql
+++ b/server/sql_db/schema.sql
@@ -43,10 +43,10 @@ INSERT INTO Sensor (SensorID, SensorType, Active) VALUES
(2, 'Magnetic', 1),
(3, 'Other', 0);
-INSERT INTO Measurement (MeasurementID, SensorID, TimeMeasured) VALUES
-(1, 2, '2024-01-01 10:00:00'),
-(2, 2, '2024-02-04 11:00:00'),
-(3, 1, '2024-02-13 12:00:00');
+INSERT INTO Measurement (MeasurementID, SensorID, TimeMeasured, WaterBodyName) VALUES
+(1, 2, '2024-01-01 10:00:00', 'Mjosa'),
+(2, 2, '2024-02-04 11:00:00', 'Mjosa'),
+(3, 1, '2024-02-13 12:00:00', 'Mjosa');
-- Measurement 1
INSERT INTO Data (MeasurementID, Latitude, Longitude, IceTop, IceBottom, CalculatedThickness, Accuracy) VALUES
@@ -93,3 +93,4 @@ INSERT INTO Corner (CornerID, MeasurementID, CornerLatitude, CornerLongitude) VA
INSERT INTO BodyOfWater(Name) VALUES
('Mjosa');
+
--
GitLab