First pass at the overall behavior

stadiamaps · Oct 31, 2024 · 4053e51 · 4053e51
1 parent 649a68c
commit 4053e51
Show file tree

Hide file tree

Showing 16 changed files with 157 additions and 53 deletions.
diff --git a/...ostarMapLibreUI/MapLibre Extensions.swift → ...reUI/Extensions/MapLibre Extensions.swift b/...ostarMapLibreUI/MapLibre Extensions.swift → ...reUI/Extensions/MapLibre Extensions.swift
diff --git a/apple/Sources/FerrostarMapLibreUI/Extensions/NavigationState.swift b/apple/Sources/FerrostarMapLibreUI/Extensions/NavigationState.swift
@@ -0,0 +1,30 @@
+import FerrostarCore
+import MapLibre
+import MapLibreSwiftUI
+
+extension NavigationState {
+    var routeOverviewCamera: MapViewCamera? {
+        guard let firstCoordinate = routeGeometry.first else {
+            return nil
+        }
+
+        let initial = MLNCoordinateBounds(
+            sw: firstCoordinate.clLocationCoordinate2D,
+            ne: firstCoordinate.clLocationCoordinate2D
+        )
+        let bounds = routeGeometry.reduce(initial) { acc, coord in
+            MLNCoordinateBounds(
+                sw: CLLocationCoordinate2D(latitude: min(acc.sw.latitude, coord.lat), longitude: min(
+                    acc.sw.longitude,
+                    coord.lng
+                )),
+                ne: CLLocationCoordinate2D(
+                    latitude: max(acc.ne.latitude, coord.lat),
+                    longitude: max(acc.ne.longitude, coord.lng)
+                )
+            )
+        }
+
+        return MapViewCamera.boundingBox(bounds, edgePadding: UIEdgeInsets(top: 20, left: 100, bottom: 20, right: 100))
+    }
+}
diff --git a/apple/Sources/FerrostarMapLibreUI/Views/DynamicallyOrientingNavigationView.swift b/apple/Sources/FerrostarMapLibreUI/Views/DynamicallyOrientingNavigationView.swift
@@ -28,6 +28,7 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn
     public var topCenter: (() -> AnyView)?
     public var topTrailing: (() -> AnyView)?
     public var midLeading: (() -> AnyView)?
+    public var bottomLeading: (() -> AnyView)?
     public var bottomTrailing: (() -> AnyView)?
 
     let isMuted: Bool
@@ -106,8 +107,13 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn
                         showZoom: true,
                         onZoomIn: { camera.incrementZoom(by: 1) },
                         onZoomOut: { camera.incrementZoom(by: -1) },
-                        showCentering: !camera.isTrackingUserLocationWithCourse,
-                        onCenter: { camera = navigationCamera },
+                        cameraControlState: camera.isTrackingUserLocationWithCourse ? .showRouteOverview {
+                            if let overviewCamera = navigationState?.routeOverviewCamera {
+                                camera = overviewCamera
+                            }
+                        } : .showRecenter { // TODO: Third case when not navigating!
+                            camera = navigationCamera
+                        },
                         onTapExit: onTapExit,
                         currentRoadNameView: currentRoadNameView
                     )
@@ -117,6 +123,8 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn
                         topTrailing?()
                     } midLeading: {
                         midLeading?()
+                    } bottomLeading: {
+                        bottomLeading?()
                     } bottomTrailing: {
                         bottomTrailing?()
                     }.complementSafeAreaInsets(parentGeometry: geometry, minimumInsets: minimumSafeAreaInsets)
@@ -131,8 +139,13 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn
                         showZoom: true,
                         onZoomIn: { camera.incrementZoom(by: 1) },
                         onZoomOut: { camera.incrementZoom(by: -1) },
-                        showCentering: !camera.isTrackingUserLocationWithCourse,
-                        onCenter: { camera = navigationCamera },
+                        cameraControlState: camera.isTrackingUserLocationWithCourse ? .showRouteOverview {
+                            if let overviewCamera = navigationState?.routeOverviewCamera {
+                                camera = overviewCamera
+                            }
+                        } : .showRecenter { // TODO: Third case when not navigating!
+                            camera = navigationCamera
+                        },
                         onTapExit: onTapExit,
                         currentRoadNameView: currentRoadNameView
                     )

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/LandscapeNavigationView.swift b/apple/Sources/FerrostarMapLibreUI/Views/LandscapeNavigationView.swift
@@ -27,6 +27,7 @@ public struct LandscapeNavigationView: View, CustomizableNavigatingInnerGridView
     public var topCenter: (() -> AnyView)?
     public var topTrailing: (() -> AnyView)?
     public var midLeading: (() -> AnyView)?
+    public var bottomLeading: (() -> AnyView)?
     public var bottomTrailing: (() -> AnyView)?
 
     let isMuted: Bool
@@ -99,8 +100,11 @@ public struct LandscapeNavigationView: View, CustomizableNavigatingInnerGridView
                     showZoom: true,
                     onZoomIn: { camera.incrementZoom(by: 1) },
                     onZoomOut: { camera.incrementZoom(by: -1) },
