diff --git a/app/lib/consts.dart b/app/lib/consts.dart index 61d14d37abbb745ee1aa7bbff855b201c565001e..041ea98b141259f609c01c99537bd6976563622f 100644 --- a/app/lib/consts.dart +++ b/app/lib/consts.dart @@ -9,7 +9,7 @@ const String mapEndpoint = "update_map"; const int fetchInterval = 60; // Fetch marker data every n minutes // Map variables -LatLng mapCenter = LatLng(60.7666, 10.8471); +LatLng mapCenter = LatLng(60.8000, 10.8471); DateTime ?lastUpdate; // Last time data was fetched from server // Font variables diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart index c56a7b2c39c1ea235ed230efb904f117887d8563..ccebce49dafcbc5a51c26c0a963f3d6d325ae8a7 100644 --- a/app/lib/widgets/main_layout.dart +++ b/app/lib/widgets/main_layout.dart @@ -5,6 +5,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'satellite_layer.dart'; +import 'osm_layer.dart'; import 'stat_charts.dart'; import '../../consts.dart'; import 'choropleth_map.dart'; @@ -97,7 +98,22 @@ class _MapContainerWidgetState extends State<MapContainerWidget> { color: Colors.white12, ), ), - SizedBox( // Lake map + SizedBox( + width: screenWidth * boxWidth, + height: screenWidth * boxHeight, + child: Stack( + children: [ + OSM(markerList: widget.markerList), // OSM widget as the bottom layer + Positioned.fill( + child: Container( + color: Colors.grey.shade900.withOpacity(0.35), // Grey box with 50% opacity + // Additional content or widgets can be added here + ), + ), + ], + ), + ), + SizedBox( // Color coded lake polygon width: screenWidth * boxWidth, height: screenWidth * boxHeight, child: Padding(