[core] Eliminate StyleBucket

This commit is contained in:
John Firebaugh
2015-10-20 12:21:40 -07:00
parent 8c3b3cb792
commit 540c6eca15
19 changed files with 170 additions and 231 deletions

View File

@@ -1,7 +1,6 @@
#include <mbgl/map/vector_tile_data.hpp>
#include <mbgl/map/geometry_tile.hpp>
#include <mbgl/style/style_layer.hpp>
#include <mbgl/style/style_bucket.hpp>
#include <mbgl/util/worker.hpp>
#include <mbgl/util/work_request.hpp>
#include <mbgl/style/style.hpp>
@@ -135,11 +134,7 @@ bool VectorTileData::parsePending(std::function<void()> callback) {
}
Bucket* VectorTileData::getBucket(const StyleLayer& layer) {
if (!layer.bucket) {
return nullptr;
}
const auto it = buckets.find(layer.bucket->name);
const auto it = buckets.find(layer.bucketName());
if (it == buckets.end()) {
return nullptr;
}