Merge pull request #65 from TaskarCenterAtUW/feature-setup-posm-dev

Replaced Dev environment

Author: susrisha

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -34,8 +34,10 @@ class AppQuestManager {
         // Get the data from bbox
         let centralLocation = CLLocation(latitude: 37.7749, longitude: -122.4194) // San Francisco coords
         let distance = 100
+        //37.41465820658871,-122.0912196996173,37.42366839341129,-122.0799229003827
         let boundingCoordinates = centralLocation.boundingCoordinates(distance: CLLocationDistance(distance))
-        osmConnection.fetchMapData(left:boundingCoordinates.left.coordinate.longitude , bottom:boundingCoordinates.bottom.coordinate.latitude , right:boundingCoordinates.right.coordinate.longitude , top:boundingCoordinates.top.coordinate.latitude ) { result in
+        
+        osmConnection.fetchMapData(left:bbox.minLon , bottom:bbox.minLat , right:bbox.maxLon , top:bbox.maxLat ) { result in
             switch result {
             case .success(let mapData):
                 let response = Array(mapData.values)

GoInfoGame/GoInfoGame/DataBase/DBModels/StoredNode.swift

@@ -32,6 +32,10 @@ class StoredNode : Object {
     }
 
     public func asOSMNode() -> OSMNode {
-        return OSMNode(type: "node", id: id, lat: point.latitude, lon: point.longitude, timestamp: Date(), version: version, changeset: -1, user: "", uid: -1)
+        var storage = [String: String]()
+        for tag in tags {
+            storage[tag.key] = tag.value
+        }
+        return OSMNode(type: "node", id: id, lat: point.latitude, lon: point.longitude, timestamp: Date(), version: version, changeset: -1, user: "", uid: -1, tags: storage)
     }
 }

GoInfoGame/GoInfoGame/DataBase/DBModels/StoredWay.swift

@@ -10,6 +10,7 @@ import Foundation
 import RealmSwift
 import osmparser
 import MapKit
+import osmapi
 
 // Represents one stored way
 class StoredWay: Object {
@@ -32,4 +33,13 @@ class StoredWay: Object {
         let way = Way(id: Int64(id), version: version, tags: theTags, timestampEdited: 0, type: .way, nodeIds: nodeList)
         return way
     }
+    
+    public func asOSMWay() -> OSMWay {
+        var storage = [String: String]()
+        for tag in tags {
+            storage[tag.key] = tag.value
+        }
+        let nodes = Array(nodes.map { Int($0) })
+        return OSMWay(type: "way", id: id, timestamp: Date(), version: version, changeset: -1, user: "", uid: -1, nodes: nodes, tags: storage)
+    }
 }

GoInfoGame/GoInfoGame/data/DatasyncManager.swift

@@ -19,10 +19,19 @@ class DatasyncManager {
 
     private let dbInstance = DatabaseConnector.shared
 
-    private let osmConnection = OSMConnection(config: OSMConfig.test, currentChangesetId: nil, userCreds: OSMLogin.test)
+    private let osmConnection = OSMConnection(config: OSMConfig.testOSM, currentChangesetId: nil, userCreds: OSMLogin.testOSM)
 
+    func syncDataToOSM( completionHandler: @escaping ()-> Void?)  {
+        Task {
+            await syncData()
+            completionHandler()
+        }
+    }
+    
+    /// *** Terminating app due to uncaught exception 'RLMException', reason: 'Realm accessed from incorrect thread.'
+    ///  To fix the above error added @mainActor
+    @MainActor
     func syncData() async  {
-        
         if(isSynching){
             print("Already syncing")
             return
@@ -33,6 +42,7 @@ class DatasyncManager {
         let changesets = dbInstance.getChangesets()
         print("Starting to sync data")
         var nodesToSync: [String:StoredNode] = [:]
+        var waysToSync: [String:StoredWay] = [:]
         for changeset in changesets {
             // Get the element type
             if changeset.elementType == .node {
@@ -41,6 +51,12 @@ class DatasyncManager {
                 if let node  = dbInstance.getNode(id: changeset.elementId) {
                     nodesToSync[changeset.id] = node
                 }
+            }else if changeset.elementType == .way {
+                print("Syncing Way")
+                // Get the way
+                if let way = dbInstance.getWay(id: changeset.elementId) {
+                    waysToSync[changeset.id] = way
+                }
             }
         }
 
@@ -52,15 +68,33 @@ class DatasyncManager {
             case .success(let isFinished):
                 print("Synced \(payload)")
                 DispatchQueue.main.async {
-                  // your code here
+                    // your code here
+                    self.dbInstance.assignChangesetId(obj: key, changesetId: payload.changeset)
+                }
+                
+            case .failure(let error):
+                print("Failed to sync \(payload)")
+            }
+        }
+        // TODO: Add logic to sync Way
+        for (key,way) in waysToSync {
+            var payload = way.asOSMWay()
+            // update the way
+            let result = await syncWay(way: &payload)
+            switch result{
+            case .success(let isFinished):
+                print("Synced \(payload)")
+                DispatchQueue.main.async {
+                    // your code here
                     self.dbInstance.assignChangesetId(obj: key, changesetId: payload.changeset)
                 }
 
             case .failure(let error):
                 print("Failed to sync \(payload)")
             }
+            
         }
-        isSynching = false 
+        isSynching = false
 
     }
 
@@ -103,12 +137,22 @@ class DatasyncManager {
     // utility function to act as substitute for osmConnection functions
     func updateNode(node: inout OSMNode) async -> Result<Int,Error> {
         await withCheckedContinuation { continuation in
-            osmConnection.updateNode(node: &node, tags: [:]) { result in
+            osmConnection.updateNode(node: &node, tags: node.tags ?? [:]) { result in
                 continuation.resume(returning: result)
             }
         }
     }
 
+    // utility function to act as substitute for osmConnection functions
+    func updateWay(way: inout OSMWay) async -> Result<Int,Error> {
+        await withCheckedContinuation { continuation in
+            osmConnection.updateWay(way: &way, tags: way.tags) { result in
+                continuation.resume(returning:result)
+            }
+        }
+    }
+    
+    
 
     /**
             Syncs the node along with the updated
@@ -132,4 +176,24 @@ class DatasyncManager {
             return .failure(error)
         }
     }
+    
+    func syncWay(way: inout OSMWay)  async -> Result<Bool,Error> {
+        do {
+                // open changeset
+                let changesetId = try await openChangeset().get()
+                // update node
+                way.changeset = changesetId
+                // close changeset
+                let newVersion = try await updateWay(way: &way).get()
+                way.version = newVersion
+                // Give back the new version and other stuff.
+                let closeResult = try await closeChangeset(id: String(changesetId)).get()
+            
+            return .success(true)
+            
+        } catch (let error){
+            print(error)
+            return .failure(error)
+        }
+    }
 }

GoInfoGame/GoInfoGame/quests/QuestProtocols.swift

@@ -36,17 +36,20 @@ class QuestBase {
        let storedElementType: StoredElementEnum = type == .way ? .way : .node
        let storedId = String(id)
        // Create a changeset
-       let newChangeset = DatabaseConnector.shared.createChangeset(id: storedId, type: storedElementType, tags: tags)
+       _ = DatabaseConnector.shared.createChangeset(id: storedId, type: storedElementType, tags: tags)
        switch (storedElementType){
        case .way:
-           DatabaseConnector.shared.addWayTags(id: storedId, tags: tags)
+          _ = DatabaseConnector.shared.addWayTags(id: storedId, tags: tags)
        case .node:
-           DatabaseConnector.shared.addNodeTags(id: storedId, tags: tags)
+          _ = DatabaseConnector.shared.addNodeTags(id: storedId, tags: tags)
        case .unknown:
            print("Unknown Stored element type received")
        }
        // Sync using datasyncmanager
 
+       DatasyncManager.shared.syncDataToOSM {
+           print("SYNC DONE")
+       }
     }
 
 }

GoInfoGame/osmapi/OSMConfig.swift

@@ -19,4 +19,8 @@ public struct OSMConfig {
     public static var test: OSMConfig {
         OSMConfig(baseUrl: "https://waylyticsposm.westus2.cloudapp.azure.com/api/0.6/")
     }
+    
+    public static var testOSM : OSMConfig {
+        OSMConfig(baseUrl: "https://master.apis.dev.openstreetmap.org/api/0.6/")
+    }
 }

GoInfoGame/osmapi/OSMConnection.swift

@@ -8,17 +8,11 @@
 import Foundation
 public class OSMConnection {
     // Creates a connection
-    let baseUrl: String// = OSMConfig.baseUrl
-    
+    let baseUrl: String
     var currentChangesetId: Int? = 0
-    
-//    let userCreds: OSMLogin = OSMLogin(username: "[email protected]", password: "a$hwa7hamA")
     let userCreds: OSMLogin
-    //ycqzd3_F6rqDEhs / [email protected]
-    
     // Lets see if we can start with some authentication or node
-    
- public   init(config: OSMConfig = OSMConfig.test, currentChangesetId: Int? = nil, userCreds: OSMLogin = OSMLogin.test) {
+    public init(config: OSMConfig = OSMConfig.testOSM, currentChangesetId: Int? = nil, userCreds: OSMLogin = OSMLogin.testOSM) {
         self.baseUrl = config.baseUrl
         self.currentChangesetId = currentChangesetId
         self.userCreds = userCreds
@@ -28,17 +22,19 @@ public class OSMConnection {
         let urlString = self.baseUrl.appending("node/").appending(id).appending(".json")
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
+        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         BaseNetworkManager.shared.fetchData(url: url, completion: completion) // Need to improve this one
     }
 
     func getWay(id: String,_ completion: @escaping (Result<OSMWayResponse, Error>)-> Void) {
         let urlString =  self.baseUrl.appending("way/").appending(id).appending(".json")
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
+        BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         BaseNetworkManager.shared.fetchData(url: url, completion: completion) // Need to improve this one
     }
 
@@ -47,8 +43,8 @@ public class OSMConnection {
         let urlString = self.baseUrl.appending("changeset/create")
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         BaseNetworkManager.shared.postData(url: url,method: "PUT" ,body: OSMChangesetPayload()) { (result: Result<Int,Error>) in
             switch result {
@@ -63,12 +59,12 @@ public class OSMConnection {
         }
     }
 
-   public func closeChangeSet(id: String,completion: @escaping((Result<Bool,Error>)->Void)) {
+    public func closeChangeSet(id: String,completion: @escaping((Result<Bool,Error>)->Void)) {
         let urlString = self.baseUrl.appending("changeset/").appending(id).appending("/close")
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         BaseNetworkManager.shared.postData(url: url,method: "PUT" ,body: ["tag":"xyz"],expectEmpty: true) { (result: Result<Bool,Error>) in
             switch result {
@@ -83,24 +79,20 @@ public class OSMConnection {
         }
     }
 
+    // TODO: We are not using this any where, need to discuss and remove it.
     // Original method with everything from postman
     func getChangesets(_ completion: @escaping(()->())) {
-        
-        var request = URLRequest(url: URL(string: "https://waylyticsposm.westus2.cloudapp.azure.com/api/0.6/changesets.json")!,timeoutInterval: Double.infinity)
-        request.addValue("Basic bmFyZXNoZEB2aW5kYWdvLmluOmEkaHdhN2hhbUE=", forHTTPHeaderField: "Authorization")
-
+        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.httpMethod = "GET"
-        
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
-          guard let data = data else {
-            print(String(describing: error))
-              completion()
-            return
-          }
-          print(String(data: data, encoding: .utf8)!)
+            guard let data = data else {
+                completion()
+                return
+            }
             completion()
         }
-
         task.resume()
     }
 
@@ -110,8 +102,8 @@ public class OSMConnection {
         let urlString = self.baseUrl.appending("changesets.json?open=true")
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         // Get to work
         BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         BaseNetworkManager.shared.fetchData(url: url, completion: completion)
@@ -123,8 +115,8 @@ public class OSMConnection {
         let urlString = self.baseUrl.appending("node/").appending(String(node.id))
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         // Add nodes to the same
         if(node.tags == nil){
@@ -139,13 +131,13 @@ public class OSMConnection {
 
     }
 
-    func updateWay(way: inout OSMWay, tags:[String:String], completion: @escaping((Result<Int,Error>)->Void)){
+    public func updateWay(way: inout OSMWay, tags:[String:String], completion: @escaping((Result<Int,Error>)->Void)){
         // Have to do this.
         let urlString = self.baseUrl.appending("way/").appending(String(way.id))
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         // Add nodes to the same
 
@@ -158,27 +150,25 @@ public class OSMConnection {
     }
     func getUserDetailsWithId(id: String,_ completion: @escaping (Result<OSMUserDataResponse, Error>)-> Void) {
         let urlString =  self.baseUrl.appending("user/").appending(id).appending(".json")
-        print(urlString)
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         BaseNetworkManager.shared.fetchData(url: url, completion: completion)
     }
     func getUserDetails(_ completion: @escaping (Result<OSMUserDataResponse, Error>)-> Void) {
         let urlString =  self.baseUrl.appending("user/details.json")
-        print(urlString)
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")
-                    return
-                }
+            return
+        }
         BaseNetworkManager.shared.addOrSetHeaders(header: "Authorization", value: "Basic \(self.userCreds.getHeaderData())")
         BaseNetworkManager.shared.fetchData(url: url, completion: completion)
     }
 
     /// Internal function for getting the map data
      public func getOSMMapData(left: Double, bottom: Double, right: Double, top: Double,_ completion: @escaping (Result<OSMMapDataResponse, Error>)-> Void) {
-        let urlString =  "https://api.openstreetmap.org/api/0.6/map.json?bbox=\(left),\(bottom),\(right),\(top)"
+         let urlString =  self.baseUrl.appending("map.json?bbox=\(left),\(bottom),\(right),\(top)")
         print(urlString)
         guard let url = URL(string: urlString) else {
             print("Invalid URL given")

GoInfoGame/osmapi/OSMLogin.swift

@@ -25,4 +25,8 @@ public struct OSMLogin {
     public static var test : OSMLogin {
         OSMLogin(username: "[email protected]", password: "a$hwa7hamA") // Need to change
     }
+    
+    public static var testOSM : OSMLogin {
+        OSMLogin(username: "[email protected]", password: "d.Dgq6J6aBy.dCJ") 
+    }
 }