Merge pull request #105 from TaskarCenterAtUW/feature-improve-map

Improve User Experience by showing user location while loading quests

Author: shweta2101

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

@@ -194,7 +194,6 @@
 		FABF3CFD2B8607860080EAC9 /* MeasureWidthContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABF3CFC2B8607860080EAC9 /* MeasureWidthContainer.swift */; };
 		FABF3D002B8607D80080EAC9 /* MeasureSidewalkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABF3CFF2B8607D80080EAC9 /* MeasureSidewalkView.swift */; };
 		FAC9E60F2B04F9C800E2C608 /* OverpassRequestManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC9E60E2B04F9C800E2C608 /* OverpassRequestManager.swift */; };
-		FAC9E6112B06811300E2C608 /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC9E6102B06811300E2C608 /* LocationManager.swift */; };
 		FAD5C4F32AFCBE700040C61A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD5C4F22AFCBE700040C61A /* AppDelegate.swift */; };
 		FAD5C4F52AFCBE700040C61A /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD5C4F42AFCBE700040C61A /* SceneDelegate.swift */; };
 		FAD5C4FA2AFCBE700040C61A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FAD5C4F82AFCBE700040C61A /* Main.storyboard */; };
@@ -475,7 +474,6 @@
 		FABF3CFC2B8607860080EAC9 /* MeasureWidthContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasureWidthContainer.swift; sourceTree = "<group>"; };
 		FABF3CFF2B8607D80080EAC9 /* MeasureSidewalkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasureSidewalkView.swift; sourceTree = "<group>"; };
 		FAC9E60E2B04F9C800E2C608 /* OverpassRequestManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverpassRequestManager.swift; sourceTree = "<group>"; };
-		FAC9E6102B06811300E2C608 /* LocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = "<group>"; };
 		FAD5C4EF2AFCBE700040C61A /* GoInfoGame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoInfoGame.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FAD5C4F22AFCBE700040C61A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		FAD5C4F42AFCBE700040C61A /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -1236,7 +1234,6 @@
 				FAD5C4F22AFCBE700040C61A /* AppDelegate.swift */,
 				FAD5C4F42AFCBE700040C61A /* SceneDelegate.swift */,
 				FAC9E60E2B04F9C800E2C608 /* OverpassRequestManager.swift */,
-				FAC9E6102B06811300E2C608 /* LocationManager.swift */,
 				FABF3CF32B7419BB0080EAC9 /* LocationManagerDelegate.swift */,
 				FA1992EC2BB1A78C003B4719 /* KeychainManager.swift */,
 				05CB71DD2B0FAEC200DED821 /* UI */,
@@ -1770,7 +1767,6 @@
 				973FC0192B4FB17000878269 /* LocalizedStrings.swift in Sources */,
 				A48037312BBA8C25007EE7E4 /* WorkspacesApiManager.swift in Sources */,
 				FABF3D002B8607D80080EAC9 /* MeasureSidewalkView.swift in Sources */,
-				FAC9E6112B06811300E2C608 /* LocationManager.swift in Sources */,
 				97439F782B87444200DA43E1 /* CrossingKerbHeightForm.swift in Sources */,
 				A4834A3F2B67737500D4F0AA /* StoredChangeset.swift in Sources */,
 				973FC02F2B58F81F00878269 /* StepsRamp.swift in Sources */,

GoInfoGame/GoInfoGame/LocationManager.swift

@@ -12,12 +12,15 @@ class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDele
 
     var locationManager = CLLocationManager()
     @Published var location: CLLocation?
-    var locationUpdateHandler: ((CLLocation) -> Void)?
+    var locationUpdateHandler: ((CLLocationCoordinate2D) -> Void)?
 
     var hasUpdatedLocation = false
 
     override init() {
         super.init()
+        locationManager.delegate = self
+        
+        locationManager.startUpdatingLocation()
     }
 
     func requestLocationAuthorization() {
@@ -60,7 +63,7 @@ class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDele
         guard let mostRecentLocation = locations.last else { return }
         guard !hasUpdatedLocation else { return }
         location = mostRecentLocation
-        locationUpdateHandler?(mostRecentLocation)
+        locationUpdateHandler?(mostRecentLocation.coordinate)
         hasUpdatedLocation = true
         stopUpdatingLocation()
     }

