Merge pull request #272 from TaskarCenterAtUW/unit-testing-before-release1.0(37)

fixed duplicate annotations issue on answering multi quest anser

Author: srikanth-vg

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

@@ -2674,7 +2674,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = G8MQVE5WWW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GoInfoGame/Info.plist;
@@ -2712,7 +2712,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = G8MQVE5WWW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GoInfoGame/Info.plist;

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -78,20 +78,24 @@ struct CustomMap: UIViewRepresentable {
     // Updates the UIView with new data
     func updateUIView(_ mapView: MKMapView, context: Context) {
         //  mapView.setCenter(userLocation, animated: true)
-        if isMultiSelectModeEnabled,
-           selectedAnnotations.isEmpty {
-            Task { await manageAnnotations(mapView, context: context) }
-        }
-        context.coordinator.updateUserRegion(mapView)
-        context.coordinator.updateVisibleAnnotations(in: mapView)
-        if context.coordinator.previousAnnotations != items {
-            context.coordinator.previousAnnotations = items
-            Task {
-                await manageAnnotations(mapView, context: context)
+        Task {
+            
+            if context.coordinator.previosMultiSelectionMode != isMultiSelectModeEnabled {
+                context.coordinator.previosMultiSelectionMode = isMultiSelectModeEnabled
+                /*Task {*/ await manageAnnotations(mapView, context: context) /*}*/
+            }
+            context.coordinator.updateUserRegion(mapView)
+            context.coordinator.updateVisibleAnnotations(in: mapView)
+            if context.coordinator.previousAnnotations != items {
+                context.coordinator.previousAnnotations = items
+//                Task {
+                    await manageAnnotations(mapView, context: context)
+//                }
             }
         }
 
 
+        
         // Remove existing overlays
         mapView.overlays.forEach { mapView.removeOverlay($0) }
 
@@ -153,6 +157,7 @@ struct CustomMap: UIViewRepresentable {
         private var zoomReachedLimit: Bool = false
 
         var previousAnnotations: [DisplayUnitWithCoordinate] = []
+        var previosMultiSelectionMode: Bool = false
         private var annotations: [DisplayUnitAnnotation] = []
         private(set) var clusterManager: ClusterManager = ClusterManager<DisplayUnitAnnotation>(configuration: .init(maxZoomLevel: 17, minCountForClustering: 2, clusterPosition: .nearCenter))
 
@@ -529,9 +534,9 @@ struct CustomMap: UIViewRepresentable {
 
         await context.coordinator.clusterManager.removeAll()
         await context.coordinator.reloadMap()
-        let existingCoordinates = mapView.annotations.compactMap {
-             ($0 as? DisplayUnitAnnotation)?.coordinate
-         }
+//        let existingCoordinates = mapView.annotations.compactMap {
+//             ($0 as? DisplayUnitAnnotation)?.coordinate
+//         }
 
          // Check for modals or settings before changing map
          if isPresented  {

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -171,10 +171,10 @@ struct MapView: View {
                     onCancel: {
                         viewModel.selectedAnnotaions.removeAll()
                         viewModel.selectedAnnotationType = nil
-                        DispatchQueue.main.async {
-                            viewModel.isMultiSelectModeEnabled = false
-                            viewModel.selectedAnnotaions = Set<DisplayUnitAnnotation>()
-                        }
+//                        DispatchQueue.main.async {
+                        viewModel.isMultiSelectModeEnabled = false
+                        viewModel.selectedAnnotaions = Set<DisplayUnitAnnotation>()
+//                        }
                     },
                     onAnswerQuests: {
                         isPresented = true

GoInfoGame/GoInfoGame/UI/Map/MapViewModel.swift

@@ -72,10 +72,8 @@ class MapViewModel: ObservableObject {
                     }
                     self.selectedAnnotaions.removeAll()
                     self.selectedAnnotationType = nil
-                    DispatchQueue.main.async {
-                        self.isMultiSelectModeEnabled = false
-                        self.selectedAnnotaions = Set<DisplayUnitAnnotation>()
-                    }
+                    self.isMultiSelectModeEnabled = false
+                    self.selectedAnnotaions = Set<DisplayUnitAnnotation>()
                 }
             }
             return displayUnit