Enable within expression with Filter

add canonical as pointer

fix review findings

2 files changed, 7 insertions, 5 deletions

diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp
index f19f64c1e7..1e34a8bd38 100644
--- a/include/mbgl/style/expression/expression.hpp
+++ b/include/mbgl/style/expression/expression.hpp
@@ -54,20 +54,20 @@ public:
         return *this;
     };
 
-    EvaluationContext& withCanonicalTileID(const mbgl::CanonicalTileID& canonical_) noexcept {
+    EvaluationContext& withCanonicalTileID(const mbgl::CanonicalTileID* canonical_) noexcept {
         canonical = canonical_;
         return *this;
     };
 
     optional<float> zoom;
     optional<mbgl::Value> accumulated;
-    optional<mbgl::CanonicalTileID> canonical;
-    GeometryTileFeature const * feature = nullptr;
+    GeometryTileFeature const* feature = nullptr;
     optional<double> colorRampParameter;
     // Contains formatted section object, std::unordered_map<std::string, Value>.
     const Value* formattedSection = nullptr;
     const FeatureState* featureState = nullptr;
     const std::set<std::string>* availableImages = nullptr;
+    const mbgl::CanonicalTileID* canonical = nullptr;
 };
 
 template <typename T>
diff --git a/include/mbgl/style/expression/within.hpp b/include/mbgl/style/expression/within.hpp
index 5e2b5e0671..88e9cc56b8 100644
--- a/include/mbgl/style/expression/within.hpp
+++ b/include/mbgl/style/expression/within.hpp
@@ -11,9 +11,11 @@ namespace mbgl {
 namespace style {
 namespace expression {
 
-class Within : public Expression {
+class Within final : public Expression {
 public:
-    Within(GeoJSON& geojson) : Expression(Kind::Within, type::Boolean), geoJSONSource(geojson) {}
+    explicit Within(GeoJSON geojson);
+
+    ~Within() final;
 
     EvaluationResult evaluate(const EvaluationContext&) const override;