diff --git a/src/mbgl/map/raster_tile_data.cpp b/src/mbgl/map/raster_tile_data.cpp index 16f727bac..2427e9f55 100644 --- a/src/mbgl/map/raster_tile_data.cpp +++ b/src/mbgl/map/raster_tile_data.cpp @@ -57,19 +57,15 @@ void RasterTileData::request(float pixelRatio, state = State::loaded; } - workRequest = worker.parseRasterTile(std::make_unique(texturePool, layout), res.data, [this, callback] (TileParseResult result) { + workRequest = worker.parseRasterTile(std::make_unique(texturePool, layout), res.data, [this, callback] (RasterTileParseResult result) { workRequest.reset(); if (state != State::loaded) { return; } - if (result.is()) { - auto& buckets = result.get(); - 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>()) { + state = State::parsed; + bucket = std::move(result.get>()); } else { std::stringstream message; message << "Failed to parse [" << std::string(id) << "]: " << result.get(); diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp index 6d4336709..b0005eda6 100644 --- a/src/mbgl/util/worker.cpp +++ b/src/mbgl/util/worker.cpp @@ -16,21 +16,17 @@ public: void parseRasterTile(std::unique_ptr bucket, const std::shared_ptr data, - std::function callback) { + std::function callback) { std::unique_ptr image(new util::Image(*data)); if (!(*image)) { - callback(TileParseResult("error parsing raster image")); + callback(RasterTileParseResult("error parsing raster image")); } if (!bucket->setImage(std::move(image))) { - callback(TileParseResult("error setting raster image to bucket")); + callback(RasterTileParseResult("error setting raster image to bucket")); } - TileParseResultBuckets result; - result.buckets.emplace_back("raster", std::move(bucket)); - result.state = TileData::State::parsed; - - callback(std::move(result)); + callback(RasterTileParseResult(std::move(bucket))); } void parseGeometryTile(TileWorker* worker, @@ -74,7 +70,7 @@ Worker::~Worker() = default; std::unique_ptr Worker::parseRasterTile(std::unique_ptr bucket, const std::shared_ptr data, - std::function callback) { + std::function callback) { current = (current + 1) % threads.size(); return threads[current]->invokeWithCallback(&Worker::Impl::parseRasterTile, callback, bucket, data); diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp index 6bf16216d..e7bd3daad 100644 --- a/src/mbgl/util/worker.hpp +++ b/src/mbgl/util/worker.hpp @@ -14,6 +14,10 @@ class WorkRequest; class RasterBucket; class GeometryTileLoader; +using RasterTileParseResult = mapbox::util::variant< + std::unique_ptr, // success + std::string>; // error + class Worker : public mbgl::util::noncopyable { public: explicit Worker(std::size_t count); @@ -33,7 +37,7 @@ public: Request parseRasterTile(std::unique_ptr bucket, std::shared_ptr data, - std::function callback); + std::function callback); Request parseGeometryTile(TileWorker&, std::unique_ptr,