-                    showCentering: !camera.isTrackingUserLocationWithCourse,
-                    onCenter: { camera = navigationCamera },
+                    cameraControlState: camera.isTrackingUserLocationWithCourse ? CameraControlState.showRecenter {
+                        // TODO:
+                    } : .showRecenter {
+                        camera = navigationCamera
+                    },
                     onTapExit: onTapExit,
                     currentRoadNameView: currentRoadNameView
                 )
@@ -110,6 +114,8 @@ public struct LandscapeNavigationView: View, CustomizableNavigatingInnerGridView
                     topTrailing?()
                 } midLeading: {
                     midLeading?()
+                } bottomLeading: {
+                    bottomLeading?()
                 } bottomTrailing: {
                     bottomTrailing?()
                 }.complementSafeAreaInsets(parentGeometry: geometry, minimumInsets: minimumSafeAreaInsets)

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/Overylays/LandscapeNavigationOverlayView.swift b/apple/Sources/FerrostarMapLibreUI/Views/Overylays/LandscapeNavigationOverlayView.swift
@@ -16,6 +16,7 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
     var topCenter: (() -> AnyView)?
     var topTrailing: (() -> AnyView)?
     var midLeading: (() -> AnyView)?
+    var bottomLeading: (() -> AnyView)?
     var bottomTrailing: (() -> AnyView)?
 
     var speedLimit: Measurement<UnitSpeed>?
@@ -25,8 +26,7 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
     var onZoomIn: () -> Void
     var onZoomOut: () -> Void
 
-    var showCentering: Bool
-    var onCenter: () -> Void
+    var cameraControlState: CameraControlState
 
     var onTapExit: (() -> Void)?
     let currentRoadNameView: AnyView?
@@ -46,8 +46,7 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
         showZoom: Bool = false,
         onZoomIn: @escaping () -> Void = {},
         onZoomOut: @escaping () -> Void = {},
-        showCentering: Bool = false,
-        onCenter: @escaping () -> Void = {},
+        cameraControlState: CameraControlState = .hidden,
         onTapExit: (() -> Void)? = nil,
         currentRoadNameView: AnyView?
     ) {
@@ -60,8 +59,7 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
         self.showZoom = showZoom
         self.onZoomIn = onZoomIn
         self.onZoomOut = onZoomOut
-        self.showCentering = showCentering
-        self.onCenter = onCenter
+        self.cameraControlState = cameraControlState
         self.onTapExit = onTapExit
         self.currentRoadNameView = currentRoadNameView
     }
@@ -117,15 +115,16 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
                 showZoom: showZoom,
                 onZoomIn: onZoomIn,
                 onZoomOut: onZoomOut,
-                showCentering: showCentering,
-                onCenter: onCenter
+                cameraControlState: cameraControlState
             )
             .innerGrid {
                 topCenter?()
             } topTrailing: {
                 topTrailing?()
             } midLeading: {
                 midLeading?()
+            } bottomLeading: {
+                bottomLeading?()
             } bottomTrailing: {
                 bottomTrailing?()
             }

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/Overylays/PortraitNavigationOverlayView.swift b/apple/Sources/FerrostarMapLibreUI/Views/Overylays/PortraitNavigationOverlayView.swift
@@ -19,6 +19,7 @@ struct PortraitNavigationOverlayView<T: SpokenInstructionObserver & ObservableOb
     var topCenter: (() -> AnyView)?
     var topTrailing: (() -> AnyView)?
     var midLeading: (() -> AnyView)?
+    var bottomLeading: (() -> AnyView)?
     var bottomTrailing: (() -> AnyView)?
 
     var speedLimit: Measurement<UnitSpeed>?
@@ -28,8 +29,7 @@ struct PortraitNavigationOverlayView<T: SpokenInstructionObserver & ObservableOb
     var onZoomIn: () -> Void
     var onZoomOut: () -> Void
 
-    var showCentering: Bool
-    var onCenter: () -> Void
+    var cameraControlState: CameraControlState
 
     var onTapExit: (() -> Void)?
     let currentRoadNameView: AnyView?
@@ -48,8 +48,7 @@ struct PortraitNavigationOverlayView<T: SpokenInstructionObserver & ObservableOb
         showZoom: Bool = false,
         onZoomIn: @escaping () -> Void = {},
         onZoomOut: @escaping () -> Void = {},
-        showCentering: Bool = false,
-        onCenter: @escaping () -> Void = {},
+        cameraControlState: CameraControlState = .hidden,
         onTapExit: (() -> Void)? = nil,
         currentRoadNameView: AnyView?
     ) {
@@ -62,8 +61,7 @@ struct PortraitNavigationOverlayView<T: SpokenInstructionObserver & ObservableOb
         self.onMute = onMute
         self.onZoomIn = onZoomIn
         self.onZoomOut = onZoomOut
-        self.showCentering = showCentering
-        self.onCenter = onCenter
+        self.cameraControlState = cameraControlState
         self.onTapExit = onTapExit
         self.currentRoadNameView = currentRoadNameView
     }
