fixes to the changeset and undo UI done

- Undo UI is done.

Author: susrisha

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/UI/Map/MapView.swift

@@ -391,6 +391,11 @@ struct MapView: View {
             case .hideElement(let elementId, let elementName):
                 shouldShowPolyline = false
                 viewModel.hideQuest(elementId: elementId, elementName: elementName)
+            case .undoDone(let changesetId):
+                shouldShowPolyline = false
+                showAlert = true
+                alertMessage = "Changes reverted"
+                viewModel.refreshMapAfterUndoSumbit(storedChangesetId: changesetId)
             }
         }
         .onReceive(QuestsPublisher.shared.refreshQuest, perform: { _ in
@@ -474,6 +479,7 @@ public enum SheetDismissalScenario {
     case synced
     case failed(String)
     case hideElement(String, String)
+    case undoDone(String)
 }
 
 //TODO: Move to a new file

GoInfoGame/GoInfoGame/UI/Map/MapViewModel.swift

@@ -158,6 +158,19 @@ class MapViewModel: ObservableObject {
       //  }
     }
 
+    // The item may have been already resolved or changed.
+    // Try and add the item to items
+    func refreshMapAfterUndoSumbit(storedChangesetId: String) {
+        print("Refreshing map after undo submit")
+        
+        if let newItem = AppQuestManager.shared.fetchQuestForChangeset(storedChangesetId: storedChangesetId) {
+            self.items.append(newItem)
+        } else {
+            print("No new item got")
+        }
+        
+    }
+    
     func hideQuest(elementId: String, elementName: String) {
         print(elementId)
         HiddenQuestManager.shared.hideQuest(elementId: elementId, elementName: elementName, items: &items)

GoInfoGame/GoInfoGame/data/DatasyncManager.swift

@@ -278,7 +278,15 @@ class DatasyncManager {
                         localWay.tags[key] = value
                     }
                     let id = localWay.id
-                    let tags = localWay.tags
+                    var tags = localWay.tags
+                    // The gig tags are not added into the db when pushing directly
+                    // Adding them forcibly here.
+                    if (!exclude_gig_tags) {
+                        let gig_internal_tags = localWay.fetchInternalGigTags()
+                        gig_internal_tags.forEach { (key: String, value: String) in
+                            tags[key] = value
+                        }
+                    }
                     DispatchQueue.main.async {
                         _ = DatabaseConnector.shared.addWayTags(id: id, tags: tags, version: newVersion)
                     }
@@ -324,8 +332,18 @@ class DatasyncManager {
                         updatedNode.tags[key] = value
                     }
                     updatedNode.version = newVersion
+                    
+                    // Gig tags are not added to DB when pushing changes
+                    // those are added manually here
+                    if (!exclude_gig_tags) {
+                        let gig_internal_tags = updatedNode.fetchInternalGigTags()
+                        gig_internal_tags.forEach { (key: String, value: String) in
+                            updatedNode.tags[key] = value
+                        }
+                    }
                     SyncLogger.shared.logStep("Node Updated ----\(updatedNode.tags)")
                     DispatchQueue.main.async {
+                        
                         _ = DatabaseConnector.shared.addNodeTags(id: updatedNode.id, tags: updatedNode.tags, version: newVersion)
                     }
                     continuation.resume(returning: newVersion)
@@ -418,6 +436,8 @@ class DatasyncManager {
                     return try await updateNode(node: mergedNode, exclude_gig_tags: exclude_gig_tags)
                 } else {
                     print("Undo operation is not possible")
+                    // update the original node with the server node.
+                    // FIXME: this is not done. Need to do something.
                     return fetchedResult.version
                 }
 

GoInfoGame/GoInfoGame/quests/QuestProtocols.swift

@@ -48,6 +48,7 @@ class QuestBase {
     func updateUndoTags(changeSet: StoredChangeset) {
         // Convert from ElementType enum to StoredElementEnum
         Task.detached(operation: { @MainActor in
+            MapViewPublisher.shared.dismissSheet.send(.syncing)
             let storedElementType: StoredElementEnum = changeSet.elementType
             let changesetId = changeSet.id
             do {
@@ -64,7 +65,9 @@ class QuestBase {
                 DispatchQueue.main.async {
                     _ = DatabaseConnector.shared.updateChangesetWithUndoResultSuccess(obj: changesetId)
                 }
-                
+                MapViewPublisher.shared.dismissSheet.send(.synced)
+//                MapViewPublisher.shared.dismissSheet.send(.submitted(""))
+                MapViewPublisher.shared.dismissSheet.send(.undoDone(changesetId))
             }
             catch {
                 print("❌ Undo failed: \(error)")

GoInfoGame/GoInfoGame/quests/QuestUndoManager.swift

@@ -46,6 +46,7 @@ class MapUndoManager {
     }
 }
 
+//FIXME: This is completely removed
 extension MapUndoManager {
 //    func finalizeSuccessfulSubmit(id: Int, type: ElementType) {
 //        let realm = try! Realm()
@@ -93,6 +94,7 @@ extension Map where Key == String, Value == String {
 }
 
 extension StoredElementEnum {
+    //FIXME: this is shown twice
     func toElementType() -> ElementType? {
         switch self {
         case .node: return .node

GoInfoGame/GoInfoGame/samplepoint.gpx

@@ -6,7 +6,7 @@
      waypoint, Xcode will simulate that specific location. If you provide multiple waypoints,
      Xcode will simulate a route visiting each waypoint.
      -->
-    <wpt lat="17.4620366048918" lon="78.380188562477">
+    <wpt lat="47.616061465392995" lon="-122.23018339129734">
         <name>Test Data</name>
 
         <!--

GoInfoGame/osmapi/models/OSMNode.swift

@@ -52,6 +52,26 @@ public struct OSMNode: Codable, OSMPayload, OSMElement, OSMCreatePayload {
 
     }
 
+    public func fetchInternalGigTags() -> [String:String] {
+        
+        var internalTags:[String:String] = [:]
+        let dateFormatter = DateFormatter()
+
+        // Set the date format to "yyyy-MM-dd"
+        dateFormatter.dateFormat = "yyyy-MM-dd"
+
+        // Create a Date object (for example, the current date)
+        let currentDate = Date()
+
+        // Convert the Date object to a formatted string
+        let formattedDate = dateFormatter.string(from: currentDate)
+        //"ext:gig_last_updated"
+        internalTags["ext:gig_last_updated"] = formattedDate
+        internalTags["ext:gig_complete"] = "yes"
+        
+        return internalTags
+    }
+    
     ///
     public func toPayload(exclude_gig_tags: Bool = false) -> String {
          var osmNode = "<modify>"

GoInfoGame/osmapi/models/OSMWay.swift

@@ -19,6 +19,28 @@ public struct OSMWayResponse: Codable {
 public struct OSMWay: Codable, OSMPayload, OSMElement  {
     public var isInteresting: Bool? = false
     public var isSkippable: Bool? = false
+    
+    public func fetchInternalGigTags() -> [String:String] {
+        
+        var internalTags:[String:String] = [:]
+        let dateFormatter = DateFormatter()
+
+        // Set the date format to "yyyy-MM-dd"
+        dateFormatter.dateFormat = "yyyy-MM-dd"
+
+        // Create a Date object (for example, the current date)
+        let currentDate = Date()
+
+        // Convert the Date object to a formatted string
+        let formattedDate = dateFormatter.string(from: currentDate)
+        //"ext:gig_last_updated"
+        internalTags["ext:gig_last_updated"] = formattedDate
+        internalTags["ext:gig_complete"] = "yes"
+        
+        return internalTags
+    }
+    
+    
     public func toPayload(exclude_gig_tags: Bool = false) -> String {
         var osmNode = "<modify>"
         let xmlBuilder = OSMXMLBuilder(rootName: "way")