[core] Reset zoom history state in still modeupstream/api-zoomhistory-v2

2 files changed, 15 insertions, 2 deletions

diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index 21d56feea9..03ba518b5a 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -68,8 +68,15 @@ void Renderer::Impl::setObserver(RendererObserver* observer_) {
 }
 
 void Renderer::Impl::render(const UpdateParameters& updateParameters) {
-    // Don't load/render anyting in still mode until explicitly requested.
-    if (updateParameters.mode == MapMode::Still && !updateParameters.stillImageRequest) return;
+    if (updateParameters.mode == MapMode::Still) {
+        // Don't load/render anyting in still mode until explicitly requested.
+        if (!updateParameters.stillImageRequest) {
+            return;
+        }
+
+        // Reset zoom history state.
+        zoomHistory.first = true;
+    }
     
     assert(BackendScope::exists());
     
diff --git a/test/api/zoom_history.cpp b/test/api/zoom_history.cpp
index 3c60a5e2f2..1b1159bf52 100644
--- a/test/api/zoom_history.cpp
+++ b/test/api/zoom_history.cpp
@@ -62,4 +62,10 @@ TEST(API, ZoomHistory) {
     // ZoomHistory.lastIntegerZoom should be 0.
     map->setZoom(0.5);
     test::checkImage("test/fixtures/zoom_history", frontend.render(*map), 0.0002);
+
+    map->setZoom(1.0);
+    frontend.render(*map);
+
+    map->setZoom(0.5);
+    test::checkImage("test/fixtures/zoom_history", frontend.render(*map), 0.0002);
 }