diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-13 15:15:51 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-14 12:15:29 -0800 |
commit | f74de6731591ef11a75612b31f62877deb9f833c (patch) | |
tree | ecc79f424f6e2bd96e10c68fb598ad1469b4f040 | |
parent | 34fbd565b84153c830b1a12fe1029946f3fdac3f (diff) | |
download | qtlocation-mapboxgl-f74de6731591ef11a75612b31f62877deb9f833c.tar.gz |
[core] Mark tile as incomplete while redoing placement
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/package.json b/package.json index 32d6038922..cd8e858ff9 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "lodash": "^4.16.4", "mapbox-gl": "mapbox/mapbox-gl-js#ab836206d415ca3a74257a3066d11a54ab2838cb", "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653", - "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#66397c8ee0426537d25e8d4cfcac134ca21a021b", + "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#bbe948a30c3879b77a220eaa1336f61d46db5953", "mkdirp": "^0.5.1", "node-cmake": "^1.2.1", "pixelmatch": "^4.0.2", diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 84455e4787..10c0e1b244 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -61,6 +61,12 @@ void GeometryTile::setPlacementConfig(const PlacementConfig& desiredConfig) { return; } + // Mark the tile as pending again if it was complete before to prevent signaling a complete + // state despite pending parse operations. + if (availableData == DataAvailability::All) { + availableData = DataAvailability::Some; + } + ++correlationID; requestedConfig = desiredConfig; worker.invoke(&GeometryTileWorker::setPlacementConfig, desiredConfig, correlationID); |