EvaluationParameters => EvaluationContext

29 files changed, 54 insertions, 54 deletions

diff --git a/include/mbgl/style/expression/array_assertion.hpp b/include/mbgl/style/expression/array_assertion.hpp
index aebd5375c9..1b0e766c13 100644
--- a/include/mbgl/style/expression/array_assertion.hpp
+++ b/include/mbgl/style/expression/array_assertion.hpp
@@ -20,7 +20,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
 private:
diff --git a/include/mbgl/style/expression/assertion.hpp b/include/mbgl/style/expression/assertion.hpp
index c419f747a0..635ec5eff1 100644
--- a/include/mbgl/style/expression/assertion.hpp
+++ b/include/mbgl/style/expression/assertion.hpp
@@ -18,7 +18,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
 private:
diff --git a/include/mbgl/style/expression/at.hpp b/include/mbgl/style/expression/at.hpp
index 6b27a42d74..f04b24dcb7 100644
--- a/include/mbgl/style/expression/at.hpp
+++ b/include/mbgl/style/expression/at.hpp
@@ -18,7 +18,7 @@ public:
     
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
     
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>&) const override;
 
 private:
diff --git a/include/mbgl/style/expression/boolean_operator.hpp b/include/mbgl/style/expression/boolean_operator.hpp
index 2924379e98..7a7f2b30d3 100644
--- a/include/mbgl/style/expression/boolean_operator.hpp
+++ b/include/mbgl/style/expression/boolean_operator.hpp
@@ -17,7 +17,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
 private:
@@ -33,7 +33,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
 private:
diff --git a/include/mbgl/style/expression/case.hpp b/include/mbgl/style/expression/case.hpp
index edc5b5969d..9ee3896e2b 100644
--- a/include/mbgl/style/expression/case.hpp
+++ b/include/mbgl/style/expression/case.hpp
@@ -21,7 +21,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
 private:
diff --git a/include/mbgl/style/expression/coalesce.hpp b/include/mbgl/style/expression/coalesce.hpp
index 110eec5f46..2dbf236032 100644
--- a/include/mbgl/style/expression/coalesce.hpp
+++ b/include/mbgl/style/expression/coalesce.hpp
@@ -22,7 +22,7 @@ public:
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
diff --git a/include/mbgl/style/expression/coercion.hpp b/include/mbgl/style/expression/coercion.hpp
index 89576dff96..978f6320d2 100644
--- a/include/mbgl/style/expression/coercion.hpp
+++ b/include/mbgl/style/expression/coercion.hpp
@@ -19,7 +19,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
 private:
diff --git a/include/mbgl/style/expression/compound_expression.hpp b/include/mbgl/style/expression/compound_expression.hpp
index 21c7c8020a..8dfe175f44 100644
--- a/include/mbgl/style/expression/compound_expression.hpp
+++ b/include/mbgl/style/expression/compound_expression.hpp
@@ -91,7 +91,7 @@ public:
         args(std::move(args_))
     {}
     
