From 80e4b2f1abfb59cf956d8fdea4576e566357ba25 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Sun, 13 Aug 2017 12:20:03 +0300
Subject: [core] Update ZoomHistory.lastInteger{Zoom,Time} if different from
 floor zoom

---
 src/mbgl/map/zoom_history.hpp | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'src/mbgl/map')

diff --git a/src/mbgl/map/zoom_history.hpp b/src/mbgl/map/zoom_history.hpp
index 697e28573c..ddec53e6af 100644
--- a/src/mbgl/map/zoom_history.hpp
+++ b/src/mbgl/map/zoom_history.hpp
@@ -8,34 +8,39 @@ namespace mbgl {
 
 struct ZoomHistory {
     float lastZoom;
+    float lastFloorZoom;
     float lastIntegerZoom;
     TimePoint lastIntegerZoomTime;
     bool first = true;
 
     bool update(float z, const TimePoint& now) {
         constexpr TimePoint zero = TimePoint(Duration::zero());
+        const float floorZ = std::floor(z);
+
         if (first) {
             first = false;
-            lastIntegerZoom = std::floor(z);
+            lastIntegerZoom = floorZ;
             lastIntegerZoomTime = zero;
             lastZoom = z;
+            lastFloorZoom = floorZ;
+            return true;
+        }
+
+        if (lastFloorZoom > floorZ) {
+            lastIntegerZoom = floorZ + 1;
+            lastIntegerZoomTime = now == Clock::time_point::max() ? zero : now;
+        } else if (lastFloorZoom < floorZ || lastIntegerZoom != floorZ) {
+            lastIntegerZoom = floorZ;
+            lastIntegerZoomTime = now == Clock::time_point::max() ? zero : now;
+        }
+
+        if (z != lastZoom) {
+            lastZoom = z;
+            lastFloorZoom = floorZ;
             return true;
-        } else {
-            if (std::floor(lastZoom) < std::floor(z)) {
-                lastIntegerZoom = std::floor(z);
-                lastIntegerZoomTime = now == Clock::time_point::max() ? zero : now;
-            } else if (std::floor(lastZoom) > std::floor(z)) {
-                lastIntegerZoom = std::floor(z + 1);
-                lastIntegerZoomTime = now == Clock::time_point::max() ? zero : now;
-            }
-
-            if (z != lastZoom) {
-                lastZoom = z;
-                return true;
-            }
-
-            return false;
         }
+
+        return false;
     }
 };
 
-- 
cgit v1.2.1