diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-12-23 10:17:07 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-12-24 16:24:45 -0800 |
commit | 07cf1824d0539a3dde2f99625af231f84bf838b6 (patch) | |
tree | 5d35ee4ffb4a271440ed22a10743297410d769de /src/mbgl/map | |
parent | 63820d1b4f96b4e2370fd6567a8f77149117620e (diff) | |
download | qtlocation-mapboxgl-07cf1824d0539a3dde2f99625af231f84bf838b6.tar.gz |
[core] Constrain minimum zoom level
Diffstat (limited to 'src/mbgl/map')
-rw-r--r-- | src/mbgl/map/transform_state.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index a41003e0db..2a594cef1a 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -169,16 +169,16 @@ double TransformState::getScale() const { } double TransformState::getMinZoom() const { - double test_scale = scale; + double test_scale = min_scale; double unused_x = x; double unused_y = y; constrain(test_scale, unused_x, unused_y); - return ::log2(::fmin(min_scale, test_scale)); + return scaleZoom(test_scale); } double TransformState::getMaxZoom() const { - return ::log2(max_scale); + return scaleZoom(max_scale); } |