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) {