diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-18 11:29:58 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-19 08:11:41 +0300 |
commit | f01a829dc9e076abeb7df90259e8e5c7d9cfbad6 (patch) | |
tree | d852d68a4629044c138ad4445c4d7e3c37079af0 /src/mbgl/map/transform.cpp | |
parent | 3a12dd2d4fec398bc84f88cfddc2ac4a37c3a7f1 (diff) | |
download | qtlocation-mapboxgl-f01a829dc9e076abeb7df90259e8e5c7d9cfbad6.tar.gz |
[core] Move TransformState::worldSize() to Projection
Diffstat (limited to 'src/mbgl/map/transform.cpp')
-rw-r--r-- | src/mbgl/map/transform.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index bf511ed670..71e7739b5a 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -7,6 +7,7 @@ #include <mbgl/util/unitbezier.hpp> #include <mbgl/util/interpolate.hpp> #include <mbgl/util/chrono.hpp> +#include <mbgl/util/projection.hpp> #include <mbgl/math/clamp.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/platform/platform.hpp> @@ -131,8 +132,8 @@ void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& anim Duration duration = animation.duration ? *animation.duration : Duration::zero(); - const double startWorldSize = state.worldSize(); const double startScale = state.scale; + const double startWorldSize = Projection::worldSize(startScale); const double startAngle = state.angle; const double startPitch = state.pitch; state.panning = latLng != startLatLng; @@ -288,8 +289,7 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima return; } - const double startWorldSize = state.worldSize(); - + const double startWorldSize = Projection::worldSize(state.scale); state.panning = true; state.scaling = true; state.rotating = angle != startAngle; |