1 files changed, 65 insertions, 18 deletions

diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index a2f453f03d..5d8339d775 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -1,7 +1,10 @@
 #include <mbgl/tile/geojson_tile.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
-
+#include <mbgl/renderer/query.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
+#include <mbgl/style/filter_evaluator.hpp>
 #include <mbgl/util/string.hpp>
+
 #include <mapbox/geojsonvt.hpp>
 #include <supercluster.hpp>
 
@@ -26,6 +29,10 @@ public:
         return feature.properties;
     }
 
+    optional<FeatureIdentifier> getID() const override {
+        return feature.id;
+    }
+
     GeometryCollection getGeometries() const override {
         GeometryCollection geometry = apply_visitor(ToGeometryCollection(), feature.geometry);
 
@@ -46,46 +53,86 @@ public:
     }
 };
 
-class GeoJSONTileData : public GeometryTileData,
-                        public GeometryTileLayer {
+class GeoJSONTileLayer : public GeometryTileLayer {
 public:
-    mapbox::geometry::feature_collection<int16_t> features;
-
-    GeoJSONTileData(mapbox::geometry::feature_collection<int16_t> features_)
+    GeoJSONTileLayer(std::shared_ptr<const mapbox::geometry::feature_collection<int16_t>> features_)
         : features(std::move(features_)) {
     }
 
-    std::unique_ptr<GeometryTileData> clone() const override {
-        return std::make_unique<GeoJSONTileData>(*this);
+    std::size_t featureCount() const override {
+        return features->size();
     }
 
-    const GeometryTileLayer* getLayer(const std::string&) const override {
-        return this;
+    std::unique_ptr<GeometryTileFeature> getFeature(std::size_t i) const override {
+        return std::make_unique<GeoJSONTileFeature>((*features)[i]);
     }
 
     std::string getName() const override {
         return "";
     }
 
-    std::size_t featureCount() const override {
-        return features.size();
+private:
+    std::shared_ptr<const mapbox::geometry::feature_collection<int16_t>> features;
+};
+
+class GeoJSONTileData : public GeometryTileData {
+public:
+    GeoJSONTileData(mapbox::geometry::feature_collection<int16_t> features_)
+        : features(std::make_shared<mapbox::geometry::feature_collection<int16_t>>(
+              std::move(features_))) {
     }
 
-    std::unique_ptr<GeometryTileFeature> getFeature(std::size_t i) const override {
-        return std::make_unique<GeoJSONTileFeature>(features[i]);
+    GeoJSONTileData(std::shared_ptr<const mapbox::geometry::feature_collection<int16_t>> features_)
+        : features(std::move(features_)) {
     }
+
+    std::unique_ptr<GeometryTileData> clone() const override {
+        return std::make_unique<GeoJSONTileData>(features);
+    }
+
+    std::unique_ptr<GeometryTileLayer> getLayer(const std::string&) const override {
+        return std::make_unique<GeoJSONTileLayer>(features);
+    }
+
+
+private:
+    std::shared_ptr<const mapbox::geometry::feature_collection<int16_t>> features;
 };
 
 GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
                          std::string sourceID_,
-                         const style::UpdateParameters& parameters)
+                         const TileParameters& parameters,
+                         mapbox::geometry::feature_collection<int16_t> features)
     : GeometryTile(overscaledTileID, sourceID_, parameters) {
+    updateData(std::move(features));
 }
-    
-void GeoJSONTile::updateData(const mapbox::geometry::feature_collection<int16_t>& features) {
-    setData(std::make_unique<GeoJSONTileData>(features));
+
+void GeoJSONTile::updateData(mapbox::geometry::feature_collection<int16_t> features) {
+    setData(std::make_unique<GeoJSONTileData>(std::move(features)));
 }
 
 void GeoJSONTile::setNecessity(Necessity) {}
+    
+void GeoJSONTile::querySourceFeatures(
+    std::vector<Feature>& result,
+    const SourceQueryOptions& options) {
+    
+    // Ignore the sourceLayer, there is only one
+    auto layer = getData()->getLayer({});
+    
+    if (layer) {
+        auto featureCount = layer->featureCount();
+        for (std::size_t i = 0; i < featureCount; i++) {
+            auto feature = layer->getFeature(i);
+            
+            // Apply filter, if any
+            if (options.filter && !(*options.filter)(*feature)) {
+                continue;
+            }
+            
+            result.push_back(convertFeature(*feature, id.canonical));
+        }
+    }
+}
 
 } // namespace mbgl