[core] Remove unused Map::is{Rotating,Scaling,Panning}

7 files changed, 35 insertions, 45 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 55f2ab2895..4a007cd8c9 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -57,11 +57,10 @@ public:
 
     // Transition
     void cancelTransitions();
+
+    // Gesture
     void setGestureInProgress(bool);
     bool isGestureInProgress() const;
-    bool isRotating() const;
-    bool isScaling() const;
-    bool isPanning() const;
 
     // Camera
     CameraOptions getCameraOptions(const EdgeInsets& = {}) const;
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 7fe99e3867..75b74808f4 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -123,18 +123,6 @@ bool Map::isGestureInProgress() const {
     return impl->transform.isGestureInProgress();
 }
 
-bool Map::isRotating() const {
-    return impl->transform.isRotating();
-}
-
-bool Map::isScaling() const {
-    return impl->transform.isScaling();
-}
-
-bool Map::isPanning() const {
-    return impl->transform.isPanning();
-}
-
 #pragma mark -
 
 CameraOptions Map::getCameraOptions(const EdgeInsets& padding) const {
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 96aa5d2f4a..8c55a03186 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -127,9 +127,7 @@ void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& anim
     const double startScale = state.scale;
     const double startBearing = state.bearing;
     const double startPitch = state.pitch;
-    state.panning = unwrappedLatLng != startLatLng;
-    state.scaling = scale != startScale;
-    state.rotating = bearing != startBearing;
+    state.setTransitionInProgress(unwrappedLatLng != startLatLng || scale != startScale || bearing != startBearing);
 
     startTransition(camera, animation, [=](double t) {
         Point<double> framePoint = util::interpolate(startPoint, endPoint, t);
@@ -275,9 +273,7 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima
     }
 
     const double startScale = state.scale;
-    state.panning = true;
-    state.scaling = true;
-    state.rotating = bearing != startBearing;
+    state.setTransitionInProgress(true);
 
     startTransition(camera, animation, [=](double k) {
         /// s: The distance traveled along the flight path, measured in
@@ -510,9 +506,7 @@ void Transform::startTransition(const CameraOptions& camera,
     };
 
     transitionFinishFn = [isAnimated, animation, this] {
-        state.panning = false;
-        state.scaling = false;
-        state.rotating = false;
+        state.setTransitionInProgress(false);
         if (animation.transitionFinishFn) {
             animation.transitionFinishFn();
         }
diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp
index cf342181b1..fdc5adecb4 100644
--- a/src/mbgl/map/transform.hpp
+++ b/src/mbgl/map/transform.hpp
@@ -104,9 +104,6 @@ public:
 
     // Transform state
     const TransformState& getState() const { return state; }
-    bool isRotating() const { return state.isRotating(); }
-    bool isScaling() const { return state.isScaling(); }
-    bool isPanning() const { return state.isPanning(); }
 
     // Conversion and projection
     ScreenCoordinate latLngToScreenCoordinate(const LatLng&) const;
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
index e911067c5b..1e13327882 100644
--- a/src/mbgl/map/transform_state.cpp
+++ b/src/mbgl/map/transform_state.cpp
@@ -263,23 +263,23 @@ float TransformState::getPitch() const {
 #pragma mark - State
 
 bool TransformState::isChanging() const {
-    return rotating || scaling || panning || gestureInProgress;
+    return gestureInProgress || transitionInProgress;
 }
 
-bool TransformState::isRotating() const {
-    return rotating;
+bool TransformState::isGestureInProgress() const {
+    return gestureInProgress;
 }
 
-bool TransformState::isScaling() const {
-    return scaling;
+void TransformState::setGestureInProgress(bool gestureInProgress_) {
+    gestureInProgress = gestureInProgress_;
 }
 
-bool TransformState::isPanning() const {
-    return panning;
+bool TransformState::isTransitionInProgress() const {
+    return transitionInProgress;
 }
 
-bool TransformState::isGestureInProgress() const {
-    return gestureInProgress;
+void TransformState::setTransitionInProgress(bool transitionInProgress_) {
+    transitionInProgress = transitionInProgress_;
 }
 
 #pragma mark - Projection
diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp
index be7c300803..de99e8469d 100644
--- a/src/mbgl/map/transform_state.hpp
+++ b/src/mbgl/map/transform_state.hpp
@@ -74,10 +74,12 @@ public:
 
     // State
     bool isChanging() const;
-    bool isRotating() const;
-    bool isScaling() const;
-    bool isPanning() const;
+
     bool isGestureInProgress() const;
+    void setGestureInProgress(bool gestureInProgress);
+
+    bool isTransitionInProgress() const;
+    void setTransitionInProgress(bool transitionInProgress);
 
     // Conversion
     ScreenCoordinate latLngToScreenCoordinate(const LatLng&) const;
@@ -123,11 +125,9 @@ private:
     ConstrainMode constrainMode;
     ViewportMode viewportMode;
 
-    // animation state
-    bool rotating = false;
-    bool scaling = false;
-    bool panning = false;
+    // State
     bool gestureInProgress = false;
+    bool transitionInProgress = false;
 
     // map position
     double x = 0, y = 0;
diff --git a/test/map/transform.test.cpp b/test/map/transform.test.cpp
index 6e59ca37f3..7be145f3b4 100644
--- a/test/map/transform.test.cpp
+++ b/test/map/transform.test.cpp
@@ -472,13 +472,13 @@ TEST(Transform, Camera) {
     ASSERT_DOUBLE_EQ(transform.getLatLng().longitude(), 0);
 }
 
-TEST(Transform, IsPanning)
+TEST(Transform, TransitionInProgress)
 {
     Transform transform;
 
     AnimationOptions easeOptions(Seconds(1));
     easeOptions.transitionFrameFn = [&transform](double) {
-        ASSERT_TRUE(transform.getState().isPanning());
+        ASSERT_TRUE(transform.getState().isTransitionInProgress());
     };
 
     transform.resize({ 1000, 1000 });
@@ -487,6 +487,18 @@ TEST(Transform, IsPanning)
     transform.updateTransitions(transform.getTransitionStart() + Milliseconds(500));
     transform.updateTransitions(transform.getTransitionStart() + Milliseconds(750));
     transform.updateTransitions(transform.getTransitionStart() + transform.getTransitionDuration());
+
+    transform.easeTo(CameraOptions().withZoom(10.0), easeOptions);
+    transform.updateTransitions(transform.getTransitionStart() + Milliseconds(250));
+    transform.updateTransitions(transform.getTransitionStart() + Milliseconds(500));
+    transform.updateTransitions(transform.getTransitionStart() + Milliseconds(750));
+    transform.updateTransitions(transform.getTransitionStart() + transform.getTransitionDuration());
+
+    transform.easeTo(CameraOptions().withBearing(45.0), easeOptions);
+    transform.updateTransitions(transform.getTransitionStart() + Milliseconds(250));
+    transform.updateTransitions(transform.getTransitionStart() + Milliseconds(500));
+    transform.updateTransitions(transform.getTransitionStart() + Milliseconds(750));
+    transform.updateTransitions(transform.getTransitionStart() + transform.getTransitionDuration());
 }
 
 TEST(Transform, DefaultTransform) {