[core] Handle NaN input to interpolate and step

1 files changed, 3 insertions, 7 deletions

diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp
index b75f471ce3..ef4769df02 100644
--- a/src/mbgl/style/expression/value.cpp
+++ b/src/mbgl/style/expression/value.cpp
@@ -108,13 +108,9 @@ Value ValueConverter<float>::toExpressionValue(const float value) {
 }
 
 optional<float> ValueConverter<float>::fromExpressionValue(const Value& value) {
-    if (value.template is<double>()) {
-        double v = value.template get<double>();
-        if (v <= std::numeric_limits<float>::max()) {
-            return static_cast<float>(v);
-        }
-    }
-    return optional<float>();
+    return value.template is<double>()
+        ? static_cast<float>(value.template get<double>())
+        : optional<float>();
 }