[core] Swap order of Style::recalculate and Style::relayout

Style::relayout uses source.baseImpl->loaded, a flag which is updated by Style::recalculate. So recalculate first, then relayout.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 868b748af4..1efc1c063a 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -246,10 +246,6 @@ void Map::Impl::update() {
         annotationManager->updateData();
     }
 
-    if (updateFlags & Update::Layout) {
-        style->relayout();
-    }
-
     if (updateFlags & Update::Classes) {
         style->cascade(timePoint, mode);
     }
@@ -258,6 +254,10 @@ void Map::Impl::update() {
         style->recalculate(transform.getZoom(), timePoint, mode);
     }
 
+    if (updateFlags & Update::Layout) {
+        style->relayout();
+    }
+
     style::UpdateParameters parameters(pixelRatio,
                                        debugOptions,
                                        transform.getState(),