Merge pull request #106 from TaskarCenterAtUW/feature-bug-fix-13

Bug Fixes in Build 13

Author: iAKM

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -18,7 +18,7 @@ class AppQuestManager {
 //    let opManager = OverpassRequestManager()
 
     let dbInstance = DatabaseConnector.shared
-    let osmConnection = OSMConnection()
+    let osmConnection =  OSMConnection(config: OSMConfig.testPOSM, currentChangesetId: nil)
 
     static let shared = AppQuestManager()
     private init() {}
@@ -62,6 +62,60 @@ class AppQuestManager {
     }
 
 
+    func getUpdatedQuest(elementId: String) -> DisplayUnitWithCoordinate? {
+        let nodesFromStorage = dbInstance.getNodes().filter { n in
+            n.tags.count != 0
+        }
+        let waysFromStorage = dbInstance.getWays().filter{w in w.tags.count != 0 }
+        let theWay = waysFromStorage.first(where: {$0.id == Int(elementId)})
+        let theNode = nodesFromStorage.first(where: {$0.id == Int(elementId)})
+        let allQuests = QuestsRepository.shared.applicableQuests
+        // theElement if not equal to nil
+        if (theNode != nil) {
+            let nodeElement = theNode?.asNode()
+            for quest in allQuests {
+                if quest.filter.isEmpty {continue} // Ignore quest
+                if quest.isApplicable(element: nodeElement!){
+                    // Create a duplicate of the quest
+                    // Create a display Unit
+                    let duplicateQuest = quest.copyWithElement(element: nodeElement!)
+                    let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: nodeElement!.position.latitude, longitude: nodeElement!.position.longitude), id: nodeElement!.id)
+                    return unit
+                }
+            }
+            
+        }
+        else if (theWay != nil){
+            let wayElement = theWay?.asWay()
+            for quest in allQuests {
+                if quest.filter.isEmpty {continue} // Ignore quest
+                if quest.isApplicable(element: wayElement!){
+                    // Create a duplicate of the quest
+                    // Need to add another here.
+                    let duplicateQuest = quest.copyWithElement(element: wayElement!)
+                    let position  = dbInstance.getCenterForWay(id: String(wayElement!.id)) ?? CLLocationCoordinate2D()
+                    let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo: position, id: wayElement!.id)
+                return unit
+                }
+            }
+            
+        }
+        return nil
+    }
+    
+//    internal func getPossibleQuest(element:  osmparser.Element) -> DisplayUnitWithCoordinate? {
+//        let allQuests = QuestsRepository.shared.applicableQuests
+//        for quest in allQuests {
+//            if quest.filter.isEmpty {continue}
+//            if quest.isApplicable(element: element){
+//                let duplicateQuest = quest.copyWithElement(element: element)
+//                let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: node.position.latitude, longitude: node.position.longitude), id: node.id)
+//            }
+//            
+//        }
+//        
+//    }
+    
 
 
     // Fetches all the available quests from Database

GoInfoGame/GoInfoGame/LocationManagerDelegate.swift

@@ -13,9 +13,7 @@ class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDele
     var locationManager = CLLocationManager()
     @Published var location: CLLocation?
     var locationUpdateHandler: ((CLLocationCoordinate2D) -> Void)?
-    
-    var hasUpdatedLocation = false
-    
+        
     override init() {
         super.init()
         locationManager.delegate = self
@@ -36,13 +34,15 @@ class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDele
 
             DispatchQueue.main.async {
                 self.locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
+                self.locationManager.distanceFilter = 150
                 self.locationManager.startUpdatingLocation()
             }
         }
     }
 
 
     func stopUpdatingLocation() {
+        print("App is pushed to background. So stopping location updates")
         locationManager.stopUpdatingLocation()
     }
 
@@ -61,10 +61,11 @@ class LocationManagerDelegate: NSObject, ObservableObject, CLLocationManagerDele
 
     func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
         guard let mostRecentLocation = locations.last else { return }
-        guard !hasUpdatedLocation else { return }
         location = mostRecentLocation
         locationUpdateHandler?(mostRecentLocation.coordinate)
-        hasUpdatedLocation = true
-        stopUpdatingLocation()
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        print("Error with location manager is ----\(error.localizedDescription)")
     }
 }

GoInfoGame/GoInfoGame/SceneDelegate.swift

@@ -10,6 +10,8 @@ import UIKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
+    
+   var locationManagerDelegate = LocationManagerDelegate()
 
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
@@ -39,12 +41,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func sceneWillEnterForeground(_ scene: UIScene) {
         // Called as the scene transitions from the background to the foreground.
         // Use this method to undo the changes made on entering the background.
+        locationManagerDelegate.startUpdatingLocation()
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
         // Called as the scene transitions from the foreground to the background.
         // Use this method to save data, release shared resources, and store enough scene-specific state information
         // to restore the scene back to its current state.
+        locationManagerDelegate.stopUpdatingLocation()
     }
 
     func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
@@ -56,6 +60,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 
     }
