diff --git a/src/mbgl/map/live_tile_data.cpp b/src/mbgl/map/live_tile_data.cpp index dec7d4026..15a1c6a3f 100644 --- a/src/mbgl/map/live_tile_data.cpp +++ b/src/mbgl/map/live_tile_data.cpp @@ -20,7 +20,6 @@ LiveTileData::LiveTileData(const TileID& id_, worker(style_.workers), tileWorker(id_, source_.source_id, - source_.max_zoom, style_, style_.layers, state, diff --git a/src/mbgl/map/tile_worker.cpp b/src/mbgl/map/tile_worker.cpp index bbbfec1da..acf832009 100644 --- a/src/mbgl/map/tile_worker.cpp +++ b/src/mbgl/map/tile_worker.cpp @@ -14,7 +14,6 @@ using namespace mbgl; TileWorker::TileWorker(TileID id_, std::string sourceID_, - const uint16_t maxZoom_, Style& style_, std::vector> layers_, const std::atomic& state_, @@ -22,7 +21,6 @@ TileWorker::TileWorker(TileID id_, : layers(std::move(layers_)), id(id_), sourceID(sourceID_), - maxZoom(maxZoom_), style(style_), state(state_), collisionTile(std::move(collision_)) { @@ -120,7 +118,7 @@ void TileWorker::parseLayer(const StyleLayer& layer, const GeometryTile& geometr // Skip this bucket if we are to not render this if (styleBucket.source != sourceID) return; - if (id.z < std::floor(styleBucket.min_zoom) && std::floor(styleBucket.min_zoom) < maxZoom) + if (id.z < std::floor(styleBucket.min_zoom)) return; if (id.z >= std::ceil(styleBucket.max_zoom)) return; diff --git a/src/mbgl/map/tile_worker.hpp b/src/mbgl/map/tile_worker.hpp index 6f5a9d512..53c5c9095 100644 --- a/src/mbgl/map/tile_worker.hpp +++ b/src/mbgl/map/tile_worker.hpp @@ -31,7 +31,6 @@ class TileWorker : public util::noncopyable { public: TileWorker(TileID, std::string sourceID, - uint16_t maxZoom, Style&, std::vector>, const std::atomic&, @@ -58,7 +57,6 @@ private: const TileID id; const std::string sourceID; - const uint16_t maxZoom; Style& style; const std::atomic& state; diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp index 433208bdf..048e7083b 100644 --- a/src/mbgl/map/vector_tile_data.cpp +++ b/src/mbgl/map/vector_tile_data.cpp @@ -22,7 +22,6 @@ VectorTileData::VectorTileData(const TileID& id_, worker(style_.workers), tileWorker(id_, source_.source_id, - source_.max_zoom, style_, style_.layers, state,