Merge pull request #1852 from mapbox/1ec5-carplay-custom-puck-1734

Allow CarPlayManagerDelegate to customize user location annotation views

Author: frederoni

CHANGELOG.md

@@ -9,9 +9,12 @@
 * Renamed `CarPlayManager(_:)` to `CarPlayManager(styles:directions:eventsManager:)` and `CarPlayNavigationViewController(with:mapTemplate:interfaceController:manager:styles:)` to `CarPlayNavigationViewController(navigationService:mapTemplate:interfaceController:manager:styles:)`. These initializers now accept an array of `Style` objects to apply throughout the CarPlay interface, similar to `NavigationViewController`. You can also change the styles at any time by setting the `CarPlayManager.styles` property. ([#1836](https://github.com/mapbox/mapbox-navigation-ios/pull/1836))
 * `CarPlayManager(styles:directions:eventsManager:)` also allows you to pass in a custom `Directions` object to use when calculating routes. ([#1834](https://github.com/mapbox/mapbox-navigation-ios/pull/1834/))
 * Removed the `StyleManager(_:)` initializer. After initializing a `StyleManager` object, set the `StyleManager.delegate` property to ensure that the style manager’s settings take effect. ([#1836](https://github.com/mapbox/mapbox-navigation-ios/pull/1836))
+* Added `CarPlayManager.mapView` and `CarPlayNavigationViewController.mapView` properties. ([#1852](https://github.com/mapbox/mapbox-navigation-ios/pull/1852))
 * Some additional members of `CarPlayManager` are now accessible in Objective-C code. ([#1836](https://github.com/mapbox/mapbox-navigation-ios/pull/1836))
 * Fixed an issue where distances are incorrectly displayed as “0 m” in regions that use the metric system. ([#1854](https://github.com/mapbox/mapbox-navigation-ios/pull/1854))
 * Fixed an issue where the user puck pointed away from the route line during turn-by-turn navigation in CarPlay. The map’s vanishing point now accounts for safe area insets, including the side maneuver view. ([#1845](https://github.com/mapbox/mapbox-navigation-ios/pull/1845))
+* Fixed an issue where the map view used for browsing and previewing failed to call `MGLMapViewDelegate.mapView(_:viewFor:)` and `MGLMapViewDelegate.mapViewWillStartLocatingUser(_:)`. ([#1852](https://github.com/mapbox/mapbox-navigation-ios/pull/1852))
+* You can now create a `UserPuckCourseView` using the `UserPuckCourseView(frame:)` initializer. ([#1852](https://github.com/mapbox/mapbox-navigation-ios/pull/1852))
 
 ### Other changes
 

MapboxNavigation/CarPlayManager.swift

@@ -144,6 +144,14 @@ public class CarPlayManager: NSObject {
         formatter.allowedUnits = [.day, .hour, .minute]
         return formatter
     }()
+    
+    /**
+     The main map view displayed inside CarPlay.
+     */
+    @objc public var mapView: NavigationMapView? {
+        let mapViewController = carWindow?.rootViewController as? CarPlayMapViewController
+        return mapViewController?.mapView
+    }
 }
 
 

MapboxNavigation/CarPlayMapViewController.swift

@@ -5,7 +5,7 @@ import CarPlay
 @available(iOS 12.0, *)
 class CarPlayMapViewController: UIViewController {
 
-    static let defaultAltitude: CLLocationDistance = 16000
+    static let defaultAltitude: CLLocationDistance = 850
 
     var styleManager: StyleManager?
 
@@ -100,7 +100,6 @@ class CarPlayMapViewController: UIViewController {
         styleManager!.styles = styles
 
         resetCamera(animated: false, altitude: CarPlayMapViewController.defaultAltitude)
-        mapView.setUserTrackingMode(.followWithCourse, animated: true)
     }
 
     override func viewWillDisappear(_ animated: Bool) {

MapboxNavigation/CarPlayNavigationViewController.swift

@@ -22,7 +22,12 @@ public class CarPlayNavigationViewController: UIViewController {
     @objc public var drivingSide: DrivingSide = .right
 
     var navService: NavigationService
-    var mapView: NavigationMapView?
+    
+    /**
+     The map view showing the route and the user’s location.
+     */
+    @objc public fileprivate(set) var mapView: NavigationMapView?
+    
     let shieldHeight: CGFloat = 16
     var mapViewLeftSafeAreaBalancingConstraint: NSLayoutConstraint?
     var mapViewRightSafeAreaBalancingConstraint: NSLayoutConstraint?

MapboxNavigation/UserCourseView.swift

@@ -81,7 +81,7 @@ public class UserPuckCourseView: UIView, UserCourseView {
 
     var puckView: UserPuckStyleKitView!
 
-    override init(frame: CGRect) {
+    public override init(frame: CGRect) {
         super.init(frame: frame)
         commonInit()
     }