From 334a7e11b4375c1004d227f236ad7cbd213a5251 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Wed, 14 Feb 2024 17:10:08 +0100
Subject: [PATCH] update: db, add BodyOfWater entity
---
app/lib/pages/marker_handler/marker_data.dart | 3 +++
server/sql_db/icedb | Bin 32768 -> 40960 bytes
server/sql_db/schema.sql | 11 ++++++++++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/app/lib/pages/marker_handler/marker_data.dart b/app/lib/pages/marker_handler/marker_data.dart
index 45ac9994..fe0d4060 100644
--- a/app/lib/pages/marker_handler/marker_data.dart
+++ b/app/lib/pages/marker_handler/marker_data.dart
@@ -4,6 +4,7 @@ class Measurement {
Sensor sensor;
List<Data> dataList;
List<Corner> cornerList;
+ String bodyOfWater;
Measurement({
required this.measurementID,
@@ -11,6 +12,7 @@ class Measurement {
required this.sensor,
required this.dataList,
required this.cornerList,
+ required this.bodyOfWater,
});
factory Measurement.Measurement(Map<String, dynamic> json) {
@@ -24,6 +26,7 @@ class Measurement {
cornerList: (json['Corner'] as List<dynamic>)
.map((data) => Corner.fromJson(data))
.toList(),
+ bodyOfWater: json['WaterBodyName'],
);
}
}
diff --git a/server/sql_db/icedb b/server/sql_db/icedb
index e9e55c8afd162410d4f26f2806f5bc5f6fa662ae..6385b70369576517bd28a34b786d3d3de44c6c49 100644
GIT binary patch
delta 949
zcmY+CZAep57{~9q+uZKmz2|JAUgxx3l!c1g+<KAd!=~Mt={B8W>Idh{MT%zTl<aN3
zpwXKohrUKh@6^CX>W4n`f>2)qNir-7i!w5bDA2w{=T4n=xcASw|KH*NJm=x|_R_tN
z=!-^u0!2|QdDj**l4CO^P<h>Fc(hD0>=ecS<Oca?+G?%_j-toxl-4xXSImZLxHusr
z1M~#_jje&g_NE@sfqnj9;K+t8Q{<H#RgzfcC@ho24M5CfMY7!fwt!eA)l`Y)-V&F?
zTPv1IwQSZlK29jf095m#rohq8j@IU2z~}D@wnx8xt1<C%EnohIP&RT`Tc%+9Q(3j#
z*gy!==v;iPr&uw38Wj}gL>q8=yi!TATP`bR{&zA<^h!?2E4hoL%8i|8$}w4_M=gGe
ziZo#geL~MsIHK2GLFopC3NSWGVYOJd=31<|`8F}%y3=AIPYSI9z((O|Q=-}cR1Dci
zzM0ZQ(?>LkE}%vvAw67#6L0`}ppjqTBYcQ2<pmP_gQKlFJmazfgf(s(fOr>C9v>#k
z;cG;-_%%@$a~>ODu$`y|2Z^fjEsq(`x_Lb3*-RT%*x*V9O1#~b4HVc<l*Z>>*}H*;
zQL6y}jNM&#>d%|>X}kHiv$JpZtwy1ee+?ZRqR?0L5<NuM(J<;p^~j0xP!jwLKf@Pr
z2#&+cq|bVoET{lUQrOL7i-Vgcy>@qfwK5rZ>9F1>7*LGf&xO@W1EFPG29EEA*g+^C
zqhk|7%?Fw8`EoODfx{hyYF8+2H;;Cio$L*}yCT#$9zMz9tAsM^^dK{HDVfmz+gLlV
z!P7n=q+X|W-}jr&5_-ZoSCJBzq>}GVE_-agIGjK(AB|SU?6#>_1w+Jcda}IZfih+{
z+#$x=X+_Mg9RB5MA$G^R=6gkSqMXghgXH8%5<fcG(FT#_$w&cOqR>)AFTO`3<uFkV
YXu;Le-szXey}~GFm2!+mAuv(;57$o!<^TWy
delta 680
zcmZoTz|_#dG(lRBkAZ=K1BhXOZK95`G#`UrStl?54+eJbH4J<|_z&{A^W5f><6gtF
zZnL0(5%=aWZXaf@MmI)wab;!3rr^nI__`;z^Yc!Q;a6qh(llk7tjH}h`98lo$3_PJ
zXZ)x6H*OYGSj?{=!OX(QY0PY7U}U0eV5DnktYBzlWnchAl1wa&jK-5M$cwT`FtTtm
z8gG6hFRLJbhJP7<5x*Tj7vD9$MSOXDR(x!{mw31GcJapZn(&GP9rK<?URr>IlbxNB
zk&)BEFRE14jcb{M>X)jA?(0O@nOHUXC#U#pG4f6B2a>##clm3{@gOO$`*~aGB2c+o
zapUzn9L%gn+><4JjTyNn`vOVM$&EmgWAauY$v*idkYt-2=qEDS&`+L`705DXWSQIw
zB$+4g1d>dX-}<RCGENruH`3q&2B!dD8w1}XzSDeL_~!Dp@xSE1$iI_+A%7=-A%7&l
zBi~PcO@2Y32jci9_r;6V3y86TJOOk{?$K)&Z9t!-9Qt9tl^-sgunH&u^B^BwIJob#
zZx&Fv@LuLxXI{84*grsFu>W|(Ss8(5GdrkmeBCOyBgnxoE{sKDaw#`leADC=alDdT
z2)-^~7>guOosWKVwHN2)b8+I59B|o<+r=Xufn+^iESG)GKKUO|mJK4y<e<6;5(R#N
z^-0^-)v`|3ix-z<LC9usUYRQ4;1}4max(Wr=E-sK;u1_^Aop>C^hUi)mhS?})=1w9
Jlv<Ra000T(wKo6&
diff --git a/server/sql_db/schema.sql b/server/sql_db/schema.sql
index d3a639c2..9648d07c 100644
--- a/server/sql_db/schema.sql
+++ b/server/sql_db/schema.sql
@@ -2,7 +2,9 @@ CREATE TABLE Measurement (
MeasurementID INT PRIMARY KEY,
SensorID INT,
TimeMeasured DATETIME,
- FOREIGN KEY (SensorID) REFERENCES Sensor(SensorID)
+ WaterBodyName TEXT,
+ FOREIGN KEY (SensorID) REFERENCES Sensor(SensorID),
+ FOREIGN KEY (WaterBodyName) REFERENCES BodyOfWater(Name)
);
CREATE TABLE Sensor (
@@ -32,6 +34,10 @@ CREATE TABLE Corner (
FOREIGN KEY (MeasurementID) REFERENCES Measurement(MeasurementID)
);
+CREATE TABLE BodyOfWater (
+ Name TEXT PRIMARY KEY
+);
+
INSERT INTO Sensor (SensorID, SensorType, Active) VALUES
(1, 'LiDar', 1),
(2, 'Magnetic', 1),
@@ -84,3 +90,6 @@ INSERT INTO Corner (CornerID, MeasurementID, CornerLatitude, CornerLongitude) VA
(2, 3, 60.7361, 10.8471),
(3, 3, 60.7362, 10.8472),
(4, 3, 60.7363, 10.8473);
+
+INSERT INTO BodyOfWater(Name) VALUES
+('Mjosa');
--
GitLab