diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-23 16:25:24 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-27 21:38:36 +0200 |
commit | 20ca1a041868955524b3f2475ebc83760398ca82 (patch) | |
tree | 2745a77cbd0483d739af0eb0c5654fadfabf20a5 /src/mbgl/map/transform_state.cpp | |
parent | e8f7866e9e3328bb4d40da172fb5a549315fd486 (diff) | |
download | qtlocation-mapboxgl-20ca1a041868955524b3f2475ebc83760398ca82.tar.gz |
[core] Cleanup Transform, use {jump,ease}To() instead
Diffstat (limited to 'src/mbgl/map/transform_state.cpp')
-rw-r--r-- | src/mbgl/map/transform_state.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index 4de795d469..554a72cf4a 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -133,21 +133,20 @@ ViewportMode TransformState::getViewportMode() const { #pragma mark - Camera options CameraOptions TransformState::getCameraOptions(const EdgeInsets& padding) const { - CameraOptions camera; - + LatLng center; if (padding.isFlush()) { - camera.center = getLatLng(); + center = getLatLng(); } else { ScreenCoordinate point = padding.getCenter(size.width, size.height); point.y = size.height - point.y; - camera.center = screenCoordinateToLatLng(point).wrapped(); + center = screenCoordinateToLatLng(point).wrapped(); } - camera.padding = padding; - camera.zoom = getZoom(); - camera.angle = -angle * util::RAD2DEG; - camera.pitch = pitch * util::RAD2DEG; - - return camera; + return CameraOptions() + .withCenter(center) + .withPadding(padding) + .withZoom(getZoom()) + .withAngle(-angle * util::RAD2DEG) + .withPitch(pitch * util::RAD2DEG); } #pragma mark - Position |