3 files changed, 0 insertions, 204 deletions
diff --git a/include/mbgl/style/function/camera_function.hpp b/include/mbgl/style/function/camera_function.hpp
deleted file mode 100644
index 65b7991849..0000000000
--- a/include/mbgl/style/function/camera_function.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-
-#include <mbgl/style/expression/expression.hpp>
-#include <mbgl/style/expression/value.hpp>
-#include <mbgl/style/expression/is_constant.hpp>
-#include <mbgl/style/expression/interpolate.hpp>
-#include <mbgl/style/expression/step.hpp>
-#include <mbgl/style/expression/find_zoom_curve.hpp>
-#include <mbgl/util/range.hpp>
-
-namespace mbgl {
-namespace style {
-
-template <class T>
-class CameraFunction {
-public:
-    // The second parameter should be used only for conversions from legacy functions.
-    CameraFunction(std::unique_ptr<expression::Expression> expression_, bool isExpression_ = true)
-         : isExpression(isExpression_),
-           expression(std::move(expression_)),
-           zoomCurve(expression::findZoomCurveChecked(expression.get())) {
-        assert(!expression::isZoomConstant(*expression));
-        assert(expression::isFeatureConstant(*expression));
-    }
-
-    T evaluate(float zoom) const {
-        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext(zoom, nullptr));
-        if (result) {
-           const optional<T> typed = expression::fromExpressionValue<T>(*result);
-           return typed ? *typed : T();
-        }
-        return T();
-    }
-    
-    float interpolationFactor(const Range<float>& inputLevels, const float inputValue) const {
-        return zoomCurve.match(
-            [&](const expression::Interpolate* z) {
-                return z->interpolationFactor(Range<double> { inputLevels.min, inputLevels.max }, inputValue);
-            },
-            [&](const expression::Step*) { return 0.0f; }
-        );
-    }
-    
-    Range<float> getCoveringStops(const float lower, const float upper) const {
-        return zoomCurve.match(
-            [&](auto z) { return z->getCoveringStops(lower, upper); }
-        );
-    }
-
-    std::vector<optional<T>> possibleOutputs() const {
-        return expression::fromExpressionValues<T>(expression->possibleOutputs());
-    }
-
-    friend bool operator==(const CameraFunction& lhs,
-                           const CameraFunction& rhs) {
-        return *lhs.expression == *rhs.expression;
-    }
-
-    bool useIntegerZoom = false;
-    bool isExpression;
-
-    const expression::Expression& getExpression() const { return *expression; }
-
-private:
-    std::shared_ptr<const expression::Expression> expression;
-    const variant<const expression::Interpolate*, const expression::Step*> zoomCurve;
-};
-
-} // namespace style
-} // namespace mbgl
diff --git a/include/mbgl/style/function/composite_function.hpp b/include/mbgl/style/function/composite_function.hpp
deleted file mode 100644
index 3b63bd005d..0000000000
--- a/include/mbgl/style/function/composite_function.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-
-#include <mbgl/style/expression/expression.hpp>
-#include <mbgl/style/expression/value.hpp>
-#include <mbgl/style/expression/is_constant.hpp>
-#include <mbgl/style/expression/interpolate.hpp>
-#include <mbgl/style/expression/step.hpp>
-#include <mbgl/style/expression/find_zoom_curve.hpp>
-#include <mbgl/util/range.hpp>
-
-namespace mbgl {
-namespace style {
-
-template <class T>
-class CompositeFunction {
-public:
-    // The second parameter should be used only for conversions from legacy functions.
-    CompositeFunction(std::unique_ptr<expression::Expression> expression_, optional<T> defaultValue_ = {})
-        : isExpression(defaultValue_),
-          expression(std::move(expression_)),
-          defaultValue(std::move(defaultValue_)),
-          zoomCurve(expression::findZoomCurveChecked(expression.get())) {
-        assert(!expression::isZoomConstant(*expression));
-        assert(!expression::isFeatureConstant(*expression));
-    }
-
-    // Return the range obtained by evaluating the function at each of the zoom levels in zoomRange
-    template <class Feature>
-    Range<T> evaluate(const Range<float>& zoomRange, const Feature& feature, T finalDefaultValue) {
-        return Range<T> {
-            evaluate(zoomRange.min, feature, finalDefaultValue),
-            evaluate(zoomRange.max, feature, finalDefaultValue)
-        };
-    }
-
-    template <class Feature>
-    T evaluate(float zoom, const Feature& feature, T finalDefaultValue) const {
-        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext({zoom}, &feature));
-        if (result) {
-            const optional<T> typed = expression::fromExpressionValue<T>(*result);
-            return typed ? *typed : defaultValue ? *defaultValue : finalDefaultValue;
-        }
-        return defaultValue ? *defaultValue : finalDefaultValue;
-    }
-    
-    float interpolationFactor(const Range<float>& inputLevels, const float inputValue) const {
-        return zoomCurve.match(
-            [&](const expression::Interpolate* z) {
-                return z->interpolationFactor(Range<double> { inputLevels.min, inputLevels.max }, inputValue);
-            },
-            [&](const expression::Step*) { return 0.0f; }
-        );
-    }
-    
-    Range<float> getCoveringStops(const float lower, const float upper) const {
-        return zoomCurve.match(
-            [&](auto z) { return z->getCoveringStops(lower, upper); }
-        );
-    }
-
-    std::vector<optional<T>> possibleOutputs() const {
-        return expression::fromExpressionValues<T>(expression->possibleOutputs());
-    }
-
-    friend bool operator==(const CompositeFunction& lhs,
-                           const CompositeFunction& rhs) {
-        return *lhs.expression == *rhs.expression;
-    }
-
-    const expression::Expression& getExpression() const { return *expression; }
-
-    bool useIntegerZoom = false;
-    bool isExpression;
-    
-private:
-    std::shared_ptr<const expression::Expression> expression;
-    optional<T> defaultValue;
-    const variant<const expression::Interpolate*, const expression::Step*> zoomCurve;
-};
-
-} // namespace style
-} // namespace mbgl
diff --git a/include/mbgl/style/function/source_function.hpp b/include/mbgl/style/function/source_function.hpp
deleted file mode 100644
index a83e73a5d0..0000000000
--- a/include/mbgl/style/function/source_function.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <mbgl/style/expression/expression.hpp>
-#include <mbgl/style/expression/value.hpp>
-#include <mbgl/style/expression/is_constant.hpp>
-
-namespace mbgl {
-namespace style {
-
-template <class T>
-class SourceFunction {
-public:
-    // The second parameter should be used only for conversions from legacy functions.
-    SourceFunction(std::unique_ptr<expression::Expression> expression_, optional<T> defaultValue_ = {})
-        : isExpression(defaultValue_),
-          expression(std::move(expression_)),
-          defaultValue(std::move(defaultValue_)) {
-        assert(expression::isZoomConstant(*expression));
-        assert(!expression::isFeatureConstant(*expression));
-    }
-    
-    template <class Feature>
-    T evaluate(const Feature& feature, T finalDefaultValue) const {
-        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext(&feature));
-        if (result) {
-            const optional<T> typed = expression::fromExpressionValue<T>(*result);
-            return typed ? *typed : defaultValue ? *defaultValue : finalDefaultValue;
-        }
-        return defaultValue ? *defaultValue : finalDefaultValue;
-    }
-
-    std::vector<optional<T>> possibleOutputs() const {
-        return expression::fromExpressionValues<T>(expression->possibleOutputs());
-    }
-
-    friend bool operator==(const SourceFunction& lhs,
-                           const SourceFunction& rhs) {
-        return *lhs.expression == *rhs.expression;
-    }
-
-    bool useIntegerZoom = false;
-    bool isExpression;
-
-    const expression::Expression& getExpression() const { return *expression; }
-
-private:
-    std::shared_ptr<const expression::Expression> expression;
-    optional<T> defaultValue;
-};
-
-} // namespace style
-} // namespace mbgl