diff --git a/app/lib/pages/marker_handler/marker_data.dart b/app/lib/pages/marker_handler/marker_data.dart index 45ac99943b1c0a9f02ac2f539353f969475b9d47..fe0d4060750cbceda42eac2f964a07d34482cec9 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 Binary files a/server/sql_db/icedb and b/server/sql_db/icedb differ diff --git a/server/sql_db/schema.sql b/server/sql_db/schema.sql index d3a639c27613d972e44532681637a83e2ee2140d..9648d07cd39eee9334b29ff719aba1ba7bc169ac 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');