fix

BenjaminCanape · Feb 12, 2024 · e206e97 · e206e97
1 parent 0388b6b
commit e206e97
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 24 deletions.
diff --git a/lib/presentation/common/location/widgets/current_location_map.dart b/lib/presentation/common/location/widgets/current_location_map.dart
@@ -78,6 +78,7 @@ class CurrentLocationMap extends HookConsumerWidget {
           child: LocationMap(
         points: points,
         markers: markers,
+        currentPosition: LatLng(currentLatitude, currentLongitude),
         mapController: provider.mapController ?? MapController(),
       ));
     }, loading: () {

diff --git a/lib/presentation/common/location/widgets/location_map.dart b/lib/presentation/common/location/widgets/location_map.dart
@@ -5,46 +5,55 @@ import 'package:latlong2/latlong.dart';
 
 import '../../core/utils/color_utils.dart';
 import '../../core/utils/map_utils.dart';
+import '../../core/utils/ui_utils.dart';
 
 /// Widget that displays a map with markers and polylines representing locations.
 class LocationMap extends HookConsumerWidget {
   final List<LatLng> points;
   final List<Marker> markers;
   final MapController? mapController;
+  final LatLng? currentPosition;
 
   const LocationMap(
       {super.key,
       required this.points,
       required this.markers,
-      required this.mapController});
+      required this.mapController,
+      this.currentPosition});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final center = MapUtils.getCenterOfMap(points);
     final zoomLevel = MapUtils.getZoomLevel(points, center);
 
-    return SizedBox(
-      height: 500,
-      child: FlutterMap(
-        key: ValueKey(MediaQuery.of(context).orientation),
-        mapController: mapController,
-        options: MapOptions(
-          initialCenter: points.isNotEmpty ? center : const LatLng(0, 0),
-          initialZoom: zoomLevel,
-        ),
-        children: [
-          TileLayer(
-            urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-          ),
-          PolylineLayer(
-            polylines: [
-              Polyline(
-                  points: points, strokeWidth: 4, color: ColorUtils.blueGrey),
-            ],
-          ),
-          MarkerLayer(markers: markers),
-        ],
-      ),
-    );
+    return points.isNotEmpty || currentPosition != null
+        ? SizedBox(
+            height: 500,
+            child: FlutterMap(
+              key: ValueKey(MediaQuery.of(context).orientation),
+              mapController: mapController,
+              options: MapOptions(
+                initialCenter: points.isNotEmpty
+                    ? center
+                    : currentPosition ?? const LatLng(0, 0),
+                initialZoom: zoomLevel,
+              ),
+              children: [
+                TileLayer(
+                  urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                ),
+                PolylineLayer(
+                  polylines: [
+                    Polyline(
+                        points: points,
+                        strokeWidth: 4,
+                        color: ColorUtils.blueGrey),
+                  ],
+                ),
+                MarkerLayer(markers: markers),
+              ],
+            ),
+          )
+        : Center(child: UIUtils.loader);
   }
 }