Merge pull request #252 from TaskarCenterAtUW/feature-unit-test-for-x

Undo feature implememtation

Author: iAKM

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -10,6 +10,7 @@ import Foundation
 import osmparser
 import MapKit
 import osmapi
+import RealmSwift
 
 
 // Class that handles data handling and display of annotations
@@ -135,6 +136,56 @@ class AppQuestManager {
         let unitsToBeDisplayed = displayUnits.filter { !hiddenIds.contains($0.id) }
         return unitsToBeDisplayed
     }
+    
+    // FIXME: Make this function better
+    // Fetches the quest for a specific changeset based on the element
+    // If there is no need to show the element after undo, it will return nil
+    func fetchQuestForChangeset(storedChangesetId: String) -> DisplayUnitWithCoordinate? {
+        if let changeset = dbInstance.getChangeset(for: storedChangesetId) {
+            // Get the element based on the changeset
+            let storedElementId = changeset.elementId
+            let storedElementType = changeset.elementType
+            var parserElement: osmparser.Element? = nil
+            if (storedElementType == .node) {
+               let storedElement = dbInstance.getNode(id: storedElementId, version: .original)
+                parserElement = storedElement?.asNode()
+            }
+            else if (storedElementType == .way){
+               let storedElement = dbInstance.getWay(id: storedElementId, version: .original)
+                parserElement = storedElement?.asWay()
+            }
+            if let parserElement = parserElement {
+                let allQuests = QuestsRepository.shared.applicableQuests
+                for quest in allQuests {
+                    if quest.quest.filter.isEmpty {
+                        continue
+                    }
+                    if quest.quest.isApplicable(element: parserElement){
+                        let duplicateQuest = quest.quest.copyWithElement(element: parserElement)
+                        // Assign stuff based on the type of element
+                        if parserElement.type == .node {
+                            if let nodObj = parserElement as? osmparser.Node {
+                                let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: nodObj.position.latitude, longitude: nodObj.position.longitude), id: nodObj.id, isHidden: false)
+                                return unit
+                            }
+                          
+                        }
+                        else if parserElement.type == .way {
+                            let position  = dbInstance.getCenterForWay(id: String(parserElement.id)) ?? CLLocationCoordinate2D()
+                            let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo: position, id: parserElement.id, isHidden: false)
+                            return unit
+                        }
+                        
+                    }
+                }
+                
+            }
+            
+           
+            
+        }
+        return nil
+    }
 }
 
 

GoInfoGame/GoInfoGame/DataBase/DBModels/StoredChangeset.swift

@@ -9,20 +9,78 @@ import Foundation
 
 import RealmSwift
 import osmparser
+import CoreLocation
+import osmapi
 
 enum StoredElementEnum: String, PersistableEnum {
     case node
     case way
     case unknown
+    
+    func elementType() -> ElementType {
+        switch self {
+        case .node:
+            return .node
+        case .way:
+            return .way
+        default:
+            return .node
+        }
+    }
 }
 
 // Represents one stored way
 class StoredChangeset: Object {
     @Persisted(primaryKey: true) var id: String = UUID().uuidString // Internal ID
     // Type of change -> can be node or way
     @Persisted var elementType : StoredElementEnum = .unknown
-    @Persisted var elementId: String = "" // The ID of the element
+    @Persisted var elementId: Int // The ID of the element
     @Persisted var tags = Map<String,String>()
+    @Persisted var originalTags = Map<String,String>()
     @Persisted var changesetId: Int = -1 // Initial value of changeset // To be figured out later as index
     @Persisted var timestamp : String = "" // User time stamp
+    @Persisted var version: Int = 0
+    @Persisted var point: CLLocationCoordinate2D = CLLocationCoordinate2D(latitude: 0.0, longitude: 0.0)
+    @Persisted var nodes: List<Int64> = List<Int64>()
+    @Persisted var updatedVersion: Int = -1
+    @Persisted var isUndoCompleted: Bool = false
+    @Persisted var undoOn: Date? = nil
+    
+    public func asOSMWay(isUndo: Bool = false) -> OSMWay {
+        var storage = originalTags.toDictionary()
+        if !isUndo {
+            for tag in tags {
+                storage[tag.key] = tag.value
+            }
+        }
+        let nodes = Array(nodes.map { Int($0) })
+        return OSMWay(type: "way",
+                      id: elementId,
+                      timestamp: Date(),
+                      version: isUndo ? updatedVersion : version,
+                      changeset: -1,
+                      user: "",
+                      uid: -1,
+                      nodes: nodes,
+                      tags: storage)
+    }
+    
+    public func asOSMNode(isUndo: Bool = false) -> OSMNode {
+        var storage = originalTags.toDictionary()
+        if !isUndo {
+            for tag in tags {
+                storage[tag.key] = tag.value
+            }
+        }
+        return OSMNode(type: "node",
+                       id: elementId,
+                       lat: point.latitude,
+                       lon: point.longitude,
+                       timestamp: Date(),
+                       version: isUndo ? updatedVersion : version,
+                       changeset: -1,
+                       user: "",
+                       uid: -1,
+                       tags: storage)
+    }
 }

GoInfoGame/GoInfoGame/DataBase/DBModels/StoredElement.swift

@@ -18,7 +18,7 @@ class StoredElement : Object {
     public func asNode() -> Node {
         let position = LatLon(latitude: 0.0, longitude: 0.0)
         var theTags: [String:String] = [:]
-        for (key,value) in tags.asKeyValueSequence(){
+        for (key,value) in tags{
             theTags[key] = value
         }
         let n = Node(id: Int64(id), version: version, tags: theTags, timestampEdited: 0, position: position)

GoInfoGame/GoInfoGame/DataBase/DBModels/StoredNode.swift

@@ -31,18 +31,10 @@ class StoredNode : Object {
     public func asNode() -> Node {
         let position = LatLon(latitude: point.latitude , longitude: point.longitude)
         var theTags: [String:String] = [:]
-        for (key,value) in tags.asKeyValueSequence(){
+        for (key,value) in tags{
             theTags[key] = value
         }
         let n = Node(id: Int64(id), version: version, tags: theTags, timestampEdited: 0, position: position)
         return n
     }
-    
-    public func asOSMNode() -> OSMNode {
-        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

@@ -44,7 +44,7 @@ class StoredWay: Object {
 
     public func asWay() -> Way {
         var theTags: [String:String] = [:]
-        for (key,value) in tags.asKeyValueSequence(){
+        for (key,value) in tags{
             theTags[key] = value
         }
         let nodeList:[Int64] = nodes.map({$0})
@@ -59,13 +59,4 @@ class StoredWay: Object {
         way.polyline = latLong
         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)
-    }
 }