[core] Split MapMode::Still into Static and Tile

`Tile` makes sure the symbols in the resulting tile are tileable while
symbols in `Still` match rendering in `Continuous` mode.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 1503db1d83..84753c6ea9 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -154,7 +154,9 @@ bool Placement::commit(const Placement& prevPlacement, TimePoint now) {
 
     bool placementChanged = false;
 
-    float increment = mapMode == MapMode::Still ? 1.0 : std::chrono::duration<float>(commitTime - prevPlacement.commitTime) / Duration(std::chrono::milliseconds(300));
+    float increment = mapMode == MapMode::Continuous ?
+        std::chrono::duration<float>(commitTime - prevPlacement.commitTime) / Duration(std::chrono::milliseconds(300)) :
+        1.0;
 
     // add the opacities from the current placement, and copy their current values from the previous placement
     for (auto& placementPair : placements) {
@@ -275,10 +277,11 @@ JointOpacityState Placement::getOpacity(uint32_t crossTileSymbolID) const {
 }
 
 float Placement::symbolFadeChange(TimePoint now) const {
-    if (mapMode == MapMode::Still) {
+    if (mapMode == MapMode::Continuous) {
+        return std::chrono::duration<float>(now - commitTime) / Duration(std::chrono::milliseconds(300));
+    } else {
         return 1.0;
     }
-    return std::chrono::duration<float>(now - commitTime) / Duration(std::chrono::milliseconds(300));
 }
 
 bool Placement::hasTransitions(TimePoint now) const {