Initial fix.

Author: Jill Cardamon

Sources/MapboxCoreNavigation/NavigationService.swift

@@ -611,9 +611,28 @@ extension MapboxNavigationService: CLLocationManagerDelegate {
     // MARK: Handling LocationManager Output
 
     public func locationManager(_ manager: CLLocationManager, didUpdateHeading newHeading: CLHeading) {
+        // Check if device orientation has changed and inform the location provider accordingly.
+        updateHeadingForCurrentDeviceOrientation()
+        print("!!! device orientation: \(UIDevice.current.orientation)")
+        updateHeadingForCurrentDeviceOrientation()
         router.locationManager?(manager, didUpdateHeading: newHeading)
     }
 
+    public func updateHeadingForCurrentDeviceOrientation() {
+        var orientation: CLDeviceOrientation
+        switch UIDevice.current.orientation {
+        case .landscapeLeft:
+            orientation = .landscapeRight
+        case .landscapeRight:
+            orientation = .landscapeLeft
+        default:
+            orientation = .portrait
+        }
+        if locationManager.headingOrientation != orientation {
+            locationManager.headingOrientation = orientation
+        }
+    }
+    
     public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
         //If we're always simulating, make sure this is a simulated update.
         if simulationMode == .always, manager != simulatedLocationSource { return }

Sources/MapboxNavigation/NavigationViewController.swift

@@ -74,6 +74,15 @@ open class NavigationViewController: UIViewController, NavigationStatusPresenter
             navigationMapView.navigationCamera.viewportDataSource = NavigationViewportDataSource(navigationMapView.mapView,
                                                                                                  viewportDataSourceType: .active)
             navigationMapView.navigationCamera.follow()
+            
+            let viewportDataSource = navigationMapView.navigationCamera.viewportDataSource as? NavigationViewportDataSource
+            print("!!! orientation: \(navigationService.locationManager.headingOrientation)")
+//            print("!!! device orientation: \(UIDevice.current.orientation)")
+//            if navigationService.locationManager.headingOrientation == .landscapeLeft {
+//                print("!!! landscape left")
+//            } else if navigationService.locationManager.headingOrientation == .landscapeRight {
+//                print("!!! landscape right")
+//            }
         }
 
         // In case if `NavigationMapView` instance was injected - do not set initial camera options.
@@ -987,6 +996,9 @@ extension NavigationViewController: NavigationServiceDelegate {
 
         let movePuckToCurrentLocation = !(userArrivedAtWaypoint && snapsUserLocationAnnotationToRoute && preventRerouting)
         if movePuckToCurrentLocation {
+            if progress.currentLegProgress.currentStep.transportType == .walking && navigationMapView?.mapView.location.options.puckBearingSource == .course {
+                navigationMapView?.mapView.location.options.puckBearingSource = .heading
+            }
             navigationMapView?.moveUserLocation(to: location, animated: true)
         }
 

Sources/MapboxNavigation/NavigationViewportDataSource.swift

@@ -125,6 +125,7 @@ public class NavigationViewportDataSource: ViewportDataSource {
         NotificationCenter.default.post(name: .navigationCameraViewportDidChange, object: self, userInfo: [
             NavigationCamera.NotificationUserInfoKey.cameraOptions: cameraOptions
         ])
+        print("!!! device orientation: \(UIDevice.current.orientation)")
     }
 
     // MARK: CameraOptions Methods