[core] Separate type for RasterTileParseResult

This commit is contained in:
John Firebaugh
2015-10-29 11:55:56 -07:00
parent ee6d415bf2
commit f6f5d9608d
3 changed files with 14 additions and 18 deletions

View File

@@ -57,19 +57,15 @@ void RasterTileData::request(float pixelRatio,
state = State::loaded;
}
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool, layout), res.data, [this, callback] (TileParseResult result) {
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool, layout), res.data, [this, callback] (RasterTileParseResult result) {
workRequest.reset();
if (state != State::loaded) {
return;
}
if (result.is<TileParseResultBuckets>()) {
auto& buckets = result.get<TileParseResultBuckets>();
state = buckets.state;
// TODO: Make this less awkward; we're only getting one bucket back.
if (!buckets.buckets.empty()) {
bucket = std::move(buckets.buckets.front().second);
}
if (result.is<std::unique_ptr<Bucket>>()) {
state = State::parsed;
bucket = std::move(result.get<std::unique_ptr<Bucket>>());
} else {
std::stringstream message;
message << "Failed to parse [" << std::string(id) << "]: " << result.get<std::string>();