-    EvaluationResult evaluate(const EvaluationParameters& evaluationParams) const override {
+    EvaluationResult evaluate(const EvaluationContext& evaluationParams) const override {
         return signature.apply(evaluationParams, args);
     }
     
diff --git a/include/mbgl/style/expression/curve.hpp b/include/mbgl/style/expression/curve.hpp
index 3bbf7a2c4b..6a46a6e152 100644
--- a/include/mbgl/style/expression/curve.hpp
+++ b/include/mbgl/style/expression/curve.hpp
@@ -78,7 +78,7 @@ public:
         stops(std::move(stops_))
     {}
     
-    EvaluationResult evaluate(const EvaluationParameters& params) const override {
+    EvaluationResult evaluate(const EvaluationContext& params) const override {
         const EvaluationResult evaluatedInput = input->evaluate(params);
         if (!evaluatedInput) { return evaluatedInput.error(); }
         float x = *fromExpressionValue<float>(*evaluatedInput);
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp
index 4474be280a..25c84fbf13 100644
--- a/include/mbgl/style/expression/expression.hpp
+++ b/include/mbgl/style/expression/expression.hpp
@@ -22,14 +22,14 @@ public:
     std::string message;
 };
 
-class EvaluationParameters {
+class EvaluationContext {
 public:
-    EvaluationParameters(float zoom_) : zoom(zoom_), feature(nullptr) {}
-    EvaluationParameters(GeometryTileFeature const * feature_) : zoom(optional<float>()), feature(feature_) {}
-    EvaluationParameters(float zoom_, GeometryTileFeature const * feature_) :
+    EvaluationContext(float zoom_) : zoom(zoom_), feature(nullptr) {}
+    EvaluationContext(GeometryTileFeature const * feature_) : zoom(optional<float>()), feature(feature_) {}
+    EvaluationContext(float zoom_, GeometryTileFeature const * feature_) :
         zoom(zoom_), feature(feature_)
     {}
-    EvaluationParameters(optional<float> zoom_, GeometryTileFeature const * feature_, optional<double> heatmapDensity_) :
+    EvaluationContext(optional<float> zoom_, GeometryTileFeature const * feature_, optional<double> heatmapDensity_) :
         zoom(std::move(zoom_)), feature(feature_), heatmapDensity(std::move(heatmapDensity_))
     {}
     
@@ -114,7 +114,7 @@ public:
     Expression(type::Type type_) : type(std::move(type_)) {}
     virtual ~Expression() = default;
     
-    virtual EvaluationResult evaluate(const EvaluationParameters& params) const = 0;
+    virtual EvaluationResult evaluate(const EvaluationContext& params) const = 0;
     virtual void eachChild(const std::function<void(const Expression*)>&) const = 0;
 
     type::Type getType() const { return type; };
diff --git a/include/mbgl/style/expression/let.hpp b/include/mbgl/style/expression/let.hpp
index 0432e919cd..499dd0b657 100644
--- a/include/mbgl/style/expression/let.hpp
+++ b/include/mbgl/style/expression/let.hpp
@@ -23,7 +23,7 @@ public:
     
     static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext);
     
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>&) const override;
     
     Expression* getResult() const {
@@ -45,7 +45,7 @@ public:
 
     static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext);
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     void eachChild(const std::function<void(const Expression*)>&) const override;
 
 private:
diff --git a/include/mbgl/style/expression/literal.hpp b/include/mbgl/style/expression/literal.hpp
index 3447666703..84f72d540a 100644
--- a/include/mbgl/style/expression/literal.hpp
+++ b/include/mbgl/style/expression/literal.hpp
@@ -14,7 +14,7 @@ class Literal : public Expression {
 public:
     Literal(Value value_) : Expression(typeOf(value_)), value(value_) {}
     Literal(type::Array type_, std::vector<Value> value_) : Expression(type_), value(value_) {}
-    EvaluationResult evaluate(const EvaluationParameters&) const override {
+    EvaluationResult evaluate(const EvaluationContext&) const override {
         return value;
     }
     
diff --git a/include/mbgl/style/expression/match.hpp b/include/mbgl/style/expression/match.hpp
index 76fe5cdc86..38d4edeee5 100644
--- a/include/mbgl/style/expression/match.hpp
+++ b/include/mbgl/style/expression/match.hpp
@@ -27,7 +27,7 @@ public:
 
     void eachChild(const std::function<void(const Expression*)>& visit) const override;
 
-    EvaluationResult evaluate(const EvaluationParameters& params) const override;
+    EvaluationResult evaluate(const EvaluationContext& params) const override;
     
 private:
     
diff --git a/include/mbgl/style/function/camera_function.hpp b/include/mbgl/style/function/camera_function.hpp
index b1d31d1216..c44002e8c1 100644
--- a/include/mbgl/style/function/camera_function.hpp
+++ b/include/mbgl/style/function/camera_function.hpp
@@ -44,7 +44,7 @@ public:
     {}
 
     T evaluate(float zoom) const {
-        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationParameters(zoom, nullptr));
+        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext(zoom, nullptr));
         if (result) {
            const optional<T> typed = expression::fromExpressionValue<T>(*result);
            return typed ? *typed : T();
diff --git a/include/mbgl/style/function/composite_function.hpp b/include/mbgl/style/function/composite_function.hpp
index a44bf4e91c..ead31294bb 100644
--- a/include/mbgl/style/function/composite_function.hpp
+++ b/include/mbgl/style/function/composite_function.hpp
@@ -79,7 +79,7 @@ public:
 
     template <class Feature>
     T evaluate(float zoom, const Feature& feature, T finalDefaultValue) const {
-        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationParameters({zoom}, &feature));
+        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;
diff --git a/include/mbgl/style/function/convert.hpp b/include/mbgl/style/function/convert.hpp
index 07cf54ca6e..ac148c7af1 100644
--- a/include/mbgl/style/function/convert.hpp
+++ b/include/mbgl/style/function/convert.hpp
@@ -36,7 +36,7 @@ public:
     ErrorExpression(std::string message_) : Expression(type::Error), message(std::move(message_)) {}
     void eachChild(const std::function<void(const Expression*)>&) const override {}
 
-    EvaluationResult evaluate(const EvaluationParameters&) const override {
+    EvaluationResult evaluate(const EvaluationContext&) const override {
         return EvaluationError{message};
     }
 
diff --git a/include/mbgl/style/function/source_function.hpp b/include/mbgl/style/function/source_function.hpp
index df09891e6c..6b3dfb449e 100644
--- a/include/mbgl/style/function/source_function.hpp
+++ b/include/mbgl/style/function/source_function.hpp
@@ -47,7 +47,7 @@ public:
 
     template <class Feature>
     T evaluate(const Feature& feature, T finalDefaultValue) const {
-        const expression::EvaluationResult result = expression->evaluate(expression::EvaluationParameters(&feature));
+        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;
diff --git a/src/mbgl/style/expression/array_assertion.cpp b/src/mbgl/style/expression/array_assertion.cpp
index 1f47374d03..2faa696302 100644
--- a/src/mbgl/style/expression/array_assertion.cpp
+++ b/src/mbgl/style/expression/array_assertion.cpp
@@ -5,7 +5,7 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-EvaluationResult ArrayAssertion::evaluate(const EvaluationParameters& params) const {
+EvaluationResult ArrayAssertion::evaluate(const EvaluationContext& params) const {
     auto result = input->evaluate(params);
     if (!result) {
         return result.error();
diff --git a/src/mbgl/style/expression/assertion.cpp b/src/mbgl/style/expression/assertion.cpp
index c16bab9bce..59b4c6e1ae 100644
--- a/src/mbgl/style/expression/assertion.cpp
+++ b/src/mbgl/style/expression/assertion.cpp
@@ -35,7 +35,7 @@ ParseResult Assertion::parse(const Convertible& value, ParsingContext ctx) {
     return ParseResult(std::make_unique<Assertion>(it->second, std::move(parsed)));
 }
 
-EvaluationResult Assertion::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Assertion::evaluate(const EvaluationContext& params) const {
     for (std::size_t i = 0; i < inputs.size(); i++) {
         EvaluationResult value = inputs[i]->evaluate(params);
         if (!value) return value;
diff --git a/src/mbgl/style/expression/at.cpp b/src/mbgl/style/expression/at.cpp
index 1b1893deaf..5c8fddeed1 100644
--- a/src/mbgl/style/expression/at.cpp
+++ b/src/mbgl/style/expression/at.cpp
@@ -5,7 +5,7 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-EvaluationResult At::evaluate(const EvaluationParameters& params) const {
+EvaluationResult At::evaluate(const EvaluationContext& params) const {
     const EvaluationResult evaluatedIndex = index->evaluate(params);
     const EvaluationResult evaluatedInput = input->evaluate(params);
     if (!evaluatedIndex) {
diff --git a/src/mbgl/style/expression/boolean_operator.cpp b/src/mbgl/style/expression/boolean_operator.cpp
index 10c7ef4bde..986de99d4b 100644
--- a/src/mbgl/style/expression/boolean_operator.cpp
+++ b/src/mbgl/style/expression/boolean_operator.cpp
@@ -4,7 +4,7 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-EvaluationResult Any::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Any::evaluate(const EvaluationContext& params) const {
     for (auto it = inputs.begin(); it != inputs.end(); it++) {
         const EvaluationResult result = (*it)->evaluate(params);
         if (!result) return result;
@@ -19,7 +19,7 @@ void Any::eachChild(const std::function<void(const Expression*)>& visit) const {
     }
 }
 
-EvaluationResult All::evaluate(const EvaluationParameters& params) const {
+EvaluationResult All::evaluate(const EvaluationContext& params) const {
     for (auto it = inputs.begin(); it != inputs.end(); it++) {
         const EvaluationResult result = (*it)->evaluate(params);
         if (!result) return result;
diff --git a/src/mbgl/style/expression/case.cpp b/src/mbgl/style/expression/case.cpp
index c6d79186da..8c6c2c0c8f 100644
--- a/src/mbgl/style/expression/case.cpp
+++ b/src/mbgl/style/expression/case.cpp
@@ -4,7 +4,7 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-EvaluationResult Case::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Case::evaluate(const EvaluationContext& params) const {
     for (const auto& branch : branches) {
         const EvaluationResult evaluatedTest = branch.first->evaluate(params);
         if (!evaluatedTest) {
diff --git a/src/mbgl/style/expression/coalesce.cpp b/src/mbgl/style/expression/coalesce.cpp
index a69723b497..784492c51e 100644
--- a/src/mbgl/style/expression/coalesce.cpp
+++ b/src/mbgl/style/expression/coalesce.cpp
@@ -4,7 +4,7 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-EvaluationResult Coalesce::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Coalesce::evaluate(const EvaluationContext& params) const {
     EvaluationResult result = Null;
     for (const auto& arg : args) {
         result = arg->evaluate(params);
diff --git a/src/mbgl/style/expression/coercion.cpp b/src/mbgl/style/expression/coercion.cpp
index 217a0757a9..a0c4a1abfb 100644
--- a/src/mbgl/style/expression/coercion.cpp
+++ b/src/mbgl/style/expression/coercion.cpp
@@ -108,7 +108,7 @@ ParseResult Coercion::parse(const Convertible& value, ParsingContext ctx) {
     return ParseResult(std::make_unique<Coercion>(it->second, std::move(parsed)));
 }
 
-EvaluationResult Coercion::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Coercion::evaluate(const EvaluationContext& params) const {
     for (std::size_t i = 0; i < inputs.size(); i++) {
         EvaluationResult value = inputs[i]->evaluate(params);
         if (!value) return value;
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp
index 637196cef6..a08a556480 100644
--- a/src/mbgl/style/expression/compound_expression.cpp
+++ b/src/mbgl/style/expression/compound_expression.cpp
@@ -21,7 +21,7 @@ namespace detail {
     Wraps an evaluate function that takes an arbitrary number of arguments (via
     a Varargs<T>, which is just an alias for std::vector).
  
-    Signature<R (const EvaluationParameters&, Params...)>:
+    Signature<R (const EvaluationContext&, Params...)>:
     Wraps an evaluate function that needs to access the expression evaluation
     parameters in addition to its subexpressions, i.e.,
     (const EvaluationParams& const T0&, const T1&, ...) -> Result<U>.  Needed
@@ -46,7 +46,7 @@ struct Signature<R (Params...)> : SignatureBase {
         evaluate(evaluate_)
     {}
     
-    EvaluationResult apply(const EvaluationParameters& evaluationParameters, const Args& args) const {
+    EvaluationResult apply(const EvaluationContext& evaluationParameters, const Args& args) const {
         return applyImpl(evaluationParameters, args, std::index_sequence_for<Params...>{});
     }
     
@@ -60,7 +60,7 @@ struct Signature<R (Params...)> : SignatureBase {
     R (*evaluate)(Params...);
 private:
     template <std::size_t ...I>
-    EvaluationResult applyImpl(const EvaluationParameters& evaluationParameters, const Args& args, std::index_sequence<I...>) const {
+    EvaluationResult applyImpl(const EvaluationContext& evaluationParameters, const Args& args, std::index_sequence<I...>) const {
         const std::array<EvaluationResult, sizeof...(I)> evaluated = {{std::get<I>(args)->evaluate(evaluationParameters)...}};
         for (const auto& arg : evaluated) {
             if(!arg) return arg.error();
@@ -89,7 +89,7 @@ struct Signature<R (const Varargs<T>&)> : SignatureBase {
         return std::make_unique<CompoundExpression<Signature>>(name, *this, std::move(args));
     };
     
-    EvaluationResult apply(const EvaluationParameters& evaluationParameters, const Args& args) const {
+    EvaluationResult apply(const EvaluationContext& evaluationParameters, const Args& args) const {
         Varargs<T> evaluated;
         evaluated.reserve(args.size());
         for (const auto& arg : args) {
@@ -108,10 +108,10 @@ struct Signature<R (const Varargs<T>&)> : SignatureBase {
 // Evaluate function needing parameter access,
 // (const EvaluationParams&, const T0&, const T1&, ...) -> Result<U>
 template <class R, class... Params>
-struct Signature<R (const EvaluationParameters&, Params...)> : SignatureBase {
+struct Signature<R (const EvaluationContext&, Params...)> : SignatureBase {
     using Args = std::array<std::unique_ptr<Expression>, sizeof...(Params)>;
     
-    Signature(R (*evaluate_)(const EvaluationParameters&, Params...)) :
+    Signature(R (*evaluate_)(const EvaluationContext&, Params...)) :
         SignatureBase(
             valueTypeToExpressionType<std::decay_t<typename R::Value>>(),
             std::vector<type::Type> {valueTypeToExpressionType<std::decay_t<Params>>()...}
@@ -126,13 +126,13 @@ struct Signature<R (const EvaluationParameters&, Params...)> : SignatureBase {
         return std::make_unique<CompoundExpression<Signature>>(name, *this, std::move(argsArray));
     }
     
-    EvaluationResult apply(const EvaluationParameters& evaluationParameters, const Args& args) const {
+    EvaluationResult apply(const EvaluationContext& evaluationParameters, const Args& args) const {
         return applyImpl(evaluationParameters, args, std::index_sequence_for<Params...>{});
     }
     
 private:
     template <std::size_t ...I>
-    EvaluationResult applyImpl(const EvaluationParameters& evaluationParameters, const Args& args, std::index_sequence<I...>) const {
+    EvaluationResult applyImpl(const EvaluationContext& evaluationParameters, const Args& args, std::index_sequence<I...>) const {
         const std::array<EvaluationResult, sizeof...(I)> evaluated = {{std::get<I>(args)->evaluate(evaluationParameters)...}};
         for (const auto& arg : evaluated) {
             if(!arg) return arg.error();
@@ -143,7 +143,7 @@ private:
         return *value;
     }
     
-    R (*evaluate)(const EvaluationParameters&, Params...);
+    R (*evaluate)(const EvaluationContext&, Params...);
 };
 
 // Machinery to pull out function types from class methods, lambdas, etc.
@@ -233,7 +233,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
     define("rgba", rgba);
     define("rgb", [](double r, double g, double b) { return rgba(r, g, b, 1.0f); });
     
-    define("zoom", [](const EvaluationParameters& params) -> Result<double> {
+    define("zoom", [](const EvaluationContext& params) -> Result<double> {
         if (!params.zoom) {
             return EvaluationError {
                 "The 'zoom' expression is unavailable in the current evaluation context."
@@ -242,7 +242,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         return *(params.zoom);
     });
     
-    define("heatmap-density", [](const EvaluationParameters& params) -> Result<double> {
+    define("heatmap-density", [](const EvaluationContext& params) -> Result<double> {
         if (!params.heatmapDensity) {
             return EvaluationError {
                 "The 'heatmap-density' expression is unavailable in the current evaluation context."
@@ -251,7 +251,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         return *(params.heatmapDensity);
     });
     
-    define("has", [](const EvaluationParameters& params, const std::string& key) -> Result<bool> {
+    define("has", [](const EvaluationContext& params, const std::string& key) -> Result<bool> {
         if (!params.feature) {
             return EvaluationError {
                 "Feature data is unavailable in the current evaluation context."
@@ -264,7 +264,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         return object.find(key) != object.end();
     });
     
-    define("get", [](const EvaluationParameters& params, const std::string& key) -> Result<Value> {
+    define("get", [](const EvaluationContext& params, const std::string& key) -> Result<Value> {
         if (!params.feature) {
             return EvaluationError {
                 "Feature data is unavailable in the current evaluation context."
@@ -291,7 +291,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         return s.size();
     });
     
-    define("properties", [](const EvaluationParameters& params) -> Result<std::unordered_map<std::string, Value>> {
+    define("properties", [](const EvaluationContext& params) -> Result<std::unordered_map<std::string, Value>> {
         if (!params.feature) {
             return EvaluationError {
                 "Feature data is unavailable in the current evaluation context."
@@ -305,7 +305,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         return result;
     });
     
-    define("geometry-type", [](const EvaluationParameters& params) -> Result<std::string> {
+    define("geometry-type", [](const EvaluationContext& params) -> Result<std::string> {
         if (!params.feature) {
             return EvaluationError {
                 "Feature data is unavailable in the current evaluation context."
@@ -324,7 +324,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         }
     });
     
-    define("id", [](const EvaluationParameters& params) -> Result<Value> {
+    define("id", [](const EvaluationContext& params) -> Result<Value> {
         if (!params.feature) {
             return EvaluationError {
                 "Feature data is unavailable in the current evaluation context."
diff --git a/src/mbgl/style/expression/let.cpp b/src/mbgl/style/expression/let.cpp
index 0553df9624..d94d80f6d7 100644
--- a/src/mbgl/style/expression/let.cpp
+++ b/src/mbgl/style/expression/let.cpp
@@ -5,7 +5,7 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-EvaluationResult Let::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Let::evaluate(const EvaluationContext& params) const {
     return result->evaluate(params);
 }
 
@@ -61,7 +61,7 @@ ParseResult Let::parse(const Convertible& value, ParsingContext ctx) {
     return ParseResult(std::make_unique<Let>(std::move(bindings_), std::move(*result_)));
 }
 
-EvaluationResult Var::evaluate(const EvaluationParameters& params) const {
+EvaluationResult Var::evaluate(const EvaluationContext& params) const {
     return value->evaluate(params);
 }
 
diff --git a/src/mbgl/style/expression/match.cpp b/src/mbgl/style/expression/match.cpp
index d132886dd4..93947813ac 100644
--- a/src/mbgl/style/expression/match.cpp
+++ b/src/mbgl/style/expression/match.cpp
@@ -14,7 +14,7 @@ void Match<T>::eachChild(const std::function<void(const Expression*)>& visit) co
     visit(otherwise.get());
 }
 
-template<> EvaluationResult Match<std::string>::evaluate(const EvaluationParameters& params) const {
+template<> EvaluationResult Match<std::string>::evaluate(const EvaluationContext& params) const {
     const EvaluationResult inputValue = input->evaluate(params);
     if (!inputValue) {
         return inputValue.error();
@@ -28,7 +28,7 @@ template<> EvaluationResult Match<std::string>::evaluate(const EvaluationParamet
     return otherwise->evaluate(params);
 }
 
-template<> EvaluationResult Match<int64_t>::evaluate(const EvaluationParameters& params) const {
+template<> EvaluationResult Match<int64_t>::evaluate(const EvaluationContext& params) const {
     const EvaluationResult inputValue = input->evaluate(params);
     if (!inputValue) {
         return inputValue.error();
diff --git a/src/mbgl/style/expression/parsing_context.cpp b/src/mbgl/style/expression/parsing_context.cpp
index f874aed81d..e2447bd7e4 100644
--- a/src/mbgl/style/expression/parsing_context.cpp
+++ b/src/mbgl/style/expression/parsing_context.cpp
@@ -146,7 +146,7 @@ ParseResult ParsingContext::parse(const Convertible& value)
     // it immediately and replace it with a literal value in the
     // parsed result.
     if (parsed && !dynamic_cast<Literal *>(parsed->get()) && isConstant(parsed->get())) {
-        EvaluationParameters params(nullptr);
+        EvaluationContext params(nullptr);
         EvaluationResult evaluated((*parsed)->evaluate(params));
         if (!evaluated) {
             error(evaluated.error().message);
diff --git a/src/mbgl/style/function/expression.cpp b/src/mbgl/style/function/expression.cpp
index 8f2c4a337c..d9dbbfa1d3 100644
--- a/src/mbgl/style/function/expression.cpp
+++ b/src/mbgl/style/function/expression.cpp
@@ -30,7 +30,7 @@ public:
 
 EvaluationResult Expression::evaluate(optional<float> zoom, const Feature& feature, optional<double> heatmapDensity) const {
     GeoJSONFeature f(feature);
-    return this->evaluate(EvaluationParameters(zoom, &f, heatmapDensity));
+    return this->evaluate(EvaluationContext(zoom, &f, heatmapDensity));
 }
 
 } // namespace expression