use Clock::time_point::max() instead of frame time

For Style::cascade and Style::recalculate, when rendering with
  MapMode::Still. Fixes a subtle race condition with animated
  transitions exacerbated by cd1a06c2dc.
This commit is contained in:
Mike Morris
2016-04-25 18:41:32 -04:00
parent b39d289920
commit 93b7d245f6

View File

@@ -175,7 +175,7 @@ void Style::cascade(const TimePoint& timePoint, MapMode mode) {
const StyleCascadeParameters parameters {
classIDs,
timePoint,
mode == MapMode::Continuous ? timePoint : Clock::time_point::max(),
mode == MapMode::Continuous ? transitionProperties.value_or(immediateTransition) : immediateTransition
};
@@ -195,7 +195,7 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) {
const StyleCalculationParameters parameters {
z,
timePoint,
mode == MapMode::Continuous ? timePoint : Clock::time_point::max(),
zoomHistory,
mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero()
};