Update: 2026-06-26 17:29:23

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

@@ -28,6 +28,7 @@ class MapEngineController extends GetxController {
 
   Set<Marker> markers = {};
   Set<Polyline> polyLines = {};
+  int markerRevision = 0;
   List<LatLng> polylineCoordinates = [];
   Set<Polygon> polygons = {};
   Set<Circle> circles = {};

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

@@ -1935,7 +1935,7 @@ class RideLifecycleController extends GetxController {
       Get.back();
       await Future.delayed(const Duration(milliseconds: 120));
     } catch (e) {
-      mySnackeBarError(e.toString());
+      mySnackbarError(e.toString());
     }
   }
 
@@ -2734,7 +2734,7 @@ class RideLifecycleController extends GetxController {
         throw Exception('Failed to save trip');
       }
     } catch (e) {
-      mySnackeBarError('Failed to book trip: $e'.tr);
+      mySnackbarError('Failed to book trip: $e'.tr);
     }
   }
 
@@ -3494,20 +3494,13 @@ class RideLifecycleController extends GetxController {
       minutes = (durationToAdd.inMinutes % 60).round();
 
       if (polyLines.isNotEmpty) {
-        mapEngine.clearPolyline();
-        await Future<void>.delayed(Duration.zero);
+        mapEngine.polyLines.clear();
       }
 
       rideConfirm = false;
       isMarkersShown = true;
-      update();
 
-      await bottomSheet();
-
-      await mapEngine.playRouteAnimation(
-          mapEngine.polylineCoordinates, mapEngine.lastComputedBounds);
-
-      // بناء Set كاملة دفعة واحدة ثم تعيينها
+      // بناء الـ markers أولاً ثم وضعها معاً مع polylines في تحديث واحد
       final Set<Marker> newMarkers = {
         Marker(
           markerId: const MarkerId('start'),
@@ -3542,11 +3535,33 @@ class RideLifecycleController extends GetxController {
         }
       }
 
-      // تعيين الـ markers مباشرة في mapEngine (بدون setter لتجنب update() مضاعف)
       mapEngine.markers = newMarkers;
+      mapEngine.markerRevision++;
+
       Log.print(
           '✅ FIX P1 v2: ${newMarkers.length} markers placed — start: $startLoc, end: $endLoc');
-      mapEngine.update();
+
+      // إضافة الـ markers مباشرة عبر الـ controller لضمان ظهورها
+      try {
+        final ctrl = mapEngine.mapController;
+        if (ctrl != null) {
+          for (final m in newMarkers) {
+            await ctrl.addMarker(m);
+          }
+          Log.print('✅ Added ${newMarkers.length} markers via controller.addMarker()');
+        } else {
+          Log.print('⚠️ mapController is null, relying on declarative markers');
+        }
+      } catch (e) {
+        Log.print('⚠️ addMarker via controller failed: $e');
+      }
+
+      await bottomSheet();
+
+      await mapEngine.playRouteAnimation(
+          mapEngine.polylineCoordinates, mapEngine.lastComputedBounds);
+
+      update();
     } catch (e, stackTrace) {
       if (isDrawingRoute) {
         isDrawingRoute = false;