[Camera Animations] Introduce short-lived camera view

Apps/Examples/Examples/All Examples/CameraAnimatorsExample.swift

@@ -7,34 +7,39 @@ public class CameraAnimatorsExample: UIViewController, ExampleProtocol {
 
     internal var mapView: MapView!
 
+    // Coordinate in New York City
+    let newYork = CLLocationCoordinate2D(latitude: 40.7128, longitude: -74.0060)
+
     // Store the CameraAnimators so that the do not fall out of scope.
-    lazy var zoomAnimator: CameraAnimator = {
-        let animator = mapView.camera.makeCameraAnimator(duration: 4, curve: .easeInOut) { [unowned self] in
-            self.mapView.zoom = 14
+    lazy var zoomAnimator: BasicCameraAnimator = {
+        let animator = mapView.camera.makeAnimator(duration: 4, curve: .easeInOut) { (transition) in
+            transition.zoom.toValue = 14
         }
 
         animator.addCompletion { [unowned self] (_) in
+            print("Animating camera pitch from 0 degrees -> 55 degrees")
             self.pitchAnimator.startAnimation()
         }
 
         return animator
     }()
 
-    lazy var pitchAnimator: CameraAnimator = {
-        let animator = mapView.camera.makeCameraAnimator(duration: 2, curve: .easeInOut) { [unowned self] in
-            self.mapView.pitch = 55
+    lazy var pitchAnimator: BasicCameraAnimator = {
+        let animator = mapView.camera.makeAnimator(duration: 2, curve: .easeInOut) { (transition) in
+            transition.pitch.toValue = 55
         }
 
         animator.addCompletion { [unowned self] (_) in
+            print("Animating camera bearing from 0 degrees -> 45 degrees")
             self.bearingAnimator.startAnimation()
         }
 
         return animator
     }()
 
-    lazy var bearingAnimator: CameraAnimator = {
-        let animator = mapView.camera.makeCameraAnimator(duration: 4, curve: .easeInOut) { [unowned self] in
-            self.mapView.bearing = -45
+    lazy var bearingAnimator: BasicCameraAnimator = {
+        let animator = mapView.camera.makeAnimator(duration: 4, curve: .easeInOut) { (transition) in
+            transition.bearing.toValue = -45
         }
 
         animator.addCompletion { (_) in
@@ -51,13 +56,17 @@ public class CameraAnimatorsExample: UIViewController, ExampleProtocol {
         mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         view.addSubview(mapView)
 
-        // Center the map over New York City.
-        let newYork = CLLocationCoordinate2D(latitude: 40.7128, longitude: -74.0060)
-        mapView.camera.setCamera(to: CameraOptions(center: newYork))
+        mapView.on(.styleLoaded) { [weak self] _ in
+            guard let self = self else { return }
+            // Center the map over New York City.
+            self.mapView.camera.setCamera(to: CameraOptions(center: self.newYork))
+        }
 
         // Allows the delegate to receive information about map events.
         mapView.on(.mapLoaded) { [weak self] _ in
             guard let self = self else { return }
+
+            print("Animating zoom from zoom lvl 3 -> zoom lvl 14")
             self.zoomAnimator.startAnimation(afterDelay: 1)
             self.finish()
         }

Apps/Examples/Examples/All Examples/FlyToExample.swift

@@ -6,7 +6,6 @@ import MapboxMaps
 public class FlyToExample: UIViewController, ExampleProtocol {
 
     internal var mapView: MapView!
-    internal var flyToAnimator: CameraAnimator?
 
     override public func viewDidLoad() {
         super.viewDidLoad()
@@ -35,10 +34,9 @@ public class FlyToExample: UIViewController, ExampleProtocol {
                                 bearing: 180,
                                 pitch: 50)
 
-        flyToAnimator = self.mapView.camera.fly(to: end) { [weak self] _ in
+        mapView.camera.fly(to: end) { [weak self] _ in
             print("Camera fly-to finished")
             // The below line is used for internal testing purposes only.
-            self?.flyToAnimator = nil
             self?.finish()
         }
 

Apps/Examples/Examples/All Examples/GeoJSONSourceExample.swift

@@ -17,8 +17,9 @@ public class GeoJSONSourceExample: UIViewController, ExampleProtocol {
         // Set the center coordinate and zoom level.
         let centerCoordinate = CLLocationCoordinate2D(latitude: 18.239785,
                                                       longitude: -66.302490)
-        mapView.centerCoordinate = centerCoordinate
-        mapView.zoom = 6.9
+
+        mapView.camera.setCamera(to: CameraOptions(center: centerCoordinate,
+                                                          zoom: 6.9))
 
         // Allow the view controller to receive information about map events.
         mapView.on(.mapLoaded) { [weak self] _ in

CHANGELOG.md

@@ -23,6 +23,16 @@ Mapbox welcomes participation and contributions from everyone.
       * `Snapshotter` no longer conforms to `Observer`, and the method it required is now internal.
   * The `BaseMapView.__map` property has been moved to `BaseMapView.mapboxMap.__map`. ([#280](https://github.com/mapbox/mapbox-maps-ios/pull/280))
   * A `CameraOptions` struct has been introduced. This shadows the class of the same name from MapboxCoreMaps and. This avoids unintended sharing and better reflects the intended value semantics of the `CameraOptions` concept. ([#284](https://github.com/mapbox/mapbox-maps-ios/pull/284))
+
+  #### Camera Animations
+  * A new `CameraTransition` struct has been introduced to allow better control on the "from" and "to" values of a camera animation ([#282](https://github.com/mapbox/mapbox-maps-ios/pull/282))
+     * A mutable version of the `CameraTransition` struct is passed into every animation block.
+  * Animations can only be constructor injected into `CameraAnimator` as part of the `makeAnimator*` methods on `mapView.camera`.
+  * The `makeCameraAnimator*` methods have been renamed to `makeAnimator*` methods
+
+  #### Gestures
+  - Gestures now directly call `__map.setCamera()` instead of using CoreAnimation
+
 
 - #### Dependencies
   * Updated dependencies to MapboxCoreMaps 10.0.0-beta.20 and MapboxCommon 11.0.1