diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-01 10:14:07 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-04 14:45:32 +0200 |
commit | 74538406e9e7f9444e491ea23b7dc52f63d77e73 (patch) | |
tree | de33864711e71a4de4054ce64729309f914e6caa /src/mbgl | |
parent | 586b22c0df99dec7e2089ba938cfbd8f96b3ce18 (diff) | |
download | qtlocation-mapboxgl-74538406e9e7f9444e491ea23b7dc52f63d77e73.tar.gz |
[core] Organize Map::{move,pitch,scale,rotate}By
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/map/map.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index e2b56b8d55..7fe99e3867 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -159,21 +159,27 @@ void Map::flyTo(const CameraOptions& camera, const AnimationOptions& animation) impl->onUpdate(); } -#pragma mark - Position - void Map::moveBy(const ScreenCoordinate& point, const AnimationOptions& animation) { impl->cameraMutated = true; impl->transform.moveBy(point, animation); impl->onUpdate(); } -#pragma mark - Zoom +void Map::pitchBy(double pitch, const AnimationOptions& animation) { + easeTo(CameraOptions().withPitch((impl->transform.getPitch() * util::RAD2DEG) - pitch), animation); +} void Map::scaleBy(double scale, optional<ScreenCoordinate> anchor, const AnimationOptions& animation) { const double zoom = impl->transform.getZoom() + impl->transform.getState().scaleZoom(scale); easeTo(CameraOptions().withZoom(zoom).withAnchor(anchor), animation); } +void Map::rotateBy(const ScreenCoordinate& first, const ScreenCoordinate& second, const AnimationOptions& animation) { + impl->cameraMutated = true; + impl->transform.rotateBy(first, second, animation); + impl->onUpdate(); +} + CameraOptions Map::cameraForLatLngBounds(const LatLngBounds& bounds, const EdgeInsets& padding, optional<double> bearing, optional<double> pitch) const { return cameraForLatLngs({ bounds.northwest(), @@ -270,12 +276,6 @@ LatLngBounds Map::latLngBoundsForCamera(const CameraOptions& camera) const { ); } -#pragma mark - Pitch - -void Map::pitchBy(double pitch, const AnimationOptions& animation) { - easeTo(CameraOptions().withPitch((impl->transform.getPitch() * util::RAD2DEG) - pitch), animation); -} - #pragma mark - Bounds optional<LatLngBounds> Map::getLatLngBounds() const { @@ -343,14 +343,6 @@ Size Map::getSize() const { return impl->transform.getState().getSize(); } -#pragma mark - Rotation - -void Map::rotateBy(const ScreenCoordinate& first, const ScreenCoordinate& second, const AnimationOptions& animation) { - impl->cameraMutated = true; - impl->transform.rotateBy(first, second, animation); - impl->onUpdate(); -} - #pragma mark - North Orientation void Map::setNorthOrientation(NorthOrientation orientation) { |