Merge pull request #72 from TaskarCenterAtUW/ways-removed-emptytags

Removed empty tags.

Author: iAKM

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -32,20 +32,18 @@ class AppQuestManager {
     // Fetch the quests for a bounding box
     func fetchData(fromBBOx bbox: BBox,completion: @escaping () -> Void){
         // Get the data from bbox
-        let centralLocation = CLLocation(latitude: 37.7749, longitude: -122.4194) // San Francisco coords
-        let distance = 100
+      //  let distance = 100
         //37.41465820658871,-122.0912196996173,37.42366839341129,-122.0799229003827
-        let boundingCoordinates = centralLocation.boundingCoordinates(distance: CLLocationDistance(distance))
 
         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)
                 let allValues = response
-                let allElements = allValues.filter({!$0.tags.isEmpty})
+               // let allElements = allValues.filter({!$0.tags.isEmpty})
                 print("Saving tags")
                 DispatchQueue.main.async {
-                    self.dbInstance.saveOSMElements(allElements) // Save all where there are tags
+                    self.dbInstance.saveOSMElements(allValues) // Save all where there are tags
                     completion()
                 }
             case .failure(let error):

GoInfoGame/GoInfoGame/DataBase/DatabaseConnector.swift

@@ -31,7 +31,8 @@ class DatabaseConnector {
     func saveOSMElements(_ elements: [OSMElement]) {
         // Save the elements appropriately
         // Get the ways and nodes out
-        let nodes = elements.filter({$0 is OSMNode}).filter({!$0.tags.isEmpty})
+        //let nodes = elements.filter({$0 is OSMNode}).filter({$0.tags.isEmpty})
+        let nodes = elements
         let ways = elements.filter({$0 is OSMWay}).filter({!$0.tags.isEmpty})
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 import MapKit
 import CoreLocation
+import Combine
 
 struct MapView: View {
 
@@ -17,7 +18,8 @@ struct MapView: View {
     @Environment(\.presentationMode) private var presentationMode
     @AppStorage("isMapFromOnboarding") var isMapFromOnboarding: Bool = false
     @StateObject private var viewModel = MapViewModel()
-    
+    @State private var isPresented = false
+
     var body: some View {
 
         ZStack {
@@ -26,6 +28,7 @@ struct MapView: View {
                 MapAnnotation(coordinate: item.coordinateInfo) {
                     Button {
                         viewModel.selectedQuest = item.displayUnit
+                        isPresented = true
                         print(viewModel.selectedQuest as Any, "selectedQuest quest")
                     } label: {
                         Image(uiImage: item.displayUnit.parent?.icon ?? UIImage(imageLiteralResourceName: "mapPoint"))
@@ -46,16 +49,27 @@ struct MapView: View {
                 LoadingView()
             }
         }
-        .sheet(item: $viewModel.selectedQuest) { selectedQuest in
+        .sheet(isPresented: $isPresented, content: {
+            let selectedQuest = self.viewModel.selectedQuest
             if #available(iOS 16.0, *) {
-                selectedQuest.parent?.form.presentationDetents(getSheetSize(sheetSize: selectedQuest.sheetSize ?? .MEDIUM))
+                selectedQuest?.parent?.form.presentationDetents(getSheetSize(sheetSize: selectedQuest?.sheetSize ?? .MEDIUM))
             } else {
                 // Nothing here
             }
+        })
+        .onReceive(MapViewPublisher.shared.dismissSheet) { _ in
+            isPresented = false
         }
     }
 }
 
 #Preview {
     MapView()
 }
+
+
+public class MapViewPublisher: ObservableObject {
+    public let dismissSheet = PassthroughSubject<Bool, Never>()
+    static let shared = MapViewPublisher()
+    private init() {}
+}

GoInfoGame/GoInfoGame/quests/QuestProtocols.swift

@@ -49,9 +49,11 @@ class QuestBase {
 
        DatasyncManager.shared.syncDataToOSM {
            print("SYNC DONE")
+           DispatchQueue.main.async {
+               MapViewPublisher.shared.dismissSheet.send(true)
+           }
        }
     }
-    
 }
 // Adds default method and implementation
 extension Quest {