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

lib/views/home/navigation/navigation_controller.dart

@@ -268,9 +268,6 @@ class NavigationController extends GetxController
     },
   ];
 
-  static final String _routeApiBaseUrl =
-      "${AppLink.routesOsm}/route/v1/driving";
-
   IconData get currentManeuverIcon {
     switch (currentManeuverModifier) {
       case 4: // Arrive
@@ -378,7 +375,6 @@ class NavigationController extends GetxController
   void onMapCreated(IntaleqMapController controller) async {
     Log.print("DEBUG: NavigationController.onMapCreated called");
     mapController = controller;
-    await onStyleLoaded();
   }
 
   Future<void> onStyleLoaded() async {
@@ -577,7 +573,7 @@ class NavigationController extends GetxController
   }
 
   void _checkOffRoute(LatLng pos) {
-    if (_autoRecalcInProgress || isLoading) return;
+    if (!isNavigating || _autoRecalcInProgress || isLoading) return;
     if (_fullRouteCoordinates.isEmpty) return;
 
     const int searchWindow = 80;
@@ -604,7 +600,6 @@ class NavigationController extends GetxController
         if (elapsed >= _offRouteTriggerSeconds) {
           _offRouteStartTime = null;
           _autoRecalcInProgress = true;
-          // Smart reroute: check if we have alternative routes available
           _smartRecalculateRoute(pos);
         }
       }
@@ -613,40 +608,11 @@ class NavigationController extends GetxController
     }
   }
 
-  /// الحل الذكي: إذا كان هناك مسارات بديلة متاحة، اختر الأقرب.
-  /// وإلا فاطلب مسار جديد من الموقع الحالي إلى الوجهة.
+  /// Recalculate immediately from the latest GPS point to the destination.
   Future<void> _smartRecalculateRoute(LatLng currentPos) async {
     try {
-      // Check if we have alternative routes
-      if (routes.isNotEmpty && selectedRouteIndex < routes.length - 1) {
-        // Try using the next alternative route
-        final nextIndex = selectedRouteIndex + 1;
-        final nextRoute = routes[nextIndex];
-
-        // Calculate distance from current position to this alternative route's start
-        double minDist = double.infinity;
-        for (var coord in nextRoute.coordinates) {
-          final d = Geolocator.distanceBetween(
-            currentPos.latitude,
-            currentPos.longitude,
-            coord.latitude,
-            coord.longitude,
-          );
-          if (d < minDist) minDist = d;
-        }
-
-        // If this alternative is reasonable, switch to it
-        if (minDist < 100) {
-          selectRoute(nextIndex);
-          Log.print("DEBUG: Switched to alternative route due to deviation");
-          _autoRecalcInProgress = false;
-          return;
-        }
-      }
-
-      // No good alternative, recalculate from current position to destination
       if (_finalDestination != null) {
-        await recalculateRoute();
+        await recalculateRoute(origin: currentPos, keepNavigationActive: true);
       }
       _autoRecalcInProgress = false;
     } catch (e) {
@@ -906,7 +872,8 @@ class NavigationController extends GetxController
     return const LatLng(31.7225, 35.9933); // Queen Alia Airport (JO)
   }
 
-  Future<void> getRoute(LatLng origin, LatLng destination) async {
+  Future<void> getRoute(LatLng origin, LatLng destination,
+      {bool keepNavigationActive = false}) async {
     isLoading = true;
     update();
 
@@ -1007,9 +974,8 @@ class NavigationController extends GetxController
       currentStepIndex = 0;
       _nextInstructionSpoken = false;
 
-      // Don't start navigating immediately, wait for user to press Start
-      isNavigating = false;
-      _cameraLockedToUser = false;
+      isNavigating = keepNavigationActive;
+      _cameraLockedToUser = keepNavigationActive;
       _offRouteStartTime = null;
       isLoading = false;
 
@@ -1032,7 +998,10 @@ class NavigationController extends GetxController
       // Re-add car marker after polyline updates (ensures it stays on top)
       if (isStyleLoaded) _updateCarMarker();
 
-      if (_fullRouteCoordinates.length >= 2) {
+      if (keepNavigationActive && myLocation != null) {
+        animateCameraToPosition(myLocation!,
+            bearing: _smoothedHeading, zoom: _targetZoom, tilt: _targetTilt);
+      } else if (_fullRouteCoordinates.length >= 2) {
         final bounds =
             data['bbox'] != null && (data['bbox'] as List).length == 4
                 ? LatLngBounds(
@@ -1117,12 +1086,23 @@ class NavigationController extends GetxController
     }
   }
 
-  Future<void> recalculateRoute() async {
-    if (myLocation == null || _finalDestination == null || isLoading) return;
+  Future<void> recalculateRoute(
+      {LatLng? origin, bool keepNavigationActive = false}) async {
+    final LatLng? routeOrigin = origin ?? myLocation;
+    if (routeOrigin == null || _finalDestination == null || isLoading) return;
+
     isLoading = true;
     update();
-    mySnackbarInfo('جاري حساب مسار جديد...');
-    await getRoute(myLocation!, _finalDestination!);
+
+    markers = markers.where((m) => m.markerId.value != 'origin').toSet();
+    markers.add(Marker(
+      markerId: const MarkerId('origin'),
+      position: routeOrigin,
+      icon: InlqBitmap.fromStyleImage('start_icon'),
+    ));
+
+    await getRoute(routeOrigin, _finalDestination!,
+        keepNavigationActive: keepNavigationActive);
     isLoading = false;
     update();
   }
@@ -1290,17 +1270,19 @@ class NavigationController extends GetxController
     try {
       // ✅ Use searchPlaces from intaleq_maps SDK
       final results = await mapController!.searchPlaces(q);
-      
+
       if (myLocation != null) {
         for (final p in results) {
           final plat = double.tryParse(p['latitude']?.toString() ?? '0') ?? 0.0;
-          final plng = double.tryParse(p['longitude']?.toString() ?? '0') ?? 0.0;
-          p['distanceKm'] = _haversineKm(myLocation!.latitude, myLocation!.longitude, plat, plng);
+          final plng =
+              double.tryParse(p['longitude']?.toString() ?? '0') ?? 0.0;
+          p['distanceKm'] = _haversineKm(
+              myLocation!.latitude, myLocation!.longitude, plat, plng);
         }
         results.sort((a, b) =>
             (a['distanceKm'] as double).compareTo(b['distanceKm'] as double));
       }
-      
+
       placesDestination = results;
       update();
     } catch (e) {

lib/views/home/navigation/navigation_view.dart

@@ -41,6 +41,7 @@ class NavigationView extends StatelessWidget {
               IntaleqMap(
                 apiKey: Env.mapSaasKey,
                 onMapCreated: c.onMapCreated,
+                onStyleLoaded: c.onStyleLoaded,
                 onLongPress: (pos) => c.onMapLongPressed(Point(0, 0), pos),
                 onTap: (pos) => c.onMapTapped(Point(0, 0), pos),
                 markers: c.markers,