[core] always add labels to buffers in MapMode::Still

To minimize label clipping.

3 files changed, 10 insertions, 2 deletions

diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index b1c867a692..5c6869ac77 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -132,6 +132,7 @@ void Style::update(const TransformState& transform,
                                      workers,
                                      texturePool,
                                      shouldReparsePartialTiles,
+                                     data.mode,
                                      data,
                                      *this);
 
diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp
index 5a84a33d48..732ebade1d 100644
--- a/src/mbgl/style/style_bucket_parameters.hpp
+++ b/src/mbgl/style/style_bucket_parameters.hpp
@@ -1,6 +1,7 @@
 #ifndef STYLE_BUCKET_PARAMETERS
 #define STYLE_BUCKET_PARAMETERS
 
+#include <mbgl/map/mode.hpp>
 #include <mbgl/style/filter_expression.hpp>
 #include <mbgl/map/tile_data.hpp>
 
@@ -26,7 +27,8 @@ public:
                           SpriteStore& spriteStore_,
                           GlyphAtlas& glyphAtlas_,
                           GlyphStore& glyphStore_,
-                          CollisionTile& collisionTile_)
+                          CollisionTile& collisionTile_,
+                          const MapMode mode_)
         : tileID(tileID_),
           layer(layer_),
           state(state_),
@@ -35,7 +37,8 @@ public:
           spriteStore(spriteStore_),
           glyphAtlas(glyphAtlas_),
           glyphStore(glyphStore_),
-          collisionTile(collisionTile_) {}
+          collisionTile(collisionTile_),
+          mode(mode_) {}
 
     bool cancelled() const {
         return state == TileData::State::obsolete;
@@ -52,6 +55,7 @@ public:
     GlyphAtlas& glyphAtlas;
     GlyphStore& glyphStore;
     CollisionTile& collisionTile;
+    const MapMode mode;
 };
 
 } // namespace mbgl
diff --git a/src/mbgl/style/style_update_parameters.hpp b/src/mbgl/style/style_update_parameters.hpp
index 7a0f34bf56..0a646219f0 100644
--- a/src/mbgl/style/style_update_parameters.hpp
+++ b/src/mbgl/style/style_update_parameters.hpp
@@ -20,6 +20,7 @@ public:
                           Worker& worker_,
                           TexturePool& texturePool_,
                           bool shouldReparsePartialTiles_,
+                          const MapMode mode_,
                           MapData& data_,
                           Style& style_)
         : pixelRatio(pixelRatio_),
@@ -29,6 +30,7 @@ public:
           worker(worker_),
           texturePool(texturePool_),
           shouldReparsePartialTiles(shouldReparsePartialTiles_),
+          mode(mode_),
           data(data_),
           style(style_) {}
 
@@ -39,6 +41,7 @@ public:
     Worker& worker;
     TexturePool& texturePool;
     bool shouldReparsePartialTiles;
+    const MapMode mode;
 
     // TODO: remove
     MapData& data;