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/geometry_tile_worker.cpp | |
| 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/geometry_tile_worker.cpp')
| -rw-r--r-- | src/mbgl/tile/geometry_tile_worker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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: |