new changes maps

lib/views/Dashboard/deliveries/map.dart

@@ -16,24 +16,18 @@ class _DeliveryMapScreen extends StatefulWidget {
 }
 
 class _DeliveryMapScreenState extends State<_DeliveryMapScreen> {
-  GoogleMapController? _mapController;
+  NearleMapController? _mapController;
   late final LatLng _pickupLocation;
   late final LatLng _dropLocation;
-  final Set<Marker> _markers = {};
-  final Set<Polyline> _polylines = {};
-  late final PolylinePoints _polylinePoints;
-  bool _isLoadingRoute = true;
+  List<NearleMapMarker> _markers = const [];
+  List<NearleMapPolyline> _polylines = const [];
   bool _isNavigating = false; // Prevent multiple clicks
 
-  static const String _googleApiKey = 'AIzaSyBhkGfnq27sN0wV5y_S-M2KojpFTk_by-Q';
-
   @override
   void initState() {
     super.initState();
-    _polylinePoints = PolylinePoints(apiKey: _googleApiKey);
     _resolveLocationsFromDelivery();
     _setMarkers();
-    _isLoadingRoute = false;
     _createRealRoute();
   }
 
@@ -73,113 +67,70 @@ class _DeliveryMapScreenState extends State<_DeliveryMapScreen> {
     _dropLocation = drop;
   }
 
-  void _setMarkers() {
-    _markers.addAll([
-      Marker(
-        markerId: const MarkerId('pickup'),
-        position: _pickupLocation,
-        infoWindow: const InfoWindow(title: 'Pickup Location'),
-        icon: BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueRed),
-      ),
-      Marker(
-        markerId: const MarkerId('drop'),
-        position: _dropLocation,
-        infoWindow: const InfoWindow(title: 'Drop Location'),
-        icon: BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueGreen),
-      ),
-    ]);
+  Future<void> _setMarkers() async {
+    final pickupIcon = await MapMarkerIcons.pin(Colors.red);
+    final dropIcon = await MapMarkerIcons.pin(Colors.green);
+    if (!mounted) return;
+    setState(() {
+      _markers = [
+        NearleMapMarker(
+          id: 'pickup',
+          position: _pickupLocation,
+          icon: pickupIcon,
+        ),
+        NearleMapMarker(id: 'drop', position: _dropLocation, icon: dropIcon),
+      ];
+    });
   }
 
   Future<void> _createRealRoute() async {
-    try {
-      final request = PolylineRequest(
-        origin: PointLatLng(
-          _pickupLocation.latitude,
-          _pickupLocation.longitude,
-        ),
-        destination: PointLatLng(
-          _dropLocation.latitude,
-          _dropLocation.longitude,
-        ),
-        mode: TravelMode.driving,
-      );
+    final route = await RoutingService.getRoute(
+      origin: _pickupLocation,
+      destination: _dropLocation,
+    );
 
-      final result = await _polylinePoints.getRouteBetweenCoordinates(
-        request: request,
-      );
-
-      if (result.points.isNotEmpty) {
-        final routePoints = result.points
-            .map((e) => LatLng(e.latitude, e.longitude))
-            .toList();
-
-        if (mounted) {
-          setState(() {
-            _polylines.add(
-              Polyline(
-                polylineId: const PolylineId('real_route'),
-                color: ColorConstants.primaryColor,
-                width: 6,
-                points: routePoints,
-              ),
-            );
-            _isLoadingRoute = false;
-          });
-
-          _fitMapToRoute();
-        }
-      } else {
-        debugPrint('[MAP_PREVIEW] No route found');
-        if (mounted) {
-          setState(() => _isLoadingRoute = false);
-        }
-      }
-    } catch (e) {
-      debugPrint('[MAP_PREVIEW] Error creating route: $e');
-      if (mounted) {
-        setState(() => _isLoadingRoute = false);
-      }
-    }
-  }
-Future<void> _fitMapToRoute() async {
-  if (!mounted) return;
-  if (_mapController == null) return;
-
-  // Check if controller is still alive (important!)
-  try {
-    await _mapController!.getVisibleRegion();
-  } catch (e) {
-    debugPrint("❌ Map controller is dead. Skip animateCamera.");
-    return;
-  }
-
-  final bounds = LatLngBounds(
-    southwest: LatLng(
-      math.min(_pickupLocation.latitude, _dropLocation.latitude),
-      math.min(_pickupLocation.longitude, _dropLocation.longitude),
-    ),
-    northeast: LatLng(
-      math.max(_pickupLocation.latitude, _dropLocation.latitude),
-      math.max(_pickupLocation.longitude, _dropLocation.longitude),
-    ),
-  );
-
-  // Try animate safely
-  for (int i = 0; i < 10; i++) {
     if (!mounted) return;
 
-    try {
-      await _mapController!.animateCamera(
-        CameraUpdate.newLatLngBounds(bounds, 80),
-      );
-      return;
-    } catch (e) {
-      await Future.delayed(const Duration(milliseconds: 150));
-    }
+    // Fall back to a straight line so the screen still shows the connection
+    // when routing is unavailable.
+    final points = (route != null && route.points.isNotEmpty)
+        ? route.points
+        : <LatLng>[_pickupLocation, _dropLocation];
+
+    if (route == null) debugPrint('[MAP_PREVIEW] No route found');
+
+    setState(() {
+      _polylines = [
+        NearleMapPolyline(
+          id: 'real_route',
+          points: points,
+          color: ColorConstants.primaryColor,
+          width: 6,
+        ),
+      ];
+    });
+
+    _fitMapToRoute();
   }
 
-  debugPrint("❌ animateCamera failed after retries (map probably disposed)");
-}
+  Future<void> _fitMapToRoute() async {
+    final controller = _mapController;
+    if (!mounted || controller == null) return;
+
+    await controller.fitBounds(
+      LatLngBounds(
+        southwest: LatLng(
+          math.min(_pickupLocation.latitude, _dropLocation.latitude),
+          math.min(_pickupLocation.longitude, _dropLocation.longitude),
+        ),
+        northeast: LatLng(
+          math.max(_pickupLocation.latitude, _dropLocation.latitude),
+          math.max(_pickupLocation.longitude, _dropLocation.longitude),
+        ),
+      ),
+      padding: 80,
+    );
+  }
 
 
 
@@ -188,27 +139,20 @@ Future<void> _fitMapToRoute() async {
     return Scaffold(
       body: Stack(
         children: [
-         SizedBox.expand(
-  child: GoogleMap(
-    initialCameraPosition: CameraPosition(
-      target: _pickupLocation,
-      zoom: 14.5,
-    ),
-    onMapCreated: (controller) {
-      _mapController = controller;
-
-      Future.delayed(const Duration(milliseconds: 500), () {
-        if (!_isLoadingRoute && _polylines.isNotEmpty) {
-          _fitMapToRoute();
-        }
-      });
-    },
-    markers: _markers,
-    polylines: _polylines,
-    zoomControlsEnabled: false,
-    myLocationButtonEnabled: false,
-  ),
-),
+          SizedBox.expand(
+            child: NearleMap(
+              initialCameraPosition: CameraPosition(
+                target: _pickupLocation,
+                zoom: 14.5,
+              ),
+              markers: _markers,
+              polylines: _polylines,
+              onMapReady: (controller) {
+                _mapController = controller;
+                _fitMapToRoute();
+              },
+            ),
+          ),
           Positioned(
             top: 50,
             left: 16,