diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-21 15:41:09 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-22 10:55:56 +0300 |
commit | a1da06cb68ebfe98601390349d5d914a9c939c70 (patch) | |
tree | 6233518f662e2c9aaffc9d6fab5bdae8b00bd2ca /src/mbgl/tile | |
parent | 4a05d58df6b2736a56015eea7dd9433ca822573a (diff) | |
download | qtlocation-mapboxgl-a1da06cb68ebfe98601390349d5d914a9c939c70.tar.gz |
[core] Fix GeoJSON tiles update
Before this change, GeoJSON tiles data were updated before the
corresponding layers were applied, therefore `GeometryTileWorker`
parsed new data with the outdated layers.
It caused the following render test failure:
`mbgl-render-test text-max-width/unlimited regressions/mapbox-gl-native#9976 --recycle-map`
Now a GeoJSON tile, which needs relayout, is not parsed until the valid layers
are set.
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/geojson_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile_worker.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile_worker.hpp | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 4cf971df84..0782f74d5d 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -13,8 +13,8 @@ GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, updateData(std::move(features)); } -void GeoJSONTile::updateData(mapbox::feature::feature_collection<int16_t> features) { - setData(std::make_unique<GeoJSONTileData>(std::move(features))); +void GeoJSONTile::updateData(mapbox::feature::feature_collection<int16_t> features, bool resetLayers) { + setData(std::make_unique<GeoJSONTileData>(std::move(features)), resetLayers); } void GeoJSONTile::querySourceFeatures( diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 725dc4850c..9161e33f0c 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -14,7 +14,7 @@ public: const TileParameters&, mapbox::feature::feature_collection<int16_t>); - void updateData(mapbox::feature::feature_collection<int16_t>); + void updateData(mapbox::feature::feature_collection<int16_t>, bool resetLayers = false); void querySourceFeatures( std::vector<Feature>& result, diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index a431ae423e..3087b4fc6a 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -176,13 +176,13 @@ void GeometryTile::setError(std::exception_ptr err) { observer->onTileError(*this, err); } -void GeometryTile::setData(std::unique_ptr<const GeometryTileData> data_) { +void GeometryTile::setData(std::unique_ptr<const GeometryTileData> data_, bool resetLayers) { // Mark the tile as pending again if it was complete before to prevent signaling a complete // state despite pending parse operations. pending = true; ++correlationID; - worker.self().invoke(&GeometryTileWorker::setData, std::move(data_), correlationID); + worker.self().invoke(&GeometryTileWorker::setData, std::move(data_), resetLayers, correlationID); } std::unique_ptr<TileRenderData> GeometryTile::createRenderData() { diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 7c46edfc1d..8682c8c76b 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -34,7 +34,7 @@ public: ~GeometryTile() override; void setError(std::exception_ptr); - void setData(std::unique_ptr<const GeometryTileData>); + void setData(std::unique_ptr<const GeometryTileData>, bool resetLayers = false); std::unique_ptr<TileRenderData> createRenderData() override; void setLayers(const std::vector<Immutable<style::LayerProperties>>&) override; diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index f4d57e5bfc..428a5b0d5e 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -117,10 +117,11 @@ GeometryTileWorker::~GeometryTileWorker() = default; completed parse. */ -void GeometryTileWorker::setData(std::unique_ptr<const GeometryTileData> data_, uint64_t correlationID_) { +void GeometryTileWorker::setData(std::unique_ptr<const GeometryTileData> data_, bool resetLayers_, uint64_t correlationID_) { try { data = std::move(data_); correlationID = correlationID_; + if (resetLayers_) layers = nullopt; switch (state) { case Idle: diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp index 258f2cd186..96b4e2e83a 100644 --- a/src/mbgl/tile/geometry_tile_worker.hpp +++ b/src/mbgl/tile/geometry_tile_worker.hpp @@ -39,7 +39,7 @@ public: ~GeometryTileWorker(); void setLayers(std::vector<Immutable<style::LayerProperties>>, uint64_t correlationID); - void setData(std::unique_ptr<const GeometryTileData>, uint64_t correlationID); + void setData(std::unique_ptr<const GeometryTileData>, bool resetLayers, uint64_t correlationID); void setShowCollisionBoxes(bool showCollisionBoxes_, uint64_t correlationID_); void onGlyphsAvailable(GlyphMap glyphs); |