From 9831040240d1f0d2584b56badd85f961b399a273 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Wed, 14 Feb 2024 13:41:26 +0100
Subject: [PATCH] update: sql schema and insert statements
---
server/sql_db/icedb | Bin 24576 -> 0 bytes
server/sql_db/schema.sql | 43 ++++++++++++++++++++++++++++++++++++---
2 files changed, 40 insertions(+), 3 deletions(-)
delete mode 100644 server/sql_db/icedb
diff --git a/server/sql_db/icedb b/server/sql_db/icedb
deleted file mode 100644
index 1277a7f1b9e108dfa554214c9b166e9a1554acb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 24576
zcmeI)Pi)&%90zbe|B2(M?c-9?QU*`zsx(qNl5_|O4meGmE-X!GVu@`+E1qN8K$~od
zGcf@|EnGl|8wcQq5FjLwc3~X2fH?8z1QHUfIDkYE2ZY2Q^}vB=JMJ89kq{>s-={dS
zfA8m~_dfQ;zcy*CRa&mY9_@6uEtf3`w+Ms?I%9$$#Q7HETi7JNBZmk4lSKAM?Z$;;
z7oQ)e2ZAzoRhT%SA5E-`U7fgNR661ifB*y_009U<00Izz00jP#z^*Q<$;nCbob6iY
zww$8nTHdA<>PFr)n3-R$7|e^X`2^!_)v<d0uCwj5-ExtYtLB0qu2^o%?Kd4(s?_pf
ztkd4OE?Bl5vvWS0#v{ue*X?Xag9U5L?r&MH(=<0*_Tz1**Nb-NZM)yK>`T$ugZ1)i
zzJ8jWG)}Ymp=mC#N;nn1JD6!Yn0TpHH_9v38=RG9b)#g|jcUPYM3+50b~=$xDY4{z
zlSF8>o6Zxx3tRkAaoy^>9shXUvs=%4@3Ea@lA4^JCcF3e)(xlK>vV&6dB{764a9?k
z0NYqG>MXL*U=2ZrdFi~vOyiWv3MY)h$@xgMTxIjAN~>sfQwuD$YHhR~w`F_#HFwkL
zrqTn9yzRCwI&8UCs~GueBE3^0YI1g#>^A%fM^GcX;?UG19i#4;Q45IPPiAY|84T5A
zMSdrm<yGSbS1iOCx>!MQ08lRSOLVswOO|IxU82aG*RzoW?^)h^z8A*%Ceh0R{egbQ
zKhPim0SG_<0uX=z1Rwwb2tWV=5coF;Oi41)mZV%JcYHCETg)!8Z0_DnhQFponUEz>
z47)PNSvDJVO%Yk+T|rNFF_UFk?+pG*@HI*F7lHms|KJ~J5P$##AOHafKmY;|fB*y_
z009Wx1Okdgh$MOMq9{q47X1BxPoTfkeY$rOED%e800bZa0SG_<0uX=z1Rwwb2>j0k
zG)WecasPV|W1=h^(Za7sXoPoY{<kK)=YMr#U!dR959n)jgXZZtKSYB71Rwwb2tWV=
z5P$##AOHaf{1*j|s&S&Kgb-EIt7j{BJ^SPX`rPGDa-Tl*wkj(6;Aib}F)xef`B^7^
zeCx<Q&$^O4_1&~S_|3X7_3)gdN;tBpSJ$37_x^iN>vOMfYG1uP#YevXAkfOm;mBUr
zQ#0SJ-Nv)d{A}O(f`0qwUi(5PuXyd%!*gb&xaQAU)2nCtbEU+a`rL1iywm*nfDfD&
zy-wckbzb<k^=^T8HeUL5^|9+_IzuAkgsG+8&ewZ!N%8*wU!@NV^e6fy{gA#vU!*QS
zM1ueXAOHafKmY;|fB*y_009U<;BN{f6|d$Xg@uN&@St9c2c?DTS-;c}3*ur}J_ySR
r%C&e<Fc=gN<XaW5J`ffK!Xklm7!Jw-gYtkl>1As?+kf;As|J4oX5p9u
diff --git a/server/sql_db/schema.sql b/server/sql_db/schema.sql
index 347c091e..c70a9854 100644
--- a/server/sql_db/schema.sql
+++ b/server/sql_db/schema.sql
@@ -23,6 +23,15 @@ CREATE TABLE Data (
FOREIGN KEY (MeasurementID) REFERENCES Measurement(MeasurementID)
);
+CREATE TABLE Corner (
+ CornerID INT,
+ MeasurementID INT,
+ Latitude FLOAT,
+ Longitude FLOAT,
+ PRIMARY KEY (CornerID, MeasurementID),
+ FOREIGN KEY (MeasurementID) REFERENCES Measurement(MeasurementID)
+);
+
INSERT INTO Sensor (SensorID, SensorType, Active) VALUES
(1, 'LiDar', 1),
(2, 'Magnetic', 1),
@@ -35,16 +44,44 @@ INSERT INTO Measurement (MeasurementID, SensorID, TimeMeasured) VALUES
-- Measurement 1
INSERT INTO Data (MeasurementID, Latitude, Longitude, IceTop, IceBottom, CalculatedThickness, Accuracy) VALUES
-(1, 60.7066, 10.9771, 8.0, 3.0, 5.0, 1.0),
+(1, 60.7070, 10.9771, 8.0, 3.0, 5.0, 1.0),
(1, 60.7066, 10.9772, 7.5, 2.5, 5.0, 1.0),
+(1, 60.7067, 10.9773, 7.5, 2.5, 5.0, 1.0),
+(1, 60.7062, 10.9772, 7.5, 2.5, 5.0, 1.0),
(1, 60.7067, 10.9773, 7.0, 2.0, 5.0, 1.0);
+INSERT INTO Corner (CornerID, MeasurementID, Latitude, Longitude) VALUES
+(1, 1, 60.7060, 10.9770),
+(2, 1, 60.7061, 10.9771),
+(3, 1, 60.7062, 10.9772),
+(4, 1, 60.7063, 10.9773);
+
+
-- Measurement 2
INSERT INTO Data (MeasurementID, Latitude, Longitude, IceTop, IceBottom, CalculatedThickness, Accuracy) VALUES
(2, 60.6366, 10.8171, 7.2, 2.2, 5.0, 1.5),
-(2, 60.6367, 10.8172, 7.0, 2.0, 5.0, 1.5);
+(2, 60.6367, 10.8172, 7.0, 2.0, 5.0, 1.5),
+(2, 60.6368, 10.8172, 7.1, 2.1, 5.0, 1.5),
+(2, 60.6369, 10.8172, 7.3, 2.3, 5.0, 1.5),
+(2, 60.6367, 10.8173, 7.4, 2.4, 5.0, 1.5),
+(2, 60.6367, 10.8179, 7.5, 2.5, 5.0, 1.5);
+
+INSERT INTO Corner (CornerID, MeasurementID, Latitude, Longitude) VALUES
+(1, 2, 60.6360, 10.8170),
+(2, 2, 60.6361, 10.8171),
+(3, 2, 60.6362, 10.8172),
+(4, 2, 60.6363, 10.8173);
-- Measurement 3
INSERT INTO Data (MeasurementID, Latitude, Longitude, IceTop, IceBottom, CalculatedThickness, Accuracy) VALUES
(3, 60.7366, 10.8471, 7.5, 2.5, 5.0, 2.5),
-(3, 60.7367, 10.8472, 7.0, 2.0, 5.0, 2.5);
+(3, 60.7369, 10.8471, 7.4, 2.4, 5.0, 2.5),
+(3, 60.7367, 10.8480, 7.3, 2.3, 5.0, 2.5),
+(3, 60.7368, 10.8481, 7.2, 2.2, 5.0, 2.5),
+(3, 60.7370, 10.8475, 7.1, 2.1, 5.0, 2.5);
+
+INSERT INTO Corner (CornerID, MeasurementID, Latitude, Longitude) VALUES
+(1, 3, 60.7360, 10.8470),
+(2, 3, 60.7361, 10.8471),
+(3, 3, 60.7362, 10.8472),
+(4, 3, 60.7363, 10.8473);
--
GitLab