Merge pull request #165 from TaskarCenterAtUW/feature-hide-quest

Hide osw element

Author: iAKM

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -79,7 +79,7 @@ class AppQuestManager {
                         // Create a duplicate of the quest
                         // Create a display Unit
                         let duplicateQuest = quest.quest.copyWithElement(element: nodeElement!)
-                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: nodeElement!.position.latitude, longitude: nodeElement!.position.longitude), id: nodeElement!.id)
+                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: nodeElement!.position.latitude, longitude: nodeElement!.position.longitude), id: nodeElement!.id, isHidden: false)
                         return unit
                     }
             }
@@ -94,7 +94,7 @@ class AppQuestManager {
                         // Need to add another here.
                         let duplicateQuest = quest.quest.copyWithElement(element: wayElement!)
                         let position  = dbInstance.getCenterForWay(id: String(wayElement!.id)) ?? CLLocationCoordinate2D()
-                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo: position, id: wayElement!.id)
+                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo: position, id: wayElement!.id, isHidden: false)
                     return unit
                     }
             }
@@ -144,7 +144,7 @@ class AppQuestManager {
                         // Create a duplicate of the quest
                         // Create a display Unit
                         let duplicateQuest = quest.quest.copyWithElement(element: node)
-                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: node.position.latitude, longitude: node.position.longitude), id: node.id)
+                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo:  CLLocationCoordinate2D(latitude: node.position.latitude, longitude: node.position.longitude), id: node.id, isHidden: false)
                         displayUnits.append(unit)
                         nodeQuests.append(duplicateQuest)
                         break
