diff --git a/src/mbgl/style/piecewisefunction_properties.hpp b/src/mbgl/style/piecewisefunction_properties.hpp index 69ddc7cc2..769020002 100644 --- a/src/mbgl/style/piecewisefunction_properties.hpp +++ b/src/mbgl/style/piecewisefunction_properties.hpp @@ -10,8 +10,8 @@ namespace mbgl { template struct PiecewiseConstantFunction { inline PiecewiseConstantFunction(const std::vector> &values_, std::chrono::duration duration_) : values(values_), duration(duration_) {} - inline PiecewiseConstantFunction(T &value) : values({{ 0, value }}), duration(300) {} - inline PiecewiseConstantFunction() : values(), duration(300) {} + inline PiecewiseConstantFunction(T &value) : values({{ 0, value }}), duration(std::chrono::milliseconds(300)) {} + inline PiecewiseConstantFunction() : values(), duration(std::chrono::milliseconds(300)) {} T evaluate(float z, const ZoomHistory &zoomHistory) const; private: diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index c6d3c8666..a334cecc0 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -341,7 +341,7 @@ std::tuple> StyleParser::parseFunction(JSVal value) { return std::tuple> { true, StopsFunction(std::get<1>(stops), base) }; } -template inline std::chrono::duration defaultDurationValue() { return std::chrono::duration(300.0f); } +template inline std::chrono::duration defaultDurationValue() { return std::chrono::milliseconds(300); } template std::tuple> StyleParser::parsePiecewiseConstantFunction(JSVal value) { @@ -355,7 +355,7 @@ std::tuple> StyleParser::parsePiecewiseConsta if (value.HasMember("duration")) { JSVal value_duration = value["duration"]; if (value_duration.IsNumber()) { - duration = static_cast>(value_duration.GetDouble()); + duration = std::chrono::milliseconds(value_duration.GetUint()); } else { Log::Warning(Event::ParseStyle, "duration must be numeric"); } diff --git a/src/mbgl/style/zoom_history.hpp b/src/mbgl/style/zoom_history.hpp index eee0d9b44..248868710 100644 --- a/src/mbgl/style/zoom_history.hpp +++ b/src/mbgl/style/zoom_history.hpp @@ -17,7 +17,7 @@ struct ZoomHistory { first = false; lastIntegerZoom = std::floor(z); - lastIntegerZoomTime = std::chrono::steady_clock::time_point::min(); + lastIntegerZoomTime = std::chrono::steady_clock::time_point(std::chrono::steady_clock::duration(0)); lastZoom = z; }