Fixes & Updates - 2026-06-01: Integrate Back-End v3 updates, fix call/connection issues across apps

lib/controller/home/captin/order_request_controller.dart

@@ -219,14 +219,36 @@ class OrderRequestController extends GetxController
   // ----------------------------------------------------------------------
 
   Future<void> _calculateFullJourney() async {
-    if (mapController == null) return; // Wait for controller to draw
+    // Don't block on mapController being null - we'll draw routes
+    // and markers first, then zoom when controller is ready
+    bool canZoom = mapController != null;
 
     try {
-      Position driverPos = await Geolocator.getCurrentPosition(
-          desiredAccuracy: LocationAccuracy.high);
-      LatLng driverLatLng = LatLng(driverPos.latitude, driverPos.longitude);
+      // Reuse stored location from LocationController instead of
+      // making a duplicate GPS hardware call (already fetched in
+      // _initialMapSetup).
+      LatLng driverLatLng;
+      double driverHeading = 0.0;
+      if (Get.isRegistered<LocationController>()) {
+        final locCtrl = Get.find<LocationController>();
+        if (locCtrl.myLocation.latitude != 0 ||
+            locCtrl.myLocation.longitude != 0) {
+          driverLatLng = locCtrl.myLocation;
+          driverHeading = locCtrl.heading;
+        } else {
+          Position driverPos = await Geolocator.getCurrentPosition(
+              desiredAccuracy: LocationAccuracy.high);
+          driverLatLng = LatLng(driverPos.latitude, driverPos.longitude);
+          driverHeading = driverPos.heading;
+        }
+      } else {
+        Position driverPos = await Geolocator.getCurrentPosition(
+            desiredAccuracy: LocationAccuracy.high);
+        driverLatLng = LatLng(driverPos.latitude, driverPos.longitude);
+        driverHeading = driverPos.heading;
+      }
 
-      updateDriverLocation(driverLatLng, driverPos.heading);
+      updateDriverLocation(driverLatLng, driverHeading);
 
       // Clear old polylines to avoid "ghost lines"
       polylines.clear();
@@ -240,9 +262,9 @@ class OrderRequestController extends GetxController
       var tripFuture = _fetchRouteData(
           start: LatLng(latPassenger, lngPassenger),
           end: LatLng(latDestination, lngDestination),
-          color: Colors.green,
+          color: Colors.black,
           id: 'trip_route',
-          isDashed: true);
+          getSteps: true); // 🔥 نطلب الخطوات للمسار
 
       var results = await Future.wait([pickupFuture, tripFuture]);
 
@@ -259,6 +281,11 @@ class OrderRequestController extends GetxController
         totalTripDistance = tripResult['distance_text'];
         totalTripDuration = tripResult['duration_text'];
         polylines.add(tripResult['polyline']);
+        
+        // 🔥 تخزين استجابة السيرفر كاملة (بما فيها الـ points والـ instructions)
+        if (tripResult['raw_response'] != null) {
+          box.write('cached_trip_route', tripResult['raw_response']);
+        }
       }
 
       await _updateMarkers(
@@ -267,8 +294,10 @@ class OrderRequestController extends GetxController
           destTime: totalTripDuration,
           destDist: totalTripDistance);
 
-      // Now zoom to fit all polylines and markers
-      zoomToFitRide();
+      // Now zoom to fit all polylines and markers (if controller available)
+      if (canZoom) {
+        zoomToFitRide();
+      }
 
       update();
     } catch (e) {
@@ -297,18 +326,19 @@ class OrderRequestController extends GetxController
       required LatLng end,
       required Color color,
       required String id,
-      bool isDashed = false}) async {
+      bool getSteps = false}) async {
     try {
       if (start.latitude == 0 || end.latitude == 0) return null;
-      if (mapController == null) return null;
+      // Don't block on mapController — route data fetch is independent
 
       final saasUrl = Uri.parse(AppLink.mapSaasRoute).replace(queryParameters: {
         'fromLat': start.latitude.toString(),
         'fromLng': start.longitude.toString(),
         'toLat': end.latitude.toString(),
         'toLng': end.longitude.toString(),
-        'steps': 'false',
+        'steps': getSteps ? 'true' : 'false',
         'alternatives': 'false',
+        'locale': 'ar',
       });
 
       final response = await http.get(saasUrl, headers: {
@@ -347,7 +377,9 @@ class OrderRequestController extends GetxController
         return {
           'distance_text': distanceText,
           'duration_text': durationText,
-          'polyline': polyline
+          'polyline': polyline,
+          'encoded_polyline': encodedPoints,
+          'raw_response': response.body, // 🔥 نمرر الـ JSON كاملاً
         };
       }
     } catch (e) {