[core] Eliminate round-trip through Value in CameraFunction::evaluate

1 files changed, 10 insertions, 7 deletions

diff --git a/include/mbgl/style/function/interval_stops.hpp b/include/mbgl/style/function/interval_stops.hpp
index 50f2b48453..a482a6081c 100644
--- a/include/mbgl/style/function/interval_stops.hpp
+++ b/include/mbgl/style/function/interval_stops.hpp
@@ -18,18 +18,13 @@ public:
         : stops(std::move(stops_)) {
     }
 
-    optional<T> evaluate(const Value& value) const {
+    optional<T> evaluate(float z) const {
         if (stops.empty()) {
             assert(false);
             return {};
         }
 
-        optional<float> z = numericValue<float>(value);
-        if (!z) {
-            return {};
-        }
-
-        auto it = stops.upper_bound(*z);
+        auto it = stops.upper_bound(z);
         if (it == stops.end()) {
             return stops.rbegin()->second;
         } else if (it == stops.begin()) {
@@ -39,6 +34,14 @@ public:
         }
     }
 
+    optional<T> evaluate(const Value& value) const {
+        optional<float> z = numericValue<float>(value);
+        if (!z) {
+            return {};
+        }
+        return evaluate(*z);
+    }
+
     friend bool operator==(const IntervalStops& lhs,
                            const IntervalStops& rhs) {
         return lhs.stops == rhs.stops;