summaryrefslogtreecommitdiff
path: root/src/mbgl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl')
-rw-r--r--src/mbgl/map/map.cpp4
-rw-r--r--src/mbgl/style/style.cpp4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 7544760927..96b8b88044 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -226,9 +226,7 @@ void Map::Impl::render(View& view) {
return;
}
- TimePoint timePoint = mode == MapMode::Continuous
- ? Clock::now()
- : Clock::time_point::max();
+ TimePoint timePoint = Clock::now();
transform.updateTransitions(timePoint);
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index e75925f476..a03a18fdaf 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -306,13 +306,13 @@ void Style::update(const UpdateParameters& parameters) {
const bool zoomChanged = zoomHistory.update(parameters.transformState.getZoom(), parameters.timePoint);
const TransitionParameters transitionParameters {
- parameters.timePoint,
+ parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(),
parameters.mode == MapMode::Continuous ? transitionOptions : TransitionOptions()
};
const PropertyEvaluationParameters evaluationParameters {
zoomHistory,
- parameters.timePoint,
+ parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(),
parameters.mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero()
};