[core] Update after final frame of transition

The final frame is self-destructing – it destroys the frame and finish functions – so technically we’re no longer inTransition(). Yet there still needs to be an update after that final frame.

Also, avoid a redundant change notification on the last frame. (It would come too late, after the DidChange notification, anyhow.)

Fixes #2946.

2 files changed, 5 insertions, 2 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index f4db160c27..bca8b1edee 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -82,7 +82,7 @@ void Map::renderSync() {
 
     // Triggers an asynchronous update, that eventually triggers a view
     // invalidation, causing renderSync to be called again if in transition.
-    if (transform->inTransition()) {
+    if (flags != Update::Nothing) {
         update(flags);
     }
 }
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 87e86ea3e6..f0c5a136e0 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -275,7 +275,10 @@ void Transform::_easeTo(CameraOptions options, const double new_scale, const dou
                 state.Cc = s / util::M2PI;
                 state.angle = util::wrap(util::interpolate(startA, angle, t), -M_PI, M_PI);
                 state.pitch = util::interpolate(startP, pitch, t);
-                view.notifyMapChange(MapChangeRegionIsChanging);
+                // At t = 1.0, a DidChangeAnimated notification should be sent from finish().
+                if (t < 1.0) {
+                    view.notifyMapChange(MapChangeRegionIsChanging);
+                }
                 return update;
             },
             [=] {