Rename workerData ⇢ tileWorker

This commit is contained in:
John Firebaugh
2015-06-08 20:16:40 -04:00
parent d30fce5f7d
commit abdf205510
3 changed files with 8 additions and 8 deletions

View File

@@ -18,7 +18,7 @@ VectorTileData::VectorTileData(const TileID& id_,
float angle,
bool collisionDebug)
: TileData(id_),
workerData(id_,
tileWorker(id_,
style_,
source_.max_zoom,
state,
@@ -66,7 +66,7 @@ bool VectorTileData::reparse(Worker&, std::function<void()> callback) {
parsing = true;
workRequest = worker.parseVectorTile(workerData, data, [this, callback] (TileParseResult result) {
workRequest = worker.parseVectorTile(tileWorker, data, [this, callback] (TileParseResult result) {
parsing = false;
if (state == State::obsolete) {
@@ -93,11 +93,11 @@ Bucket* VectorTileData::getBucket(const StyleLayer& layer) {
return nullptr;
}
return workerData.getBucket(layer);
return tileWorker.getBucket(layer);
}
size_t VectorTileData::countBuckets() const {
return workerData.countBuckets();
return tileWorker.countBuckets();
}
void VectorTileData::redoPlacement(float angle, bool collisionDebug) {
@@ -114,8 +114,8 @@ void VectorTileData::redoPlacement(float angle, bool collisionDebug) {
currentAngle = angle;
currentCollisionDebug = collisionDebug;
workRequest = worker.redoPlacement(workerData, angle, collisionDebug, [this] {
for (const auto& layer : workerData.style.layers) {
workRequest = worker.redoPlacement(tileWorker, angle, collisionDebug, [this] {
for (const auto& layer : tileWorker.style.layers) {
auto bucket = getBucket(*layer);
if (bucket) {
bucket->swapRenderData();