Merge remote-tracking branch 'origin/master' into feature/custom-vector-source

1 files changed, 1 insertions, 20 deletions

diff --git a/src/mbgl/style/bucket_parameters.hpp b/src/mbgl/style/bucket_parameters.hpp
index d5e05c5dd2..d0edbcac30 100644
--- a/src/mbgl/style/bucket_parameters.hpp
+++ b/src/mbgl/style/bucket_parameters.hpp
@@ -2,33 +2,14 @@
 
 #include <mbgl/map/mode.hpp>
 #include <mbgl/tile/tile_id.hpp>
-#include <mbgl/style/filter.hpp>
-
-#include <atomic>
-#include <functional>
 
 namespace mbgl {
-
-class GeometryTileLayer;
-class GeometryTileFeature;
-class FeatureIndex;
-
 namespace style {
 
 class BucketParameters {
 public:
-    const OverscaledTileID& tileID;
-    const std::atomic<bool>& obsolete;
-    FeatureIndex& featureIndex;
+    const OverscaledTileID tileID;
     const MapMode mode;
-
-    bool cancelled() const {
-        return obsolete;
-    }
-
-    void eachFilteredFeature(const Filter&,
-                             const GeometryTileLayer&,
-                             std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
 };
 
 } // namespace style