diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-07-02 15:44:41 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-07-30 13:32:43 +0300 |
commit | 2a48a139515ea00d2ec61c373b0f4d949e25dec7 (patch) | |
tree | 52803403a8090120aa296648fbcf333aae7681e9 | |
parent | e4281fb3c8732baa0b5b67c77642c1a012f6250f (diff) | |
download | qtlocation-mapboxgl-2a48a139515ea00d2ec61c373b0f4d949e25dec7.tar.gz |
[core] Remove unused Map::is{Rotating,Scaling,Panning}
-rw-r--r-- | include/mbgl/map/map.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/map/map.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/map/transform.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/map/transform.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/map/transform_state.cpp | 18 | ||||
-rw-r--r-- | src/mbgl/map/transform_state.hpp | 14 |
6 files changed, 21 insertions, 43 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 3aee932070..061c4ce5ee 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -56,11 +56,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 c177299485..923421b54d 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -252,18 +252,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 da8e243d91..99dc277882 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -130,9 +130,7 @@ void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& anim const double startScale = state.scale; const double startAngle = state.angle; const double startPitch = state.pitch; - state.panning = latLng != startLatLng; - state.scaling = scale != startScale; - state.rotating = angle != startAngle; + state.setTransitionInProgress(latLng != startLatLng || scale != startScale || angle != startAngle); startTransition(camera, animation, [=](double t) { Point<double> framePoint = util::interpolate(startPoint, endPoint, t); @@ -278,9 +276,7 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima } const double startScale = state.scale; - state.panning = true; - state.scaling = true; - state.rotating = angle != startAngle; + state.setTransitionInProgress(true); startTransition(camera, animation, [=](double k) { /// s: The distance traveled along the flight path, measured in @@ -602,9 +598,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 bff44a2dcd..145fc541d0 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -146,9 +146,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 948954570f..ff9bcb05e5 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -244,23 +244,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 b6f8ae4424..a65363523d 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -70,10 +70,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; @@ -119,11 +121,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; |