Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check childTileMask if provider doesn't know tile availability. #7851

Merged
merged 2 commits into from
May 21, 2019
Merged

Check childTileMask if provider doesn't know tile availability. #7851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
671038a
Check childTileMask if provider doesn't know tile availability.
kring May 18, 2019
aec9bc3
Update CHANGES.md.
kring May 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Change Log

##### Fixes :wrench:
* Fixed an edge case where Cesium would provide ion access token credentials to non-ion servers if the actual asset entrypoint was being hosted by ion. [#7839](https://github.com/AnalyticalGraphicsInc/cesium/pull/7839)
* Fixed a bug that caused Cesium to request non-existent tiles for terrain tilesets lacking tile availability, i.e. a `layer.json` file.

### 1.57 - 2019-05-01

Expand Down
13 changes: 12 additions & 1 deletion Source/Scene/GlobeSurfaceTile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,18 @@ define([
};

function prepareNewTile(tile, terrainProvider, imageryLayerCollection) {
if (terrainProvider.getTileDataAvailable(tile.x, tile.y, tile.level) === false) {
var available = terrainProvider.getTileDataAvailable(tile.x, tile.y, tile.level);

if (!defined(available) && defined(tile.parent)) {
// Provider doesn't know if this tile is available. Does the parent tile know?
var parent = tile.parent;
var parentSurfaceTile = parent.data;
if (defined(parentSurfaceTile) && defined(parentSurfaceTile.terrainData)) {
available = parentSurfaceTile.terrainData.isChildAvailable(parent.x, parent.y, tile.x, tile.y);
}
}

if (available === false) {
// This tile is not available, so mark it failed so we start upsampling right away.
tile.data.terrainState = TerrainState.FAILED;
}
Expand Down