GoInfoGame/GoInfoGame/LocationManagerDelegate.swift

@@ -28,10 +28,10 @@ class InitialViewModel: ObservableObject {
 
     }
     // Method for fetching workspaces based on location
-    func fetchWorkspaceFor(currentLocation: CLLocation) {
+    func fetchWorkspaceFor(currentLocation: CLLocationCoordinate2D) {
         isLoading = true
-        let latString = "\(currentLocation.coordinate.latitude)"
-        let longString = "\(currentLocation.coordinate.longitude)"
+        let latString = "\(currentLocation.latitude)"
+        let longString = "\(currentLocation.longitude)"
         WorkspacesApiManager.shared.fetchWorkspaces(lat: latString, lon: longString) { result in
             DispatchQueue.main.async {
                 switch result {

GoInfoGame/GoInfoGame/UI/InitialView/InitialViewModel.swift

@@ -8,13 +8,13 @@
 import Foundation
 import SwiftUI
 import MapKit
-import CoreLocation
 import osmparser
 
 // Custom Map for managing map interactions between SwiftUI and UIKit components
 struct CustomMap: UIViewRepresentable {
 
-    @Binding var region: MKCoordinateRegion
+    var region: MKCoordinateRegion
+    var userLocation = CLLocationCoordinate2D(latitude: 17.4700, longitude: 78.3534)
     @Binding var trackingMode: MapUserTrackingMode
     var items: [DisplayUnitWithCoordinate]
     @Binding var selectedQuest: DisplayUnit?
@@ -24,7 +24,6 @@ struct CustomMap: UIViewRepresentable {
 
     @State var lineCoordinates: [CLLocationCoordinate2D] = []
 
-    
     var contextualInfo: ((String) -> Void)?
 
     // Creates and configures the UIView
@@ -42,25 +41,22 @@ struct CustomMap: UIViewRepresentable {
 
     // Updates the UIView with new data
     func updateUIView(_ mapView: MKMapView, context: Context) {
-        // Manage annotations
+        mapView.setCenter(userLocation, animated: true)
+        context.coordinator.updateUserRegion(mapView)
         manageAnnotations(mapView, context: context)
-        // Update the region if necessary
-        context.coordinator.updateRegion(mapView)
 
         if shouldShowPolyline {
             if !lineCoordinates.isEmpty {
-                   let polyline = MKPolyline(coordinates: lineCoordinates, count: lineCoordinates.count)
-                   mapView.addOverlay(polyline)
-               }
+                let polyline = MKPolyline(coordinates: lineCoordinates, count: lineCoordinates.count)
+                mapView.addOverlay(polyline)
+            }
         } else {
             mapView.overlays.forEach { overlay in
                 if overlay is MKPolyline {
                     mapView.removeOverlay(overlay)
                 }
             }
         }
-        
-        
     }
 
     // Creates the coordinator
@@ -79,6 +75,17 @@ struct CustomMap: UIViewRepresentable {
             self.contextualInfo = parent.contextualInfo
         }
 
+        // Helper method to update the region
+        func updateUserRegion(_ mapView: MKMapView) {
+            // Update the region only if it hasn't been set yet
+            if self.parent.isPresented  {
+                return
+            } else if !isRegionSet {
+                mapView.setRegion(parent.region, animated: true)
+                isRegionSet = true
+            }
+        }
+        
         //renders polyline
         func mapView(_ mapView: MKMapView, rendererFor overlay: MKOverlay) -> MKOverlayRenderer {
             if let routePolyline = overlay as? MKPolyline {
@@ -145,8 +152,8 @@ struct CustomMap: UIViewRepresentable {
             if let annotation = annotation as? MKClusterAnnotation {
                 let displayAnnotation = annotation.memberAnnotations.first as! DisplayUnitAnnotation
                 selectedAnAnnotation(selectedQuest: displayAnnotation)
-            } else {
-                selectedAnAnnotation(selectedQuest: annotation as! DisplayUnitAnnotation)
+            } else if let annotation = annotation as? DisplayUnitAnnotation {
+                selectedAnAnnotation(selectedQuest: annotation)
             }
 
             // Deselect the annotation to prevent re-adding on selection
@@ -211,16 +218,6 @@ struct CustomMap: UIViewRepresentable {
             UIGraphicsEndImageContext()
             annotationView.image = resizedImage
         }
-        // Helper method to update the region
-        func updateRegion(_ mapView: MKMapView) {
-            // Update the region only if it hasn't been set yet
-            if self.parent.isPresented  {
-                return
-            } else if !isRegionSet {
-                mapView.setRegion(parent.region, animated: true)
-            }
-        }
-        
     }
 
     // Helper method to manage annotations
@@ -247,7 +244,8 @@ struct CustomMap: UIViewRepresentable {
             if !context.coordinator.isRegionSet {
                 /// resetting region only when app is launched/re-launched
                 if existingCoordinates.count == 0 {
-                    mapView.setRegion(region, animated: true)
+                    mapView.setCenter(userLocation, animated: true)
+                  //  mapView.setRegion(region, animated: true)
                 }
                 context.coordinator.isRegionSet = true
             }

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -25,7 +25,8 @@ struct MapView: View {
 
     var body: some View {
             ZStack{
-                CustomMap(region: $viewModel.region,
+                CustomMap(region: viewModel.region,
+                          userLocation: viewModel.userlocation,
                           trackingMode: $trackingMode,
                           items: viewModel.items,
                           selectedQuest: $viewModel.selectedQuest,

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -14,9 +14,9 @@ class MapViewModel: ObservableObject {
 
     let locationManagerDelegate = LocationManagerDelegate()
     @Published var isLoading: Bool = false
-    var region = MKCoordinateRegion(center: CLLocationCoordinate2D(latitude: 37.3318, longitude: -122.0312), span: MKCoordinateSpan(latitudeDelta: 0.0004 , longitudeDelta: 0.0004 ))
+    var region = MKCoordinateRegion(center: CLLocationCoordinate2D(latitude: 37.3318, longitude: -122.0312), span: MKCoordinateSpan(latitudeDelta: 0.0009 , longitudeDelta: 0.0009))
     let viewSpanDelta = 0.001 // Delta lat/lng to show to the user
-
+    var userlocation =  CLLocationCoordinate2D(latitude: 17.4700, longitude: 78.3534)
     @Published var refreshMap = UUID()
     @Published var items: [DisplayUnitWithCoordinate] = []
     @Published var selectedQuest: DisplayUnit?
@@ -29,20 +29,21 @@ class MapViewModel: ObservableObject {
 
         locationManagerDelegate.locationUpdateHandler = { [weak self] location in
             guard let self = self else { return }
+            self.userlocation = location
             fetchOSMDataFor(currentLocation: location)
         }
 
     }
 
     @objc private func locationDidChange() {
         guard let userLocation = locationManagerDelegate.location else { return }
-        fetchOSMDataFor(currentLocation: userLocation)
+        fetchOSMDataFor(currentLocation: userLocation.coordinate)
     }
 
-    func fetchOSMDataFor(currentLocation: CLLocation) {
+    func fetchOSMDataFor(currentLocation: CLLocationCoordinate2D) {
         isLoading = true
         let bBox = boundingBoxAroundLocation(location: currentLocation, distance: dataSpanDistance)
-        self.region = MKCoordinateRegion(center: currentLocation.coordinate, span: MKCoordinateSpan(
+        self.region = MKCoordinateRegion(center: currentLocation, span: MKCoordinateSpan(
             latitudeDelta: viewSpanDelta,
             longitudeDelta: viewSpanDelta
         ))
@@ -59,8 +60,8 @@ class MapViewModel: ObservableObject {
         self.items = AppQuestManager.shared.fetchQuestsFromDB()
     }
 
-    private func boundingBoxAroundLocation(location: CLLocation, distance: CLLocationDistance) -> BBox {
-        let region = MKCoordinateRegion(center: location.coordinate, latitudinalMeters: distance, longitudinalMeters: distance)
+    private func boundingBoxAroundLocation(location: CLLocationCoordinate2D, distance: CLLocationDistance) -> BBox {
+        let region = MKCoordinateRegion(center: location, latitudinalMeters: distance, longitudinalMeters: distance)
         let center = region.center
         let span = region.span
         let minLat = center.latitude - span.latitudeDelta / 2