From 8fb3ea0b53729c64c4d46280bce463dd5758dbd3 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 17 Apr 2020 17:53:19 +0300 Subject: [PATCH] [core] Fix clang-analyzer-optin.cplusplus.VirtualCall Detected by clang-tidy-8. --- src/mbgl/style/expression/expression.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp index 270fa5eba..28004bb3e 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 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 zoom,