summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-04-17 17:53:19 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-04-17 23:48:21 +0300
commit8fb3ea0b53729c64c4d46280bce463dd5758dbd3 (patch)
treef9df53d1425c19c68e59c80ff09ed6c52c2bb421
parentf82e375bc75e01e053cde3e6c07b38d70964cd01 (diff)
downloadqtlocation-mapboxgl-8fb3ea0b53729c64c4d46280bce463dd5758dbd3.tar.gz
[core] Fix clang-analyzer-optin.cplusplus.VirtualCall
Detected by clang-tidy-8.
-rw-r--r--src/mbgl/style/expression/expression.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp
index 270fa5eba0..28004bb3e2 100644
--- a/src/mbgl/style/expression/expression.cpp
+++ b/src/mbgl/style/expression/expression.cpp
@@ -16,14 +16,13 @@ public:
GeoJSONFeature(const Feature& feature_, const CanonicalTileID& canonical) : feature(feature_) {
geometry = convertGeometry(feature.geometry, canonical);
// https://github.com/mapbox/geojson-vt-cpp/issues/44
- if (getType() == FeatureType::Polygon) {
+ if (getTypeImpl() == FeatureType::Polygon) {
geometry = fixupPolygons(*geometry);
}
}
- FeatureType getType() const override {
- return apply_visitor(ToFeatureType(), feature.geometry);
- }
+ FeatureType getType() const override { return getTypeImpl(); }
+
const PropertyMap& getProperties() const override { return feature.properties; }
FeatureIdentifier getID() const override { return feature.id; }
optional<mbgl::Value> getValue(const std::string& key) const override {
@@ -38,6 +37,9 @@ public:
geometry = GeometryCollection();
return *geometry;
}
+
+private:
+ FeatureType getTypeImpl() const { return apply_visitor(ToFeatureType(), feature.geometry); }
};
EvaluationResult Expression::evaluate(optional<float> zoom,