diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart index f2e258d2292a469f421ef10b77ed4504eca44f4a..c8455d93c8fd5b04138a1ff6f1389e128879972e 100644 --- a/app/lib/widgets/choropleth_map.dart +++ b/app/lib/widgets/choropleth_map.dart @@ -3,6 +3,8 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:syncfusion_flutter_maps/maps.dart'; +import 'package:latlong2/latlong.dart'; + import '../data_classes.dart'; /// A class containing thickness data for each subdivision of the map. @@ -38,6 +40,7 @@ class _ChoroplethMapState extends State<ChoroplethMap> { late MapShapeSource mapShapeSource; late final MapZoomPanBehavior _zoomPanBehavior = MapZoomPanBehavior(); List<SubDiv> subdivisions = <SubDiv>[]; + int count = 0; @override @@ -47,8 +50,25 @@ class _ChoroplethMapState extends State<ChoroplethMap> { for (Measurement measurement in widget.measurements) { for (SubDiv subdivision in measurement.subDivs) { subdivisions.add(subdivision); + print("SubDivID: ${subdivision.sub_div_id}"); + count++; } }; + + // NB temporary filler + for (var i = count; i < 250; i++) { + SubDiv subdivision = SubDiv( + sub_div_id: i.toString(), + groupID: 0, + minThickness: 0.0, + avgThickness: 0.0, + center: LatLng(0.0, 0.0), + accuracy: 0.0, + color: Colors.grey, + savedColor: Colors.grey, + ); + subdivisions.add(subdivision); + } } @override @@ -61,13 +81,12 @@ class _ChoroplethMapState extends State<ChoroplethMap> { source: MapShapeSource.memory( // Map polygon widget.relation, // JSON coordinates from server shapeDataField: 'sub_div_id', - dataCount: widget.measurements.length, + dataCount: 250, primaryValueMapper: (int index) => subdivisions[index].sub_div_id, shapeColorValueMapper: (int index) => subdivisions[index].color, ), - //color: Colors.blue.shade400, // Map color zoomPanBehavior: _zoomPanBehavior, - strokeColor: Colors.black, + strokeColor: Colors.blue.shade50, // Shape selection selectedIndex: selectedIndex, onSelectionChanged: (int index) { @@ -79,11 +98,6 @@ class _ChoroplethMapState extends State<ChoroplethMap> { }); widget.onSelectionChanged(selectedIndex); }, - selectionSettings: MapSelectionSettings( - color: Colors.orange, - strokeColor: Colors.red[900], - strokeWidth: 3, - ), ), ], ), diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart index e51ef19e656289a8f484ca7964b2f3289f1329e0..ae2a233ab50bf104f55763a9a62a8f687e03f1a8 100644 --- a/app/lib/widgets/main_layout.dart +++ b/app/lib/widgets/main_layout.dart @@ -152,7 +152,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> { '${lastUpdate?.hour}:${lastUpdate?.minute}' : '${lastUpdate?.day}-${lastUpdate?.month}-${lastUpdate?.year}') : ''}', style: GoogleFonts.dmSans( - fontSize: 13, + fontSize: 14, color: Colors.black, ), ), diff --git a/server/sql_db/icedb b/server/sql_db/icedb index 602683cee2f038cd7944555292871f26c31a5827..f72af9b3586a8d3546eeb065f92c8eba1b20ed47 100644 Binary files a/server/sql_db/icedb and b/server/sql_db/icedb differ