diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 9571276..33cf61a 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -1664,7 +1664,8 @@ class MapPassengerController extends GetxController { // } // Add new markers // Example: Add a marker for each item in a list - for (var item in carsLocationByPassenger) { + // for (var item in carsLocationByPassenger) { + for (var i = 0; dataCarsLocationByPassenger['message'].length; i++) { // if (previousLocationOfDrivers != null) { // angleDegrees = calculateAngleBetweenLocations( // previousLocationOfDrivers, currentLocationOfDrivers); @@ -1674,12 +1675,23 @@ class MapPassengerController extends GetxController { // print('currentLocationOfDrivers $currentLocationOfDrivers'); // } final marker = Marker( - infoWindow: InfoWindow(title: '${item.latitude} minutes'), - markerId: MarkerId(durationToPassenger.toString()), - position: LatLng(item.latitude, item.longitude), - rotation: item.headingList - // Other properties for the marker, such as icon, info window, etc. - ); + position: LatLng( + double.parse( + datadriverCarsLocationToPassengerAfterApplied['message'][i] + ['latitude']), + double.parse( + datadriverCarsLocationToPassengerAfterApplied['message'][i] + ['longitude'])), + icon: carIcon, + markerId: MarkerId( + datadriverCarsLocationToPassengerAfterApplied['message'][i] + ['longitude'] + .toString()), + rotation: double.parse( + datadriverCarsLocationToPassengerAfterApplied['message'][i] + ['heading']), + // Other properties for the marker, such as icon, info window, etc. + ); markers.add(marker); update(); } diff --git a/lib/views/home/Captin/driver_map_page.dart b/lib/views/home/Captin/driver_map_page.dart index 879a14a..b405c32 100644 --- a/lib/views/home/Captin/driver_map_page.dart +++ b/lib/views/home/Captin/driver_map_page.dart @@ -27,7 +27,7 @@ class PassengerLocationMapPage extends StatelessWidget { const PassengerInfoWindow(), driverEndRideBar(), const SosConnect(), - speedCircle(), + speedCircle(), const GoogleMapApp(), PricesWindow(), ], diff --git a/lib/views/home/map_widget.dart/left_main_menu_icons.dart b/lib/views/home/map_widget.dart/left_main_menu_icons.dart index 8e3a246..db33390 100644 --- a/lib/views/home/map_widget.dart/left_main_menu_icons.dart +++ b/lib/views/home/map_widget.dart/left_main_menu_icons.dart @@ -116,7 +116,7 @@ GetBuilder leftMainMenuIcons() { // .showNotification('Order', 'hi this is', 'tone1'); // Get.to(() => DriverCallPage()); // print(controller.carLocationsModels); - controller.getKazanPercent(); + // controller.getKazanPercent(); // PassengerCallPage( // channelName: '', // token: '',