[core] Separated AnimationOptions from CameraOptions

2 files changed, 11 insertions, 11 deletions

diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp
index 73d7d5e7d2..87adc46910 100644
--- a/include/mbgl/map/camera.hpp
+++ b/include/mbgl/map/camera.hpp
@@ -11,13 +11,9 @@
 
 namespace mbgl {
 
-/** Various options for describing the viewpoint of a map, along with parameters
-    for transitioning to the viewpoint with animation. All fields are optional;
-    the default values of transition options depend on how this struct is used.
- */
+/** Various options for describing the viewpoint of a map. All fields are
+    optional. */
 struct CameraOptions {
-    // Viewpoint options
-    
     /** Coordinate at the center of the map. */
     mapbox::util::optional<LatLng> center;
     
@@ -32,9 +28,12 @@ struct CameraOptions {
     /** Pitch toward the horizon measured in radians, with 0 rad resulting in a
         two-dimensional map. */
     mapbox::util::optional<double> pitch;
-    
-    // Transition options
-    
+};
+
+/** Various options for describing a transition between viewpoints with
+    animation. All fields are optional; the default values depend on how this
+    struct is used. */
+struct AnimationOptions {
     /** Time to animate to the viewpoint defined herein. */
     mapbox::util::optional<Duration> duration;
     
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 2be31b5db6..4a6b85b28f 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -28,6 +28,7 @@ class Transform;
 class PointAnnotation;
 class ShapeAnnotation;
 struct CameraOptions;
+struct AnimationOptions;
 
 namespace util {
 template <class T> class Thread;
@@ -99,8 +100,8 @@ public:
 
     // Camera
     void jumpTo(const CameraOptions&);
-    void easeTo(const CameraOptions&);
-    void flyTo(const CameraOptions&);
+    void easeTo(const CameraOptions&, const AnimationOptions&);
+    void flyTo(const CameraOptions&, const AnimationOptions&);
 
     // Position
     void moveBy(const PrecisionPoint&, const Duration& = Duration::zero());