feat: add interactive view on origin/destination data

OTPKit/Features/MapExtension/MapMarkingView.swift

@@ -24,6 +24,7 @@ public struct MapMarkingView: View {
                 Button {
                     locationManagerService.toggleMapMarkingMode(false)
                     locationManagerService.selectAndRefreshCoordinate()
+                    locationManagerService.removeOriginDestinationData()
                 } label: {
                     Text("Cancel")
                         .padding(8)
@@ -33,6 +34,7 @@ public struct MapMarkingView: View {
 
                 Button {
                     locationManagerService.toggleMapMarkingMode(false)
+                    locationManagerService.addOriginDestinationData()
                     locationManagerService.selectAndRefreshCoordinate()
                 } label: {
                     Text("Add Pin")

OTPKit/Features/OriginDestination/Sheets/OriginDestinationSheetView.swift

@@ -167,7 +167,7 @@ public struct OriginDestinationSheetView: View {
             ForEach(locationManagerService.completions) { location in
                 Button(action: {
                     locationManagerService.appendMarker(location: location)
-
+                    locationManagerService.addOriginDestinationData()
                     switch UserDefaultsServices.shared.saveRecentLocations(data: location) {
                     case .success:
                         dismiss()
@@ -192,6 +192,7 @@ public struct OriginDestinationSheetView: View {
             if let userLocation = locationManagerService.currentLocation {
                 Button(action: {
                     locationManagerService.appendMarker(location: userLocation)
+                    locationManagerService.addOriginDestinationData()
                     switch UserDefaultsServices.shared.saveRecentLocations(data: userLocation) {
                     case .success:
                         dismiss()

OTPKit/Features/TripPlanner/TripPlannerSheetView.swift

@@ -0,0 +1,76 @@
+//
+//  TripPlannerSheetView.swift
+//  OTPKit
+//
+//  Created by Hilmy Veradin on 25/07/24.
+//
+
+import SwiftUI
+
+public struct TripPlannerSheetView: View {
+    @ObservedObject private var locationManagerService = LocationManagerService.shared
+    @Environment(\.dismiss) var dismiss
+
+    public init() {}
+
+    private func formatTimeDuration(_ duration: Int) -> String {
+        if duration < 60 {
+            return "Total duration: \(duration) second\(duration > 1 ? "s" : "")"
+        } else if duration < 3600 {
+            let minutes = Double(duration) / 60
+            return String(format: "Total duration: %.1f minutes", minutes)
+        } else {
+            let hours = Double(duration) / 3600
+            return String(format: "Total duration: %.1f hours", hours)
+        }
+    }
+
+    private func formatDistance(_ distance: Int) -> String {
+        if distance < 1000 {
+            return "Total distance: \(distance) meters"
+        } else {
+            let miles = Double(distance) / 1609.34
+            return String(format: "Total distance: %.1f miles", miles)
+        }
+    }
+
+    public var body: some View {
+        VStack {
+            if let itineraries = locationManagerService.planResponse?.plan?.itineraries {
+                List(itineraries, id: \.self) { itinerary in
+                    let distance = itinerary.legs.map(\.distance).reduce(0, +)
+                    Button(action: {
+                        locationManagerService.selectedIternary = itinerary
+                        locationManagerService.planResponse = nil
+                        dismiss()
+                    }, label: {
+                        VStack(alignment: .leading) {
+                            Text(formatTimeDuration(itinerary.duration))
+                            Text(formatDistance(Int(distance)))
+                        }
+
+                    })
+                }
+            } else {
+                Text("Can't find trip planner. Please try another pin point")
+            }
+
+            Button(action: {
+                locationManagerService.resetTripPlanner()
+                dismiss()
+            }, label: {
+                Text("Cancel")
+                    .frame(maxWidth: .infinity)
+                    .padding()
+                    .background(Color.gray)
+                    .foregroundStyle(Color.white)
+                    .clipShape(RoundedRectangle(cornerRadius: 12))
+                    .padding(.horizontal, 16)
+            })
+        }
+    }
+}
+
+#Preview {
+    TripPlannerSheetView()
+}

OTPKit/Features/TripPlanner/TripPlannerView.swift

@@ -2,30 +2,41 @@
 //  TripPlannerView.swift
 //  OTPKit
 //
-//  Created by Hilmy Veradin on 25/07/24.
+//  Created by Hilmy Veradin on 30/07/24.
 //
 
 import SwiftUI
 
 public struct TripPlannerView: View {
     @ObservedObject private var locationManagerService = LocationManagerService.shared
-    @Environment(\.dismiss) var dismiss
 
     public init() {}
+
     public var body: some View {
-        if let itineraries = locationManagerService.planResponse?.plan?.itineraries {
-            List(itineraries, id: \.self) { itinerary in
-                Button(action: {
-                    locationManagerService.selectedIternary = itinerary
+        VStack {
+            Button(action: {
+                locationManagerService.resetTripPlanner()
+            }, label: {
+                Text("Start")
+            })
+            .frame(maxWidth: .infinity)
+            .padding()
+            .background(Color.gray)
+            .foregroundStyle(Color.white)
+            .clipShape(RoundedRectangle(cornerRadius: 12))
+            .padding(.horizontal, 16)
 
-                    locationManagerService.planResponse = nil
-                    dismiss()
-                }, label: {
-                    Text("Total Duration: \(itinerary.duration)")
-                })
-            }
-        } else {
-            Text("Can't find location")
+            Button(action: {
+                locationManagerService.resetTripPlanner()
+            }, label: {
+                Text("Cancel")
+            })
+            .frame(maxWidth: .infinity)
+            .padding()
+            .background(Color.gray)
+            .foregroundStyle(Color.white)
+            .clipShape(RoundedRectangle(cornerRadius: 12))
+            .padding(.horizontal, 16)
         }
     }
 }

OTPKit/Services/LocationManagerService.swift

@@ -113,18 +113,38 @@ public final class LocationManagerService: NSObject, ObservableObject {
         case .origin:
             selectedMapPoint["origin"] = markerItem
             changeMapCamera(mapItem)
-            originName = mapItem.name ?? "Location unknown"
-            originCoordinate = coordinate
         case .destination:
             selectedMapPoint["destination"] = markerItem
             changeMapCamera(mapItem)
-            destinationName = mapItem.name ?? "Location unknown"
-            destinationCoordinate = coordinate
+        }
+    }
+
+    public func addOriginDestinationData() {
+        switch originDestinationState {
+        case .origin:
+            originName = selectedMapPoint["origin"]??.item.name ?? "Location unknown"
+            originCoordinate = selectedMapPoint["origin"]??.item.placemark.coordinate
+        case .destination:
+            destinationName = selectedMapPoint["destination"]??.item.name ?? "Location unknown"
+            destinationCoordinate = selectedMapPoint["destination"]??.item.placemark.coordinate
         }
 
         checkAndFetchTripPlanner()
     }
 
+    public func removeOriginDestinationData() {
+        switch originDestinationState {
+        case .origin:
+            originName = "Origin"
+            originCoordinate = nil
+            selectedMapPoint["origin"] = nil
+        case .destination:
+            destinationName = "Destination"
+            destinationCoordinate = nil
+            selectedMapPoint["destination"] = nil
+        }
+    }
+
     public func toggleMapMarkingMode(_ isMapMarking: Bool) {
         isMapMarkingMode = isMapMarking
     }
@@ -142,21 +162,16 @@ public final class LocationManagerService: NSObject, ObservableObject {
     public func generateMapPolyline() -> MapPolyline? {
         guard let itinerary = selectedIternary else { return nil }
 
-        // Experiment on using steps compactmap
+        // Use steps to calculate the Location Coordinate
         let coordinates = itinerary.legs.flatMap { leg in
             leg.steps?.compactMap { step in
                 CLLocationCoordinate2D(latitude: step.lat, longitude: step.lon)
             } ?? []
         }
 
-//        let coordinates = itinerary.legs.flatMap { leg in
-//            [CLLocationCoordinate2D(latitude: leg.from.lat, longitude: leg.from.lon),
-//             CLLocationCoordinate2D(latitude: leg.to.lat, longitude: leg.to.lon)]
-//        }
-
-        print("---", coordinates, "---")
+        let coodinateExists = !coordinates.isEmpty
 
-        guard !coordinates.isEmpty else { return nil }
+        guard coodinateExists else { return nil }
 
         return MapPolyline(coordinates: coordinates)
     }

OTPKitDemo/MapView.swift

@@ -57,17 +57,23 @@ public struct MapView: View {
                     OriginDestinationSheetView()
                         .environmentObject(sheetEnvironment)
                 }
-                .sheet(isPresented: isPlanResponsePresented, onDismiss: {
-//                    locationManagerService.resetTripPlanner()
-//                    locationManagerService.planResponse = nil
-                }, content: {
-                    TripPlannerView()
+                .sheet(isPresented: isPlanResponsePresented, content: {
+                    TripPlannerSheetView()
                         .presentationDetents([.medium, .large])
-//                        .interactiveDismissDisabled()
                 })
             }
+
+            if locationManagerService.isFetchingResponse {
+                ProgressView()
+            }
+
             if locationManagerService.isMapMarkingMode {
                 MapMarkingView()
+            } else if locationManagerService.selectedIternary != nil {
+                VStack {
+                    Spacer()
+                    TripPlannerView()
+                }
             } else {
                 VStack {
                     Spacer()