[core] #509 - Creating and using MIN_ZOOM and MAX_ZOOM constants

3 files changed, 6 insertions, 2 deletions

diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index 94b21ccb36..24f4b5ee72 100644
--- a/include/mbgl/util/constants.hpp
+++ b/include/mbgl/util/constants.hpp
@@ -18,6 +18,8 @@ extern const double M2PI;
 extern const double EARTH_RADIUS_M;
 extern const double LATITUDE_MAX;
 extern const double PITCH_MAX;
+extern const double MIN_ZOOM;
+extern const double MAX_ZOOM;
 
 } // namespace util
 
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
index 5373c6c03b..5e74f76229 100644
--- a/src/mbgl/map/transform_state.cpp
+++ b/src/mbgl/map/transform_state.cpp
@@ -162,7 +162,7 @@ double TransformState::getScale() const {
 
 void TransformState::setMinZoom(const double minZoom) {
     if (minZoom <= getMaxZoom()) {
-        min_scale = zoomScale(util::clamp(minZoom, 0.0, 25.5));
+        min_scale = zoomScale(util::clamp(minZoom, util::MIN_ZOOM, util::MAX_ZOOM));
     }
 }
 
@@ -177,7 +177,7 @@ double TransformState::getMinZoom() const {
 
 void TransformState::setMaxZoom(const double maxZoom) {
     if (maxZoom >= getMinZoom()) {
-        max_scale = zoomScale(util::clamp(maxZoom, 0.0, 25.5));
+        max_scale = zoomScale(util::clamp(maxZoom, util::MIN_ZOOM, util::MAX_ZOOM));
     }
 }
 
diff --git a/src/mbgl/util/constants.cpp b/src/mbgl/util/constants.cpp
index 1921e29610..0452dd19e5 100644
--- a/src/mbgl/util/constants.cpp
+++ b/src/mbgl/util/constants.cpp
@@ -20,6 +20,8 @@ const double mbgl::util::M2PI = 2 * M_PI;
 const double mbgl::util::EARTH_RADIUS_M = 6378137;
 const double mbgl::util::LATITUDE_MAX = 85.05112878;
 const double mbgl::util::PITCH_MAX = M_PI / 3;
+const double mbgl::util::MIN_ZOOM = 0.0;
+const double mbgl::util::MAX_ZOOM = 25.5;
 
 #if defined(DEBUG)
 const bool mbgl::debug::tileParseWarnings = false;