Update: 2026-07-06 01:28:23

siro_rider/lib/controller/home/map/ride_lifecycle_controller.dart

@@ -2198,32 +2198,24 @@ class RideLifecycleController extends GetxController {
   Future<void> calculateDriverToPassengerRoute(
       LatLng driverPos, LatLng passengerPos,
       {bool isBeginPhase = false}) async {
-    final Map<String, String> queryParams = {
-      'fromLat': driverPos.latitude.toString(),
-      'fromLng': driverPos.longitude.toString(),
-      'toLat': passengerPos.latitude.toString(),
-      'toLng': passengerPos.longitude.toString(),
-    };
-    final uri =
-        Uri.parse(AppLink.mapSaasRoute).replace(queryParameters: queryParams);
+    
+    if (mapController == null) {
+      Log.print('⚠️ mapController is null, cannot calculate route via intaleq_maps');
+      return;
+    }
 
-    Log.print('📍 Calculating Driver Route: $uri');
+    Log.print('📍 Calculating Driver Route via IntaleqMapController...');
 
     try {
-      final response = await http.get(uri, headers: {
-        'x-api-key': Env.mapSaasKey,
-      }).timeout(const Duration(seconds: 20));
+      final responseData = await mapController!.getDirections(driverPos, passengerPos);
 
-      if (response.statusCode == 200) {
-        final responseData = json.decode(response.body);
+      var routeData = responseData['routes'] != null
+          ? responseData['routes'][0]
+          : responseData;
 
-        var routeData = responseData['routes'] != null
-            ? responseData['routes'][0]
-            : responseData;
-
-        double durationSecondsRaw = (routeData['duration'] as num).toDouble();
-        int finalDurationSeconds =
-            (durationSecondsRaw * kDurationScalar).toInt();
+      double durationSecondsRaw = (routeData['trafficAwareDuration'] ?? routeData['duration'] as num).toDouble();
+      int finalDurationSeconds =
+          (durationSecondsRaw * kDurationScalar).toInt();
         double distanceMeters = (routeData['distance'] as num).toDouble();
 
         updateDriverRouteMetrics(
@@ -2299,7 +2291,6 @@ class RideLifecycleController extends GetxController {
         mapEngine.fitCameraToPoints(driverPos, passengerPos);
         _updatePassengerWalkLine();
         update();
-      }
     } catch (e) {
       Log.print('❌ Error calculating driver route: $e');
     }