[core] default value support in categorical function conversion

1 files changed, 4 insertions, 6 deletions

diff --git a/include/mbgl/style/function/categorical_stops.hpp b/include/mbgl/style/function/categorical_stops.hpp
index 11ec2a0e5a..c8505115ab 100644
--- a/include/mbgl/style/function/categorical_stops.hpp
+++ b/include/mbgl/style/function/categorical_stops.hpp
@@ -21,20 +21,18 @@ public:
     using Stops = std::map<CategoricalValue, T>;
 
     Stops stops;
-    T defaultValue;
 
     CategoricalStops() = default;
-    CategoricalStops(Stops stops_, T defaultValue_ = T())
-        : stops(std::move(stops_)),
-          defaultValue(std::move(defaultValue_)) {
+    CategoricalStops(Stops stops_)
+        : stops(std::move(stops_)) {
         assert(stops.size() > 0);
     }
 
-    T evaluate(const Value&) const;
+    optional<T> evaluate(const Value&) const;
 
     friend bool operator==(const CategoricalStops& lhs,
                            const CategoricalStops& rhs) {
-        return lhs.stops == rhs.stops && lhs.defaultValue == rhs.defaultValue;
+        return lhs.stops == rhs.stops;
     }
 };