@@ -160,7 +160,7 @@ class AppQuestManager {
                         // Need to add another here.
                         let duplicateQuest = quest.quest.copyWithElement(element: way)
                         let position  = dbInstance.getCenterForWay(id: String(way.id)) ?? CLLocationCoordinate2D()
-                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo: position, id: way.id)
+                        let unit = DisplayUnitWithCoordinate(displayUnit: duplicateQuest.displayUnit, coordinateInfo: position, id: way.id, isHidden: false)
                         displayUnits.append(unit)
     //                    if(quest is SideWalkWidth){
     //                        if let q = quest as? SideWalkWidth {

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -16,7 +16,7 @@ struct CustomMap: UIViewRepresentable {
     var region: MKCoordinateRegion
     var userLocation = CLLocationCoordinate2D(latitude: 17.4700, longitude: 78.3534)
     @Binding var trackingMode: MapUserTrackingMode
-    var items: [DisplayUnitWithCoordinate]
+   @Binding var items: [DisplayUnitWithCoordinate]
     @Binding var selectedQuest: DisplayUnit?
     @Binding var shouldShowPolyline: Bool
     @Binding var isPresented: Bool
@@ -274,19 +274,26 @@ struct CustomMap: UIViewRepresentable {
         context.coordinator.isRegionSet = true
 
 
-        let annotations = items.map({$0.annotation})
+        let visibleAnnotations = items
+               .filter { !$0.isHidden }
+               .map { $0.annotation }
 
         if (existingCoordinates.isEmpty) {
            // print("Adding annotations completely")
 
 //            for (index, annotation) in annotations.enumerated() {
 //                annotation.coordinate = adjustCoordinateForOverlap(annotation.coordinate, with: index)
 //            }
-            mapView.addAnnotations(annotations)
+            mapView.addAnnotations(visibleAnnotations)
         }
 
         let currentAnnotations = Set(mapView.annotations.compactMap { $0 as? DisplayUnitAnnotation })
-        let newAnnotations = Set(items.map({$0.annotation}))
+        
+        let currentVisibleAnnotations = items
+               .filter { !$0.isHidden }
+               .map { $0.annotation }
+        
+        let newAnnotations = Set(currentVisibleAnnotations)
 
         let annotationsToRemove = currentAnnotations.subtracting(newAnnotations)
         let annotationsToAdd = newAnnotations.subtracting(currentAnnotations)

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -24,18 +24,20 @@ struct MapView: View {
 
     @State private var selectedDetent: PresentationDetent = .fraction(0.8)
 
+    @State private var showPopover = false
+    
     @AppStorage("baseUrl") var baseUrl = ""
 
     var body: some View {
             ZStack{
                 CustomMap(region: viewModel.region,
                           userLocation: viewModel.userlocation,
                           trackingMode: $trackingMode,
-                          items: viewModel.items,
+                          items: $viewModel.items,
                           selectedQuest: $viewModel.selectedQuest,
                           shouldShowPolyline: $shouldShowPolyline,
 
-                          isPresented: $isPresented, contextualInfo: { contextualInfo in
+                          isPresented: $showPopover, contextualInfo: { contextualInfo in
                     print(contextualInfo)
                     selectedDetent = .fraction(0.8)
                     self.setContextualInfo(contextualinfo: contextualInfo)
@@ -114,6 +116,28 @@ struct MapView: View {
             }
             .toolbarBackground(.visible, for: .navigationBar)
 
+            .popover(isPresented: $showPopover) {
+                            VStack {
+                                Button("Hide Quest") {
+                                    viewModel.hideQuest(elementId: viewModel.selectedQuest!.parent!.displayUnit.id)
+                                    showPopover = false
+                                }
+                                .padding()
+                                
+                                Button("Answer Quest") {
+                                    showPopover = false
+                                    isPresented = true
+                                }
+                                .padding()
+                            }
+                            .onAppear {
+                                shouldShowPolyline = true
+                            }
+                            .frame(width: 200, height: 100)
+                            .presentationDetents([.fraction(0.5)])
+                        }
+           
+        
         .sheet(isPresented: $isPresented, content: {
             let selectedQuest = self.viewModel.selectedQuest
             CustomSheetView {
@@ -123,9 +147,7 @@ struct MapView: View {
             .scrollDisabled(false)
             .interactiveDismissDisabled()
             .environmentObject(contextualInfo)
-            .onAppear {
-                shouldShowPolyline = true
-            }
+           
         })
         .onReceive(MapViewPublisher.shared.dismissSheet) { scenario in
 

GoInfoGame/GoInfoGame/UI/Map/MapViewModel.swift

@@ -95,6 +95,15 @@ class MapViewModel: ObservableObject {
             }
       //  }
     }
+    
+    func hideQuest(elementId: String) {
+        print(elementId)
+        let questId = elementId.components(separatedBy: "-").first ?? ""
+        if let toBeHidden = self.items.first(where: {$0.id == Int(questId)!}) {
+            let index = self.items.firstIndex(where: {$0.id == Int(questId)!})
+            items[index!].isHidden = true
+        }
+    }
 
     private func boundingBoxAroundLocation(location: CLLocationCoordinate2D, distance: CLLocationDistance) -> BBox {
         let region = MKCoordinateRegion(center: location, latitudinalMeters: distance, longitudinalMeters: distance)

GoInfoGame/GoInfoGame/quests/QuestsRepository.swift

@@ -102,7 +102,7 @@ class QuestsRepository: ObservableObject {
                 return DisplayUnitWithCoordinate(
                     displayUnit: quest.quest.displayUnit,
                     coordinateInfo: randomCoordinate,
-                    id:Int64.random(in: 2...90000)
+                    id:Int64.random(in: 2...90000), isHidden: false
                 )
             }
     }
@@ -165,6 +165,7 @@ struct DisplayUnitWithCoordinate: Identifiable {
     let displayUnit: DisplayUnit
     let coordinateInfo: CLLocationCoordinate2D
     let id: Int64
+    var isHidden: Bool
 
     var annotation: DisplayUnitAnnotation {
         return DisplayUnitAnnotation(displayUnit: displayUnit, coordinate: coordinateInfo)