summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmiao <zmiao.jamie@gmail.com>2019-08-01 01:37:02 +0300
committerzmiao <zmiao.jamie@gmail.com>2019-08-01 01:37:02 +0300
commitcc0feb072c0d90acc93792098883f1b9c3af5625 (patch)
tree1d5cc6307bd7b9a195502c4e74c18a0923bd1d43
parent701236add81a2925a695af149dd6e188985f53c8 (diff)
downloadqtlocation-mapboxgl-upstream/clusterProperties_aggregation.tar.gz
-rw-r--r--include/mbgl/style/expression/expression.hpp2
-rw-r--r--include/mbgl/style/property_expression.hpp6
-rw-r--r--src/mbgl/style/sources/geojson_source_impl.cpp12
3 files changed, 10 insertions, 10 deletions
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp
index 5094989d86..4baeb4facc 100644
--- a/include/mbgl/style/expression/expression.hpp
+++ b/include/mbgl/style/expression/expression.hpp
@@ -23,7 +23,7 @@ class EvaluationError {
public:
std::string message;
};
-
+
class EvaluationContext {
public:
EvaluationContext() = default;
diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp
index 917cc1b47a..8a36aac0c9 100644
--- a/include/mbgl/style/property_expression.hpp
+++ b/include/mbgl/style/property_expression.hpp
@@ -5,6 +5,7 @@
#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 {
@@ -34,7 +35,8 @@ class PropertyExpression final : public PropertyExpressionBase {
public:
// Second parameter to be used only for conversions from legacy functions.
PropertyExpression(std::unique_ptr<expression::Expression> expression_, optional<T> defaultValue_ = nullopt)
- : PropertyExpressionBase(std::move(expression_)), defaultValue(std::move(defaultValue_)) {
+ : PropertyExpressionBase(std::move(expression_)),
+ defaultValue(std::move(defaultValue_)) {
}
T evaluate(const expression::EvaluationContext& context, T finalDefaultValue = T()) const {
assert(canEvaluateWith(context));
@@ -62,7 +64,7 @@ public:
return expression::fromExpressionValues<T>(expression->possibleOutputs());
}
- friend bool operator==(const PropertyExpression& lhs,
+ friend bool operator==(const PropertyExpression& lhs,
const PropertyExpression& rhs) {
return *lhs.expression == *rhs.expression;
}
diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp
index b362496e29..243af8e6f8 100644
--- a/src/mbgl/style/sources/geojson_source_impl.cpp
+++ b/src/mbgl/style/sources/geojson_source_impl.cpp
@@ -13,10 +13,9 @@ namespace style {
class GeoJSONVTData : public GeoJSONData {
public:
- GeoJSONVTData(const GeoJSON& geoJSON,
+ GeoJSONVTData(const GeoJSON& geoJSON,
const mapbox::geojsonvt::Options& options)
- : impl(geoJSON, options) {
- }
+ : impl(geoJSON, options) {}
mapbox::feature::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final {
return impl.getTile(tileID.z, tileID.x, tileID.y).features;
@@ -26,10 +25,9 @@ public:
return {};
}
- mapbox::feature::feature_collection<double>
- getLeaves(const std::uint32_t,
- const std::uint32_t,
- const std::uint32_t) final {
+ mapbox::feature::feature_collection<double> getLeaves(const std::uint32_t,
+ const std::uint32_t,
+ const std::uint32_t) final {
return {};
}