Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Creating tileset assumption fix #3435

Merged
merged 9 commits into from
Jan 15, 2016
Merged

Creating tileset assumption fix #3435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6774fc
Directory working
TomPed Jan 14, 2016
cca6d09
Added use of helper function
TomPed Jan 15, 2016
995e458
Fixed typo
TomPed Jan 15, 2016
2b1152b
Fixed typo two
TomPed Jan 15, 2016
11a6c75
Typo three fixed
TomPed Jan 15, 2016
23c314a
Fixed directory not ending in '/' issue and added tests
TomPed Jan 15, 2016
19689eb
Reformatted code and tests
TomPed Jan 15, 2016
4db0ed7
Reformated
TomPed Jan 15, 2016
d84fb7c
Edits
lilleyse Jan 15, 2016
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
15 changes: 13 additions & 2 deletions Source/Scene/Cesium3DTileset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ define([
'../Core/destroyObject',
'../Core/DeveloperError',
'../Core/Event',
'../Core/getBaseUri',
'../Core/getExtensionFromUri',
'../Core/Intersect',
'../Core/loadJson',
'../Core/Math',
Expand All @@ -26,6 +28,8 @@ define([
destroyObject,
DeveloperError,
Event,
getBaseUri,
getExtensionFromUri,
Intersect,
loadJson,
CesiumMath,
Expand Down Expand Up @@ -68,10 +72,17 @@ define([
}
//>>includeEnd('debug');

url = appendForwardSlash(url);
var tilesJson;
if (getExtensionFromUri(url) === 'json') {
tilesJson = url;
url = getBaseUri(url);
} else {
url = appendForwardSlash(url);
tilesJson = url + 'tiles.json';
}

this._url = url;
this._tilesJson = url + 'tiles.json';
this._tilesJson = tilesJson;
this._state = Cesium3DTilesetState.UNLOADED;
this._root = undefined;
this._properties = undefined; // Metadata for per-model/point/etc properties
Expand Down
24 changes: 24 additions & 0 deletions Specs/Scene/Cesium3DTilesetSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,30 @@ defineSuite([
});
});

it('url and tilesJson set up correctly given tiles.json path', function() {
var tileset = new Cesium3DTileset({
url : './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles3.json'
});
expect(tileset._url).toEqual('./Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/');
expect(tileset._tilesJson).toEqual('./Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles3.json');
});

it('url and tilesJson set up correctly given directory without trailing slash', function() {
var tileset = new Cesium3DTileset({
url : './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets'
});
expect(tileset._url).toEqual('./Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/');
expect(tileset._tilesJson).toEqual('./Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles.json');
});

it('url and tilesJson set up correctly given directory with trailing slash', function() {
var tileset = new Cesium3DTileset({
url : './Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/'
});
expect(tileset._url).toEqual('./Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/');
expect(tileset._tilesJson).toEqual('./Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles.json');
});

it('resolves readyPromise', function() {
return Cesium3DTilesTester.loadTileset(scene, tilesetUrl).then(function(tileset) {
return tileset.readyPromise.then(function(tileset) {
Expand Down