+    
+    
 
 }
 

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -22,6 +22,7 @@ struct CustomMap: UIViewRepresentable {
     @Binding var isPresented: Bool
     @StateObject var locationManagerDelegate = LocationManagerDelegate()
 
+    
     @State var lineCoordinates: [CLLocationCoordinate2D] = []
 
     var contextualInfo: ((String) -> Void)?
@@ -41,7 +42,7 @@ struct CustomMap: UIViewRepresentable {
 
     // Updates the UIView with new data
     func updateUIView(_ mapView: MKMapView, context: Context) {
-        mapView.setCenter(userLocation, animated: true)
+      //  mapView.setCenter(userLocation, animated: true)
         context.coordinator.updateUserRegion(mapView)
         manageAnnotations(mapView, context: context)
 
@@ -148,7 +149,6 @@ struct CustomMap: UIViewRepresentable {
         // Handles selection of annotations
         func mapView(_ mapView: MKMapView, didSelect annotation: MKAnnotation) {
             print("did select ")
-            print(annotation)
             if let annotation = annotation as? MKClusterAnnotation {
                 let displayAnnotation = annotation.memberAnnotations.first as! DisplayUnitAnnotation
                 selectedAnAnnotation(selectedQuest: displayAnnotation)
@@ -177,7 +177,6 @@ struct CustomMap: UIViewRepresentable {
                     }
                 }
                 self.parent.lineCoordinates = polylineCoords
-                print("POLYLINE COORDS ARE ----\(polylineCoords)")
 
                 parent.inferStreetName(location: annotationLocation) { streetName in
                     if let streetName = streetName {
@@ -222,34 +221,29 @@ struct CustomMap: UIViewRepresentable {
 
     // Helper method to manage annotations
     private func manageAnnotations(_ mapView: MKMapView, context: Context) {
-        /// Extracting coordinates of existing annotations
+        
         let existingCoordinates = mapView.annotations.compactMap { ($0 as? DisplayUnitAnnotation)?.coordinate }
-        let newAnnotations = items.map { $0.annotation }
-        let newCoordinates = newAnnotations.map { $0.coordinate }
-        /// Checking if the coordinates of existing annotations are different from the coordinates of new annotations
-        if existingCoordinates.count != newCoordinates.count {
-            /// to reset isRegionSet value whenever region changes.
-                context.coordinator.isRegionSet = false
-            /// Removing annotations that are not present in the new set
-            let annotationsToRemove = mapView.annotations.filter {
-                guard let displayUnitAnnotation = $0 as? DisplayUnitAnnotation else { return false }
-                return !newCoordinates.contains(displayUnitAnnotation.coordinate)
-            }
-            mapView.removeAnnotations(annotationsToRemove)
-            /// Adding annotations that are present in the new set but not in the existing set
-            let annotationsToAdd = newAnnotations.filter { !existingCoordinates.contains($0.coordinate) }
-            mapView.addAnnotations(annotationsToAdd)
-
-            /// Updating the region if it hasn't been set yet
-            if !context.coordinator.isRegionSet {
-                /// resetting region only when app is launched/re-launched
-                if existingCoordinates.count == 0 {
-                    mapView.setCenter(userLocation, animated: true)
-                  //  mapView.setRegion(region, animated: true)
-                }
-                context.coordinator.isRegionSet = true
-            }
+        
+        /// resetting region only when app is launched/re-launched
+        if existingCoordinates.count == 0 {
+            mapView.setCenter(userLocation, animated: true)
         }
+        context.coordinator.isRegionSet = true
+        
+        
+        if (existingCoordinates.isEmpty) {
+            print("Adding annotations completely")
+            mapView.addAnnotations(items.compactMap({$0.annotation}))
+        }
+        
+        let currentAnnotations = Set(mapView.annotations.compactMap { $0 as? DisplayUnitAnnotation })
+        let newAnnotations = Set(items.map({$0.annotation}))
+        
+        let annotationsToRemove = currentAnnotations.subtracting(newAnnotations)
+        let annotationsToAdd = newAnnotations.subtracting(currentAnnotations)
+        
+        mapView.removeAnnotations(Array(annotationsToRemove))
+        mapView.addAnnotations(Array(annotationsToAdd))
     }
 
     // calculate distance between user current location and selected annotation

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -11,14 +11,15 @@ import Combine
 
 struct MapView: View {
     let selectedWorkspace: Workspace?
-    @State var trackingMode: MapUserTrackingMode = MapUserTrackingMode.none
+    @State var trackingMode: MapUserTrackingMode = MapUserTrackingMode.follow
     @Environment(\.presentationMode) private var presentationMode
     @AppStorage("isMapFromOnboarding") var isMapFromOnboarding: Bool = false
     @StateObject private var viewModel = MapViewModel()
     @State private var isPresented = false
 
     @State private var shouldShowPolyline = true
     @State private var isSyncing = false
+    @State private var showAlert = false
     @StateObject var contextualInfo = ContextualInfo.shared
 
     @AppStorage("baseUrl") var baseUrl = ""
@@ -31,6 +32,7 @@ struct MapView: View {
                           items: viewModel.items,
                           selectedQuest: $viewModel.selectedQuest,
                           shouldShowPolyline: $shouldShowPolyline,
+                          
                           isPresented: $isPresented, contextualInfo: { contextualInfo in
                     print(contextualInfo)
                     self.setContextualInfo(contextualinfo: contextualInfo)
@@ -42,6 +44,30 @@ struct MapView: View {
                         .edgesIgnoringSafeArea(.all)
                    ActivityView(activityText: "Looking for quests...")
                 }
+                if showAlert {
+                    VStack {
+                        Image(systemName: "checkmark.circle.fill")
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
+                            .frame(width: 50, height: 50)
+                            .foregroundColor(.green)
+                            .padding(.bottom, 50)
+                        Text("Quest Submitted")
+                            .foregroundColor(.white)
+                            .padding()
+                            .background(Color.orange)
+                            .cornerRadius(10)
+                    }
+                    .padding([.all], 50)
+                    .background(Color.white)
+                    .accessibilityElement(children: .combine)
+                    .accessibilityLabel("Quest Submitted")
+                    .onAppear {
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                            showAlert = false // Dismiss notification box after 1 second
+                        }
+                    }
+                }
             }
             .environmentObject(contextualInfo)
             .navigationBarHidden(false)
@@ -91,15 +117,16 @@ struct MapView: View {
             switch scenario {
             case .dismissed:
                 shouldShowPolyline = false
-            case .submitted:
-                viewModel.refreshMapAfterSubmission()
+            case .submitted(let elementId):
                 shouldShowPolyline = false
+                viewModel.refreshMapAfterSubmission(elementId: elementId)                
             case .syncing:
                 isSyncing = true
                 print("syncing")
             case .synced:
                 isSyncing = false
                 print("synced")
+                showAlert = true
             }
         }
         .onAppear(){
@@ -123,7 +150,7 @@ public class MapViewPublisher: ObservableObject {
 
 public enum SheetDismissalScenario {
     case dismissed
-    case submitted
+    case submitted(String)
     case syncing
     case synced
 }

GoInfoGame/GoInfoGame/UI/Map/MapViewModel.swift

@@ -10,6 +10,7 @@ import SwiftUI
 import MapKit
 import CoreLocation
 
+
 class MapViewModel: ObservableObject {
 
     let locationManagerDelegate = LocationManagerDelegate()
@@ -56,8 +57,21 @@ class MapViewModel: ObservableObject {
         }
     }
 
-    func refreshMapAfterSubmission() {
-        self.items = AppQuestManager.shared.fetchQuestsFromDB()
+    func refreshMapAfterSubmission(elementId: String) {
+            
+        if let newItem = AppQuestManager.shared.getUpdatedQuest(elementId: elementId) {
+            let toReplace = self.items.first(where: {$0.id == Int(elementId)!})
+            let index = self.items.firstIndex(where: {$0.id == Int(elementId)!})
+            
+            self.items.remove(at: index!)
+            self.items.insert(newItem, at: index!)
+        }
+        else{
+            if let toReplace = self.items.first(where: {$0.id == Int(elementId)!}) {
+                let index = self.items.firstIndex(where: {$0.id == Int(elementId)!})
+                self.items.remove(at: index!)
+            }
+        }
     }
 
     private func boundingBoxAroundLocation(location: CLLocationCoordinate2D, distance: CLLocationDistance) -> BBox {

GoInfoGame/GoInfoGame/quests/BusStopLit/BusStopLit.swift

@@ -11,6 +11,8 @@ import SwiftUI
 import osmparser
 
 class BusStopLit: QuestBase, Quest {
+    var questId: String = "6"
+    
     typealias AnswerClass = YesNoAnswer
     var relationData: Element? = nil
     var _internalExpression: ElementFilterExpression?
@@ -35,7 +37,8 @@ class BusStopLit: QuestBase, Quest {
             )
     """
     var displayUnit: DisplayUnit {
-        DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.SMALL )
+        let uid = String(self.relationData?.id ?? 0)
+        return DisplayUnit(title: self.title, description: "", id: "\(uid) - \(questId)",parent: self,sheetSize:.SMALL )
     }
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){

GoInfoGame/GoInfoGame/quests/CrossingIsland/CrossingIsland.swift

@@ -11,6 +11,8 @@ import SwiftUI
 import osmparser
 
 class CrossingIsland: QuestBase, Quest {
+    var questId: String = "8"
+    
     typealias AnswerClass = YesNoAnswer
     var relationData: Element? = nil
     var _internalExpression: ElementFilterExpression?
@@ -25,7 +27,8 @@ class CrossingIsland: QuestBase, Quest {
     var title: String = "Crossing Island"
     var filter: String = ""
     var displayUnit: DisplayUnit {
-        DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.MEDIUM )
+        let uid = String(self.relationData?.id ?? 0)
+       return DisplayUnit(title: self.title, description: "", id: "\(uid) - \(questId)",parent: self,sheetSize:.MEDIUM )
     }
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){