note

Author: Achyut Kumar M

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -38,6 +38,8 @@ struct CustomMap: UIViewRepresentable {
 
     @Binding var tappedCoordinate: CLLocationCoordinate2D?
 
+    @Binding var annotationCoordinate: CLLocationCoordinate2D?
+    
     var shadowOverlay: ShadowOverlay
 
     // Creates and configures the UIView
@@ -364,6 +366,7 @@ struct CustomMap: UIViewRepresentable {
         }
 
         private func selectedAnAnnotation(selectedQuest: DisplayUnitAnnotation) {
+            parent.annotationCoordinate = selectedQuest.coordinate
             parent.selectedQuest = selectedQuest.displayUnit
             parent.isPresented = true
             var contextualString = ""

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -34,6 +34,8 @@ struct MapView: View {
 
     @State private var tappedCoordinate: CLLocationCoordinate2D? = nil
 
+    @State private var annotationCoordinate: CLLocationCoordinate2D? = nil
+    
     @State private var showMapLongPressedSheet = false
 
     @State private var showAddFeatureSheet = false
@@ -83,7 +85,7 @@ struct MapView: View {
                 print(contextualInfo)
                 selectedDetent = .fraction(0.8)
                 self.setContextualInfo(contextualinfo: contextualInfo)
-                }, useBingMaps: $useBingMaps, tappedCoordinate: $tappedCoordinate, shadowOverlay: shadowOverlay)
+                }, useBingMaps: $useBingMaps, tappedCoordinate: $tappedCoordinate, annotationCoordinate: $annotationCoordinate, shadowOverlay: shadowOverlay)
             .onChange(of: tappedCoordinate) { _ in
                 showMapLongPressedSheet = tappedCoordinate != nil
             }
@@ -366,10 +368,7 @@ struct MapView: View {
             }
 
         .sheet(isPresented: $isPresented, content: {
-            let selectedQuest = self.viewModel.getSelectedQuest()
-            CustomSheetView {
-                selectedQuest?.parent?.form
-            }
+            QuestSheetView(viewModel: viewModel, annotationCoordinate: annotationCoordinate)
             .onAppear {
                 shouldShowPolyline = true
             }
@@ -435,6 +434,32 @@ struct MapView: View {
     }
 }
 
+struct QuestSheetView: View {
+    @ObservedObject var viewModel: MapViewModel
+    let annotationCoordinate: CLLocationCoordinate2D?
+
+    init(viewModel: MapViewModel, annotationCoordinate: CLLocationCoordinate2D?) {
+        self.viewModel = viewModel
+        self.annotationCoordinate = annotationCoordinate
+
+        if let quest = viewModel.getSelectedQuest(),
+           let longQuest = quest.parent as? LongElementQuest {
+            longQuest.annotationCoordinate = annotationCoordinate
+        }
+    }
+
+    var body: some View {
+        Group {
+            if let selectedQuest = viewModel.getSelectedQuest() {
+                CustomSheetView {
+                    selectedQuest.parent?.form
+                }
+            } else {
+                EmptyView()
+            }
+        }
+    }
+}
 
 public class MapViewPublisher: ObservableObject {
     public let dismissSheet = PassthroughSubject<SheetDismissalScenario, Never>()

GoInfoGame/GoInfoGame/quests/LongQuests/Classes/LongElementQuest.swift

@@ -8,6 +8,7 @@
 import Foundation
 import osmparser
 import SwiftUI
+import CoreLocation
 
 class LongElementQuest: QuestBase, Quest {
 
@@ -75,6 +76,20 @@ class LongElementQuest: QuestBase, Quest {
 
     var questAnswersSelected: (([String:String]) -> Void)? = nil
 
+    var annotationCoordinate: CLLocationCoordinate2D? {
+          didSet {
+              updateForm()
+          }
+      }
+    
+    private func updateForm() {
+          self.internalForm = LongForm(
+            elementName: elementType, questID: questId, query: _internalQueryString, action: { [self] tags in
+                self.questAnswersSelected?(tags)
+            }, coordinate: annotationCoordinate ?? CLLocationCoordinate2D(latitude: 0, longitude: 0)
+          )
+      }
+    
     init(questId: String, questQuery:String, elementType: String) {
         super.init()
         self._internalQueryString = questQuery

GoInfoGame/GoInfoGame/quests/LongQuests/View/LongForm.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import CoreLocation
 
 
 struct LongForm: View, QuestForm {
@@ -24,6 +25,8 @@ struct LongForm: View, QuestForm {
 
     typealias AnswerClass = [String:String]
 
+    var coordinate: CLLocationCoordinate2D?
+    
     @Environment(\.presentationMode) var presentationMode
 
     @State private var showSubmitAlert = false
@@ -268,10 +271,17 @@ struct LongForm: View, QuestForm {
     }
 
     func submitNote() async throws {
-        print("Note to be submitted: \(noteText)")
+        print("Note to be submitted: \(noteText.htmlEscape())")
 
         do {
-            let notesResult = try await noteViewModel.createNote(note: noteText, lat: 0.0, long: 0.0)
+            //gt lat long from coordinate
+            let lat = coordinate?.latitude ?? 0.0
+            let long = coordinate?.longitude ?? 0.0
+            print("Latitude: \(lat), Longitude: \(long)")
+            
+            let noteToBeSubmitted = noteText.htmlEscape()
+            
+            let notesResult = try await noteViewModel.createNote(note: noteToBeSubmitted, lat: lat, long: long)
 
             if notesResult {
                 print("Notes composed successfully")