Merge pull request #155 from TaskarCenterAtUW/feature-kartaview-image-path

Kartaview image path

Author: iAKM

GoInfoGame/GoInfoGame/Kartaview/Model/UploadPhotoModel.swift

@@ -27,11 +27,12 @@ struct PhotoOsv: Codable {
 struct Photo: Codable {
     let id, sequenceID, dateAdded, sequenceIndex: String
     let photoName, lat, lng: String
+    let path: String
 
     enum CodingKeys: String, CodingKey {
         case id
         case sequenceID = "sequenceId"
-        case dateAdded, sequenceIndex, photoName, lat, lng
+        case dateAdded, sequenceIndex, photoName, lat, lng, path
     }
 }
 

GoInfoGame/GoInfoGame/Kartaview/ViewModel/KartaviewViewModel.swift

@@ -19,7 +19,7 @@ class KartaviewViewModel: ObservableObject {
     }
 
     // Step 1: Create Sequence
-    func createSequence(completion: @escaping (Bool) -> ()) {
+    func createSequence(completion: @escaping (String, Bool) -> ()) {
         let kartaViewAccessToken = "96aca5c4b80709fc6d9aced613b51905c0fbc37870640d7bdabede269165bde7"
         let formData: [[String: Any]] =
         [["key": "access_token", "value": kartaViewAccessToken, "type": "text"]]
@@ -42,7 +42,7 @@ class KartaviewViewModel: ObservableObject {
         }
     }
 
-    func uploadPhoto(sequenceId: String, completion: @escaping (Bool) -> ()) {
+    func uploadPhoto(sequenceId: String, completion: @escaping (String, Bool) -> ()) {
         guard let imageData = imageToData(image: capturedImage) else {
             print("NO image found")
             return
@@ -87,15 +87,16 @@ class KartaviewViewModel: ObservableObject {
                 let status = success.status.httpCode
                 if status == 200 {
                     print("PHOTO UPLOADED ----->>>> PROCEEDING TO FINISH UPLOAD")
-                    self.finishUploading(sequenceId: sequenceId, completion: completion)
+                    let imagePath = "https://api.openstreetcam.org/" + "\(success.osv.photo.path)/" + "th/\(success.osv.photo.photoName)"
+                    self.finishUploading(path: imagePath,sequenceId: sequenceId, completion: completion)
                 }
             case .failure(let failure):
                 print("FAILED")
             }
         }
     }
 
-    func finishUploading(sequenceId: String, completion: @escaping (Bool) -> ()) {
+    func finishUploading(path: String, sequenceId: String, completion: @escaping (String, Bool) -> ()) {
         let kartaViewAccessToken = "96aca5c4b80709fc6d9aced613b51905c0fbc37870640d7bdabede269165bde7"
 
         let formData: [[String: Any]] = [
@@ -117,11 +118,11 @@ class KartaviewViewModel: ObservableObject {
                 let status = success.status.httpCode
                 if status == 200 {
                   print("PHOTO UPLOADED SUCCESSFULLY")
-                    completion(true)
+                    completion(path, true)
                 }
             case .failure(let failure):
                 print("FINISHING FAILED")
-                completion(false)
+                completion("An error occured", false)
             }
         }
     }

GoInfoGame/GoInfoGame/Network/APIEnvironment.swift

@@ -20,7 +20,7 @@ enum APIEnvironment: String, CaseIterable {
         case .staging:
             return "https://api.workspaces-stage.sidewalks.washington.edu/api/v1"
         case .production:
-            return "https://workspaces.sidewalks.washington.edu/api/v1"
+            return "https://api.workspaces.sidewalks.washington.edu/api/v1"
         }
     }
 

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

@@ -24,14 +24,22 @@ struct LongForm: View, QuestForm {
 
     @Environment(\.presentationMode) var presentationMode
 
-    @State private var shouldShowAlert = false
+    @State private var showSubmitAlert = false
 
-    @State private var alertMessage = ""
+    @State private var showKartaviewAlert = false
+    
+    @State private var submitAlert = ""
+    
+    @State private var kartaViewAlert = ""
 
     @State private var isCameraPresented = false
     @State private var capturedImage: UIImage?
 
     @State private var isLoading = false
+    
+    @State private var showImagePath = false
+    
+    @State private var imagePath = ""
 
     var body: some View {
         ZStack {
@@ -44,12 +52,6 @@ struct LongForm: View, QuestForm {
                         Text("ID: \(questID ?? "0")")
                             .font(.custom("Lato-Regular", size: 13))
                             .padding([.leading], 20)
-                       Spacer()
-                            Button(action: {
-                                isCameraPresented = true
-                            }, label: {
-                                Image(systemName: "camera")
-                            })
                     }
                     .padding(EdgeInsets(top: 20, leading: 20, bottom: 10, trailing: 20))
                     LongFormDismissButtonView {
@@ -72,15 +74,29 @@ struct LongForm: View, QuestForm {
                                         .answersToBeSubmitted[quest.questTag])
                                 }
                             }
+                            Button {
+                              isCameraPresented = true
+                            } label: {
+                                Text("Upload a picture")
+                            }
+                            
+                            
+                            if showImagePath {
+                                HStack {
+                                  Text("Image path: ")
+                                    Link("click here", destination: URL(string: imagePath)!)
+                                }
+                            }
+                            
                             VStack {
                                 Button(action: {
                                     if !viewModel.answersToBeSubmitted.isEmpty {
                                         if let action = action {
                                               action(viewModel.answersToBeSubmitted)
                                           }
                                     } else {
-                                        self.shouldShowAlert = true
-                                        self.alertMessage = "Please answer atleast one quest to submit"
+                                        self.showSubmitAlert = true
+                                        self.submitAlert = "Please answer atleast one quest to submit"
                                     }
 
                                 }) {
@@ -109,11 +125,11 @@ struct LongForm: View, QuestForm {
             .sheet(isPresented: $isCameraPresented) {
                 CameraView(capturedImage: $capturedImage, isPresented: $isCameraPresented)
                    }
-            .alert(self.alertMessage, isPresented: $shouldShowAlert) {
-                Button("OK", role: .cancel) { }
         }
+        .alert(self.submitAlert, isPresented: $showSubmitAlert) {
+            Button("OK", role: .cancel) { }
         }
-        if shouldShowAlert {
+        if showKartaviewAlert {
             VStack {
                 Image(systemName: "checkmark.circle.fill")
                     .resizable()
@@ -133,7 +149,7 @@ struct LongForm: View, QuestForm {
             .accessibilityLabel("Image uploaded to Kartaview")
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    shouldShowAlert = false // Dismiss notification box after 1 second
+                    showKartaviewAlert = false // Dismiss notification box after 1 second
                 }
             }
         }
@@ -153,10 +169,13 @@ struct LongForm: View, QuestForm {
     func uploadImageToKartaView() {
         isLoading = true
         let kvViewModel = KartaviewViewModel(capturedImage: capturedImage!)
-        kvViewModel.createSequence(completion: { result in
+        kvViewModel.createSequence(completion: { (path,result) in
             isLoading = false
-            alertMessage = result ? "Upload Successful" : "Upload Failed"
-            shouldShowAlert = true
+            kartaViewAlert = result ? "Upload Successful" : "Upload Failed"
+            showKartaviewAlert = true
+            showImagePath = true
+            imagePath = path
+            print("KARTAVIEW IMAGE PATH --->>>\(path)")
         })
     }