[core] Calculate GeoJSON tile geometries in a background thread

Call `mapbox::geojsonvt::GeoJSONVT::getTile()` in a background
thread, so that the rendering thread is not blocked.
This commit is contained in:
Mikhail Pozdnyakov
2019-11-20 21:05:45 +02:00
parent ab5572b0bc
commit 6419cd0ab2
6 changed files with 87 additions and 53 deletions

View File

@@ -1,20 +1,29 @@
#include <mbgl/tile/geojson_tile.hpp>
#include <mbgl/tile/geojson_tile_data.hpp>
#include <mbgl/renderer/query.hpp>
#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/style/sources/geojson_source.hpp>
#include <mbgl/tile/geojson_tile.hpp>
#include <mbgl/tile/geojson_tile_data.hpp>
namespace mbgl {
GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
std::string sourceID_,
const TileParameters& parameters,
mapbox::feature::feature_collection<int16_t> features)
std::shared_ptr<style::GeoJSONData> data_)
: GeometryTile(overscaledTileID, sourceID_, parameters) {
updateData(std::move(features));
updateData(std::move(data_));
}
void GeoJSONTile::updateData(mapbox::feature::feature_collection<int16_t> features, bool resetLayers) {
setData(std::make_unique<GeoJSONTileData>(std::move(features)), resetLayers);
void GeoJSONTile::updateData(std::shared_ptr<style::GeoJSONData> data_, bool resetLayers) {
assert(data_);
data = std::move(data_);
data->getTile(id.canonical,
[this, self = weakFactory.makeWeakPtr(), capturedData = data.get(), resetLayers](
style::GeoJSONData::TileFeatures features) {
if (!self) return;
if (data.get() != capturedData) return;
auto tileData = std::make_unique<GeoJSONTileData>(std::move(features));
setData(std::move(tileData), resetLayers);
});
}
void GeoJSONTile::querySourceFeatures(