update: IceStats to list in SubDiv

app/lib/consts.dart

@@ -13,6 +13,7 @@ const String mapEndpoint = "update_map";
 String selectedLake = 'Mjøsa'; // Init to Mjøsa, NB should be initialised to last selected lake
 Uint8List selectedRelation = Uint8List(0);
 List<Measurement> selectedMarkerList = [];
+Measurement? selectedTile;
 
 LatLng mapCenter = LatLng(60.8000, 10.8471);
 DateTime ?lastUpdate; // Last time data was fetched from server

app/lib/data_classes.dart

@@ -9,7 +9,7 @@ class Measurement {
   String bodyOfWater;
   LatLng center;
   List <SubDiv> subDivs;
-  IceStats iceStats;
+  List<IceStats> iceStats;
 
   Measurement({
     required this.measurementID,
@@ -29,7 +29,9 @@ class Measurement {
         bodyOfWater: json['BodyOfWater'] ?? 'nil',
         center: LatLng(json['CenterLat'], json['CenterLon']),
         subDivs: (json['Subdivisions'] as List<dynamic>).map((data) => SubDiv.fromJson(data)).toList(),
-      iceStats: IceStats.fromJson(json['IceStats']),
+        iceStats: (json['IceStats'] as List<dynamic>?)
+            ?.map((data) => IceStats.fromJson(data))
+            .toList() ?? [],
     );
   }
 }

app/lib/widgets/bar_graph/bar_data.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
+import '../../consts.dart';
+
 class BarData extends StatefulWidget {
   const BarData({super.key});
 

app/lib/widgets/main_layout.dart

@@ -32,7 +32,6 @@ class MapContainerWidget extends StatefulWidget {
 
 class _MapContainerWidgetState extends State<MapContainerWidget> {
 
-  Measurement? selectedTile;  // Containing data for selected marker
   bool isMinimized = true;      // Quick view box state tacker
 
   bool satLayer = false;        // Satellite layer visibility tracker

server/map_handler/get_measurements.py

@@ -41,7 +41,8 @@ def get_all_markers(self, cursor, waterBodyName):
                 'CenLatitude': row[12],
                 'CenLongitude': row[13],
                 'Accuracy': row[14],
-                'Color': calculateColor(row[11])  # NB color calculated based on average thickness, should be minimum
+                'Color': calculateColor(row[11]),  # NB color calculated based on average thickness, should be minimum
+                'IceStats': ()  # NB temp empty, add ice stats later
             }
 
             # Check if measurement ID already exists in measurement_data
@@ -85,7 +86,8 @@ def get_all_markers(self, cursor, waterBodyName):
                     'CenLatitude': 7.0,
                     'CenLongitude': 8.0,
                     'Accuracy': 1.0,
-                    'Color': calculateColor(avg_thickness)
+                    'Color': calculateColor(avg_thickness),
+                    'IceStats': ()
                 }
 
                 sub_divisions.append(subdivision)