diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-08-07 18:02:43 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-08-07 18:31:59 +0300 |
commit | 0ec4a84c310f4bf95265939698d71f267af5802e (patch) | |
tree | 7545a31a8003115f0db720dac7ccbf6cbacdfbc7 /src/mbgl/style | |
parent | 1dabfe783d7871a6ea232d4da3981a42fbecb7ba (diff) | |
download | qtlocation-mapboxgl-0ec4a84c310f4bf95265939698d71f267af5802e.tar.gz |
Rename `EvaluationContext::heatmapDensity` to `colorRampParameter`
More generic name as the same class member is to be used by the
linear gradient properties.
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/expression/expression.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index 53ce91f0b7..4c476a3749 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -343,12 +343,12 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali }); define("heatmap-density", [](const EvaluationContext& params) -> Result<double> { - if (!params.heatmapDensity) { + if (!params.colorRampParameter) { return EvaluationError { "The 'heatmap-density' expression is unavailable in the current evaluation context." }; } - return *(params.heatmapDensity); + return *(params.colorRampParameter); }); define("has", [](const EvaluationContext& params, const std::string& key) -> Result<bool> { diff --git a/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp index d9dbbfa1d3..3c2580de04 100644 --- a/src/mbgl/style/expression/expression.cpp +++ b/src/mbgl/style/expression/expression.cpp @@ -28,9 +28,9 @@ public: }; -EvaluationResult Expression::evaluate(optional<float> zoom, const Feature& feature, optional<double> heatmapDensity) const { +EvaluationResult Expression::evaluate(optional<float> zoom, const Feature& feature, optional<double> colorRampParameter) const { GeoJSONFeature f(feature); - return this->evaluate(EvaluationContext(zoom, &f, heatmapDensity)); + return this->evaluate(EvaluationContext(zoom, &f, colorRampParameter)); } } // namespace expression |