@@ -86,15 +84,16 @@ struct PortraitNavigationOverlayView<T: SpokenInstructionObserver & ObservableOb
                     showZoom: showZoom,
                     onZoomIn: onZoomIn,
                     onZoomOut: onZoomOut,
-                    showCentering: showCentering,
-                    onCenter: onCenter
+                    cameraControlState: cameraControlState
                 )
                 .innerGrid {
                     topCenter?()
                 } topTrailing: {
                     topTrailing?()
                 } midLeading: {
                     midLeading?()
+                } bottomLeading: {
+                    bottomLeading?()
                 } bottomTrailing: {
                     bottomTrailing?()
                 }
@@ -103,7 +102,7 @@ struct PortraitNavigationOverlayView<T: SpokenInstructionObserver & ObservableOb
                    let progress = navigationState?.currentProgress
                 {
                     VStack {
-                        if !showCentering {
+                        if case .showRouteOverview = cameraControlState {
                             currentRoadNameView
                         }
 

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/PortraitNavigationView.swift b/apple/Sources/FerrostarMapLibreUI/Views/PortraitNavigationView.swift
@@ -24,6 +24,7 @@ public struct PortraitNavigationView: View, CustomizableNavigatingInnerGridView,
     public var topCenter: (() -> AnyView)?
     public var topTrailing: (() -> AnyView)?
     public var midLeading: (() -> AnyView)?
+    public var bottomLeading: (() -> AnyView)?
     public var bottomTrailing: (() -> AnyView)?
 
     public var minimumSafeAreaInsets: EdgeInsets
@@ -101,8 +102,11 @@ public struct PortraitNavigationView: View, CustomizableNavigatingInnerGridView,
                     showZoom: true,
                     onZoomIn: { camera.incrementZoom(by: 1) },
                     onZoomOut: { camera.incrementZoom(by: -1) },
-                    showCentering: !camera.isTrackingUserLocationWithCourse,
-                    onCenter: { camera = navigationCamera },
+                    cameraControlState: camera.isTrackingUserLocationWithCourse ? CameraControlState.showRecenter {
+                        // TODO:
+                    } : .showRecenter { // TODO: Third case when not navigating!
+                        camera = navigationCamera
+                    },
                     onTapExit: onTapExit,
                     currentRoadNameView: currentRoadNameView
                 )
@@ -112,6 +116,8 @@ public struct PortraitNavigationView: View, CustomizableNavigatingInnerGridView,
                     topTrailing?()
                 } midLeading: {
                     midLeading?()
+                } bottomLeading: {
+                    bottomLeading?()
                 } bottomTrailing: {
                     bottomTrailing?()
                 }.complementSafeAreaInsets(parentGeometry: geometry, minimumInsets: minimumSafeAreaInsets)

diff --git a/apple/Sources/FerrostarSwiftUI/ViewModifiers/CustomizableNavigatingInnerGridView.swift b/apple/Sources/FerrostarSwiftUI/ViewModifiers/CustomizableNavigatingInnerGridView.swift
@@ -5,6 +5,7 @@ public protocol CustomizableNavigatingInnerGridView where Self: View {
     var topCenter: (() -> AnyView)? { get set }
     var topTrailing: (() -> AnyView)? { get set }
     var midLeading: (() -> AnyView)? { get set }
+    var bottomLeading: (() -> AnyView)? { get set }
     var bottomTrailing: (() -> AnyView)? { get set }
 }
 
@@ -21,12 +22,14 @@ public extension CustomizableNavigatingInnerGridView {
         @ViewBuilder topCenter: @escaping () -> some View = { Spacer() },
         @ViewBuilder topTrailing: @escaping () -> some View = { Spacer() },
         @ViewBuilder midLeading: @escaping () -> some View = { Spacer() },
+        @ViewBuilder bottomLeading: @escaping () -> some View = { Spacer() },
         @ViewBuilder bottomTrailing: @escaping () -> some View = { Spacer() }
     ) -> Self {
         var newSelf = self
         newSelf.topCenter = { AnyView(topCenter()) }
         newSelf.topTrailing = { AnyView(topTrailing()) }
         newSelf.midLeading = { AnyView(midLeading()) }
+        newSelf.bottomLeading = { AnyView(bottomLeading()) }
         newSelf.bottomTrailing = { AnyView(bottomTrailing()) }
         return newSelf
     }

diff --git a/apple/Sources/FerrostarSwiftUI/Views/Controls/MuteUIButton.swift b/apple/Sources/FerrostarSwiftUI/Views/Controls/MuteUIButton.swift
@@ -12,6 +12,7 @@ public struct MuteUIButton: View {
     }
 
     public var body: some View {
+        // TODO: Use NavigationUIButton?
         Button(action: action) {
             Image(systemName: isMuted ? "speaker.slash.fill" : "speaker.2.fill")
                 .resizable()