Merge pull request #92 from TaskarCenterAtUW/feature-feedback-minor-changes

Feature feedback minor changes

Author: shweta2101

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -63,19 +63,24 @@ class AppQuestManager {
 
 
 
+    
     // Fetches all the available quests from Database
     func fetchQuestsFromDB() ->  [DisplayUnitWithCoordinate] {
-        let nodesFromStorage = dbInstance.getNodes()
-        let waysFromStorage = dbInstance.getWays()
+            
+        let nodesFromStorage = dbInstance.getNodes().filter { n in
+            n.tags.count != 0
+        }
+        let waysFromStorage = dbInstance.getWays().filter{w in w.tags.count != 0 }
         let nodeElements = nodesFromStorage.map({$0.asNode()})
         let wayElements = waysFromStorage.map({$0.asWay()})
-        
+                
         // Get the quests for nodes
         var nodeQuests: [any Quest] = []
         var wayQuests: [any Quest] = []
         let allQuests = QuestsRepository.shared.applicableQuests
         var displayUnits : [DisplayUnitWithCoordinate] = []
 
+        
         // Get the quests for ways
         for node in nodeElements {
             // Get the quests and try to iterate

GoInfoGame/GoInfoGame/data/DatasyncManager.swift

@@ -39,6 +39,12 @@ class DatasyncManager {
         else {
             isSynching = true
         }
+        // check if the user is logged in
+        // if user not logged in, isSynching-false and return
+        guard let accessToken = osmConnection.accessToken else {
+            isSynching = false
+            return
+        }
         let changesets = dbInstance.getChangesets()
         print("Starting to sync data")
         var nodesToSync: [String:StoredNode] = [:]
@@ -178,6 +184,7 @@ class DatasyncManager {
         }
     }
 
+    @MainActor
     func syncWay(way: inout OSMWay)  async -> Result<Bool,Error> {
         do {
                 // open changeset

GoInfoGame/GoInfoGame/quests/CrossingMarking/CrossMarking.swift

@@ -9,12 +9,12 @@ import Foundation
 import UIKit
 import SwiftUI
 import osmparser
-
+// This is to figure out what type of marking is there for the crossing
 class CrossMarking: QuestBase, Quest {
     typealias AnswerClass = CrossingAnswer
     var _internalExpression: ElementFilterExpression?
     var title: String = "Cross Marking"
-    var filter: String = "ways with highway=footway and !footway"
+    var filter: String = "ways with highway=footway and footway=crossing and !crossing"
     var icon: UIImage = #imageLiteral(resourceName: "pedestrian")
     var wikiLink: String = ""
     var changesetComment: String = ""

GoInfoGame/GoInfoGame/quests/QuestProtocols.swift

@@ -46,12 +46,14 @@ class QuestBase {
            print("Unknown Stored element type received")
        }
        // Sync using datasyncmanager
+       
+       // Dismiss sheet after syncing to db
+       MapViewPublisher.shared.dismissSheet.send(true)
+       
 
        DatasyncManager.shared.syncDataToOSM {
            print("SYNC DONE")
-           DispatchQueue.main.async {
-               MapViewPublisher.shared.dismissSheet.send(true)
-           }
+
        }
     }
 }

GoInfoGame/GoInfoGame/quests/QuestsRepository.swift

@@ -12,7 +12,7 @@ class QuestsRepository {
     static let shared = QuestsRepository()
     private init() {}
 
-    var applicableQuests: [ any Quest] = [
+    let applicableQuests: [ any Quest] = [
 
         CrossingType(),
         CrossingIsland(),

GoInfoGame/GoInfoGame/quests/TactilePavingCrosswalk/TactilePavingCrosswalk.swift

@@ -30,7 +30,7 @@ class TactilePavingCrosswalk :QuestBase, Quest {
             return _internalExpression
         }
         else {
-            print("<>")
+//            print("<>")
             _internalExpression = try? filter.toElementFilterExpression()
             return _internalExpression
         }

GoInfoGame/GoInfoGame/quests/TactilePavingSteps/TactilePavingSteps.swift

@@ -30,7 +30,7 @@ class TactilePavingSteps :QuestBase, Quest {
             return _internalExpression
         }
         else {
-            print("<>")
+//            print("<>")
             _internalExpression = try? filter.toElementFilterExpression()
             return _internalExpression
         }

GoInfoGame/GoInfoGame/quests/WayLit/WayLit.swift

@@ -61,7 +61,7 @@ class WayLit: QuestBase, Quest {
             return _internalExpression
         }
         else {
-            print("<>")
+//            print("<>")
             _internalExpression = try? filter.toElementFilterExpression()
             return _internalExpression
         }

GoInfoGame/osmapi/OSMConnection.swift

@@ -70,7 +70,7 @@ public class OSMConnection {
             print("Invalid URL given")
             return
         }
-        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
+        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Bearer \(self.accessToken!)")
         BaseNetworkManager.shared.postData(url: url,method: "PUT" ,body: OSMChangesetPayload()) { (result: Result<Int,Error>) in
             switch result {
             case .success(let changesetID):
@@ -93,7 +93,7 @@ public class OSMConnection {
             print("Invalid URL given")
             return
         }
-        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
+        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Bearer \(self.accessToken!)")
         BaseNetworkManager.shared.postData(url: url,method: "PUT" ,body: ["tag":"xyz"],expectEmpty: true) { (result: Result<Bool,Error>) in
             switch result {
             case .success(let closedResult):
@@ -112,7 +112,7 @@ public class OSMConnection {
     func getChangesets(_ completion: @escaping(()->())) {
         let urlString = self.baseUrl.appending("changesets.json")
         var request = URLRequest(url: URL(string: urlString)!,timeoutInterval: Double.infinity)
-        request.addValue("Basic \(self.userCreds.getHeaderData())", forHTTPHeaderField: "Authorization")
+        request.addValue("Bearer \(self.accessToken!)", forHTTPHeaderField: "Authorization")
         request.httpMethod = "GET"
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
             guard let data = data else {
@@ -148,7 +148,7 @@ public class OSMConnection {
             print("Invalid URL given")
             return
         }
-        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
+        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Bearer \(self.accessToken!)")
         // Add nodes to the same
         if(node.tags == nil){
             node.tags = [:]
@@ -172,7 +172,7 @@ public class OSMConnection {
             print("Invalid URL given")
             return
         }
-        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
+        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Bearer \(self.accessToken!)")
         // Add nodes to the same
 
         tags.forEach { (key: String, value: String) in