From 511c01c6ca7070556b1e652996ba93ff6b7cbd19 Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Wed, 3 Feb 2016 18:31:14 -0600
Subject: [core] #509 - Adding min / max checks to parameters and refactoring
 to utilize clamp function

---
 src/mbgl/map/transform_state.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'src/mbgl')

diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
index 41f71197c4..5373c6c03b 100644
--- a/src/mbgl/map/transform_state.cpp
+++ b/src/mbgl/map/transform_state.cpp
@@ -161,14 +161,9 @@ double TransformState::getScale() const {
 }
 
 void TransformState::setMinZoom(const double minZoom) {
-    double zoom = minZoom;
-    if (minZoom > 25.5) {
-        zoom = 25.5;
+    if (minZoom <= getMaxZoom()) {
+        min_scale = zoomScale(util::clamp(minZoom, 0.0, 25.5));
     }
-    if (minZoom < 0) {
-        zoom = 0.0;
-    }
-    min_scale = zoomScale(zoom);
 }
 
 double TransformState::getMinZoom() const {
@@ -181,14 +176,9 @@ double TransformState::getMinZoom() const {
 }
 
 void TransformState::setMaxZoom(const double maxZoom) {
-    double zoom = maxZoom;
-    if (maxZoom > 25.5) {
-        zoom = 25.5;
-    }
-    if (maxZoom < 0) {
-        zoom = 0.0;
+    if (maxZoom >= getMinZoom()) {
+        max_scale = zoomScale(util::clamp(maxZoom, 0.0, 25.5));
     }
-    max_scale = zoomScale(zoom);
 }
 
 double TransformState::getMaxZoom() const {
-- 
cgit v1.2.1