Updated Location manager handling and removed unnessary thread switchings.

Author: srikanth-vg

GoInfoGame/GoInfoGame/Kartaview/ViewModel/KartaviewViewModel.swift

@@ -24,11 +24,6 @@ class KartaviewViewModel: ObservableObject {
     init(capturedImage: UIImage) {
         self.capturedImage = capturedImage
 
-        locationManagerDelegate.locationManager.delegate = locationManagerDelegate
-        locationManagerDelegate.locationManager.requestWhenInUseAuthorization()
-        locationManagerDelegate.locationManager.startUpdatingLocation()
-        locationManagerDelegate.locationManager.startUpdatingHeading()
-        
         locationManagerDelegate.locationUpdateHandler = { [weak self] location in
             guard let self = self else { return }
             self.location = location
@@ -37,8 +32,12 @@ class KartaviewViewModel: ObservableObject {
         locationManagerDelegate.headingUpdateHandler = { [weak self] heading in
             guard let self = self else { return }
             self.heading = "\(heading)"
-            locationManagerDelegate.locationManager.stopUpdatingHeading()
+            locationManagerDelegate.stopUpdatingHeading()
         }
+        
+        locationManagerDelegate.requestLocationAuthorization()
+        locationManagerDelegate.startUpdatingLocation()
+        locationManagerDelegate.startUpdatingHeading()
     }
 
     // Step 1: Create Sequence

GoInfoGame/GoInfoGame/LocationManagerDelegate.swift

@@ -9,10 +9,8 @@ import CoreLocation
 import Foundation
 
 class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDelegate {
-    var locationManager = CLLocationManager()
+    private var locationManager = CLLocationManager()
     @Published var location: CLLocation?
-    @Published var isLocationDenied: Bool = false
-    @Published var isLocationServicesOff: Bool = false
     var locationUpdateHandler: ((CLLocationCoordinate2D) -> Void)?
     var headingUpdateHandler: ((Double) -> Void)?
 
@@ -23,91 +21,58 @@ class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDele
     override init() {
         super.init()
         locationManager.delegate = self
-        checkInitialLocationStatus()
     }
 
     func requestLocationAuthorization() {
-        DispatchQueue.main.async {
-            self.locationManager.requestWhenInUseAuthorization()
-        }
+        self.locationManager.requestWhenInUseAuthorization()
     }
 
     func startUpdatingLocation() {
-        // Perform location services check on a background thread
-        DispatchQueue.global(qos: .background).async {
-            let locationServicesEnabled = CLLocationManager.locationServicesEnabled()
-            DispatchQueue.main.async {
-                if !locationServicesEnabled {
-                    self.isLocationServicesOff = true
-                    return
-                }
-                
-                self.locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
-                self.locationManager.distanceFilter = 150
-                self.locationManager.startUpdatingLocation()
-                self.isLocationServicesOff = false
-            }
-        }
+        self.locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
+        self.locationManager.distanceFilter = 150
+        self.locationManager.startUpdatingLocation()
+    }
+    
+    func startUpdatingHeading() {
+        locationManager.startUpdatingHeading()
+    }
+    
+    func stopUpdatingHeading() {
+        locationManager.stopUpdatingHeading()
     }
 
 
     func stopUpdatingLocation() {
-        DispatchQueue.main.async {
-            self.locationManager.stopUpdatingLocation()
-        }
+        self.locationManager.stopUpdatingLocation()
     }
 
     func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
         // Check the authorization status and location services in background
-        DispatchQueue.global(qos: .background).async {
-            let isLocationServicesEnabled = CLLocationManager.locationServicesEnabled()
-            let authorizationStatus = manager.authorizationStatus
-            
-            DispatchQueue.main.async {
-                switch authorizationStatus {
-                case .authorizedWhenInUse, .authorizedAlways:
-                    self.isLocationDenied = false
-                    self.isLocationServicesOff = !isLocationServicesEnabled
-                    self.startUpdatingLocation()
-                case .denied, .restricted:
-                    self.isLocationDenied = true
-                    self.isLocationServicesOff = false
-                    self.stopUpdatingLocation()
-                default:
-                    self.isLocationDenied = false
-                    self.isLocationServicesOff = !isLocationServicesEnabled
-                    self.requestLocationAuthorization()
-                }
-            }
+        let authorizationStatus = manager.authorizationStatus
+        
+        switch authorizationStatus {
+        case .authorizedWhenInUse, .authorizedAlways:
+            self.startUpdatingLocation()
+        case .denied, .restricted:
+            self.stopUpdatingLocation()
+        default:
+            self.requestLocationAuthorization()
         }
     }
 
 
     func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        print("didUpdateLocations \(locations.count), \(String(describing: locations.last)), \(String(describing: locationUpdateHandler)) \(Thread.current)")
         guard let mostRecentLocation = locations.last else { return }
-        DispatchQueue.main.async {
-            self.location = mostRecentLocation
-            self.locationUpdateHandler?(mostRecentLocation.coordinate)
-        }
+        self.location = mostRecentLocation
+        self.locationUpdateHandler?(mostRecentLocation.coordinate)
     }
 
     func locationManager(_ manager: CLLocationManager, didUpdateHeading newHeading: CLHeading) {
-        DispatchQueue.main.async {
-            self.headingUpdateHandler?(newHeading.trueHeading)
-        }
+        self.headingUpdateHandler?(newHeading.trueHeading)
     }
 
     func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
         print("Error with location manager is ----\(error.localizedDescription)")
     }
-    
-    private func checkInitialLocationStatus() {
-        // Perform initial status check asynchronously
-        DispatchQueue.global(qos: .background).async {
-            let servicesEnabled = CLLocationManager.locationServicesEnabled()
-            DispatchQueue.main.async {
-                self.isLocationServicesOff = !servicesEnabled
-            }
-        }
-    }
 }

GoInfoGame/GoInfoGame/UI/InitialView/InitialViewModel.swift

@@ -23,14 +23,13 @@ class InitialViewModel: ObservableObject {
 
 
     init() {
-        locationManagerDelegate.locationManager.delegate = locationManagerDelegate
-        locationManagerDelegate.locationManager.requestWhenInUseAuthorization()
-        locationManagerDelegate.locationManager.startUpdatingLocation()
-        
         locationManagerDelegate.locationUpdateHandler = { [weak self] location in
             guard let self = self else { return }
             fetchWorkspacesList()
         }
+        
+        locationManagerDelegate.requestLocationAuthorization()
+        locationManagerDelegate.startUpdatingLocation()
     }
 
     // fetch workspaces list

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -555,7 +555,7 @@ struct CustomMap: UIViewRepresentable {
 
     // calculate distance between user current location and selected annotation
         func calculateDistance(selectedAnnotation: CLLocationCoordinate2D) -> CLLocationDistance {
-            guard let userCurrentLocation = locationManagerDelegate.locationManager.location?.coordinate else { return CLLocationDistance(0) }
+            guard let userCurrentLocation = locationManagerDelegate.location?.coordinate else { return CLLocationDistance(0) }
 
             let fromLocation = CLLocation(latitude: userCurrentLocation.latitude, longitude: userCurrentLocation.longitude)
             let toLocation = CLLocation(latitude: selectedAnnotation.latitude, longitude: selectedAnnotation.longitude)
@@ -564,7 +564,7 @@ struct CustomMap: UIViewRepresentable {
 
     // infer direction
     func inferDirection(selectedAnnotation: CLLocationCoordinate2D) -> String {
-        guard let userCurrentLocation = locationManagerDelegate.locationManager.location?.coordinate else { return "undetermined" }
+        guard let userCurrentLocation = locationManagerDelegate.location?.coordinate else { return "undetermined" }
         let userLocationPoint = MKMapPoint(userCurrentLocation)
         let destinationPoint = MKMapPoint(selectedAnnotation)
         let angleRadians = atan2(destinationPoint.y - userLocationPoint.y, destinationPoint.x - userLocationPoint.x)