Usage as non navigation map #275
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,13 +17,15 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn | |
| let navigationCamera: MapViewCamera | ||
|
|
||
| private var navigationState: NavigationState? | ||
| private let userLayers: () -> [StyleLayerDefinition] | ||
|
|
||
| private let mapViewModifiersWhenNotNavigating: (MapView<MLNMapViewController>) -> AnyView | ||
|
|
||
| public var topCenter: (() -> AnyView)? | ||
| public var topTrailing: (() -> AnyView)? | ||
| public var midLeading: (() -> AnyView)? | ||
| public var bottomTrailing: (() -> AnyView)? | ||
| var onTapExit: (() -> Void)? | ||
|
|
||
| public var minimumSafeAreaInsets: EdgeInsets | ||
|
|
@@ -44,21 +46,26 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn | |
| public init( | ||
| styleURL: URL, | ||
| camera: Binding<MapViewCamera>, | ||
| navigationCamera: MapViewCamera = .automotiveNavigation() | ||
| , | ||
| navigationState: NavigationState?, | ||
| minimumSafeAreaInsets: EdgeInsets = EdgeInsets(top: 16, leading: 16, bottom: 16, trailing: 16), | ||
| onTapExit: (() -> Void)? = nil, | ||
| @MapViewContentBuilder makeMapContent: @escaping () -> [StyleLayerDefinition] = { [] }, | ||
| mapViewModifiersWhenNotNavigating: @escaping (MapView<MLNMapViewController>) -> AnyView = { transferView in | ||
| AnyView(transferView) | ||
| } | ||
| ) { | ||
| self.styleURL = styleURL | ||
| self.navigationState = navigationState | ||
| self.minimumSafeAreaInsets = minimumSafeAreaInsets | ||
| self.onTapExit = onTapExit | ||
|
|
||
| userLayers = makeMapContent | ||
|
|
||
| _camera = camera | ||
| self.navigationCamera = navigationCamera | ||
| self.mapViewModifiersWhenNotNavigating = mapViewModifiersWhenNotNavigating | ||
| } | ||
|
|
||
| public var body: some View { | ||
|
|
@@ -69,11 +76,14 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn | |
| camera: $camera, | ||
| navigationState: navigationState, | ||
| onStyleLoaded: { _ in | ||
| if navigationState?.isNavigating == true { | ||
|
There was a problem hiding this comment. Will this be called when the user calls There was a problem hiding this comment. Nope - unless start navigation is called before the style completes. But this call here should only be seen as a fallback, something else should set the camera to navigation camera, like startNavigation. There was a problem hiding this comment. Idea for this concept generally. Could we extend the NavigationMapView with navigations state event view modifier(s) (e.g. There was a problem hiding this comment. We might not actually need this if we go with your suggestion (which I'll elaborate on in my review comments), since the modifiers get applied any time state changes ;) There was a problem hiding this comment. While we might not need it, it might still be convenient? one can already achieve this by a There was a problem hiding this comment. Yeah, fair point ;) I'm open to draft implementations from either of you if you think it's helpful. I originally was super enthusiastic when @Archdoog described it on our call but then realized it might not be a hard requirement with the other proposed changes. |
||
| camera = navigationCamera | ||
| } | ||
|
|
||
| }, | ||
| makeMapContent: userLayers, | ||
| mapViewModifiersWhenNotNavigating: mapViewModifiersWhenNotNavigating) | ||
|
|
||
| .navigationMapViewContentInset(NavigationMapViewContentInsetMode( | ||
| orientation: orientation, | ||
| geometry: geometry | ||
|
|
@@ -84,7 +94,7 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn | |
| LandscapeNavigationOverlayView( | ||
| navigationState: navigationState, | ||
| speedLimit: nil, | ||
| showZoom: navigationState?.isNavigating == true, | ||
|
There was a problem hiding this comment. Personally, I'd actually never like to show the zoom buttons, and rely only on pinch/tap to zoom in all cases. I wonder if a delegate query would be a better choice (or maybe init parameter is more conventional in SwiftUI? I'm still pretty new to SwiftUI and not confident on the conventions) There was a problem hiding this comment. I agree, I'm not a fan of zoom buttons either, but I wanted to keep it as close as possible to the current setup first :) There was a problem hiding this comment. All for that. The only reason I added the zoom buttons in the first place was to include them in the available UI components and to provide a simple verification for zoom behavior while navigating. Long term goal is the existing configurable static zoom as well as a fancier dynamic zoom per activity. E.g. zooms out when as route annotation speed increases. We're almost there on the "current annotation" state, so this probably won't be hard shortly. This can become as fancy as we want as long as various use cases are supported 👍 There was a problem hiding this comment. Yeah, this SHOULD be configurable. Thanks for pointing it out! On zoom or no zoom, that's a decision that app developers can make. I don't like the screen real estate, but OTOH, 80% of the time pinch zoom makes the camera stop following me (in every nav app I can think of), and that's ALMOST never what I wanted, so I can appreciate the button option ;) |
||
| onZoomIn: { camera.incrementZoom(by: 1) }, | ||
| onZoomOut: { camera.incrementZoom(by: -1) }, | ||
| showCentering: !camera.isTrackingUserLocationWithCourse, | ||
|
|
@@ -104,7 +114,7 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn | |
| PortraitNavigationOverlayView( | ||
| navigationState: navigationState, | ||
| speedLimit: nil, | ||
| showZoom: navigationState?.isNavigating == true, | ||
| onZoomIn: { camera.incrementZoom(by: 1) }, | ||
| onZoomOut: { camera.incrementZoom(by: -1) }, | ||
| showCentering: !camera.isTrackingUserLocationWithCourse, | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like a weird entry with your local machine details.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, yes I was referencing my local copy so that I could edit it directly in Xcode. Will fix in next commit.