diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-02-24 09:06:43 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-02-24 09:06:43 -0800 |
commit | 17f44d7bd99f2c44e45eadc36d671dc29c88c64d (patch) | |
tree | 6b6b534e0d4ca0c06cc9fbfdc17aada2d60870b0 /src/mbgl/map/transform_state.cpp | |
parent | 662edea0202b296874894d6df6817f0993ec24a7 (diff) | |
parent | f74900e7046d31721cc4b3e0c0678e85a989cf12 (diff) | |
download | qtlocation-mapboxgl-17f44d7bd99f2c44e45eadc36d671dc29c88c64d.tar.gz |
Merge branch 'release-ios-v3.1.0'
Diffstat (limited to 'src/mbgl/map/transform_state.cpp')
-rw-r--r-- | src/mbgl/map/transform_state.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index 42fbd9af87..087defabda 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -81,6 +81,12 @@ double TransformState::getNorthOrientationAngle() const { return angleOrientation; } +#pragma mark - Constrain mode + +ConstrainMode TransformState::getConstrainMode() const { + return constrainMode; +} + #pragma mark - Position LatLng TransformState::getLatLng() const { @@ -354,8 +360,10 @@ void TransformState::constrain(double& scale_, double& x_, double& y_) const { x_ = std::max(-max_x, std::min(x_, max_x)); } - double max_y = (scale_ * util::tileSize - (rotatedNorth() ? width : height)) / 2; - y_ = std::max(-max_y, std::min(y_, max_y)); + if (constrainMode != ConstrainMode::None) { + double max_y = (scale_ * util::tileSize - (rotatedNorth() ? width : height)) / 2; + y_ = std::max(-max_y, std::min(y_, max_y)); + } } void TransformState::moveLatLng(const LatLng& latLng, const PrecisionPoint& anchor) { |