@loaders.gl/tiles 4.0.0-alpha.6 → 4.0.0-alpha.7

package/dist/es5/tileset/tileset-3d.js

@@ -68,7 +68,7 @@ var TILES_LOAD_FAILED = 'Failed Tile Loads';
 var POINTS_COUNT = 'Points/Vertices';
 var TILES_GPU_MEMORY = 'Tile Memory Use';
 var Tileset3D = function () {
-  function Tileset3D(json, options) {
+  function Tileset3D(tileset, options) {
     (0, _classCallCheck2.default)(this, Tileset3D);
     (0, _defineProperty2.default)(this, "options", void 0);
     (0, _defineProperty2.default)(this, "loadOptions", void 0);
@@ -82,14 +82,14 @@ var Tileset3D = function () {
     (0, _defineProperty2.default)(this, "lodMetricType", void 0);
     (0, _defineProperty2.default)(this, "lodMetricValue", void 0);
     (0, _defineProperty2.default)(this, "refine", void 0);
-    (0, _defineProperty2.default)(this, "root", void 0);
-    (0, _defineProperty2.default)(this, "roots", void 0);
-    (0, _defineProperty2.default)(this, "asset", void 0);
-    (0, _defineProperty2.default)(this, "description", void 0);
+    (0, _defineProperty2.default)(this, "root", null);
+    (0, _defineProperty2.default)(this, "roots", {});
+    (0, _defineProperty2.default)(this, "asset", {});
+    (0, _defineProperty2.default)(this, "description", '');
     (0, _defineProperty2.default)(this, "properties", void 0);
-    (0, _defineProperty2.default)(this, "extras", void 0);
-    (0, _defineProperty2.default)(this, "attributions", void 0);
-    (0, _defineProperty2.default)(this, "credits", void 0);
+    (0, _defineProperty2.default)(this, "extras", null);
+    (0, _defineProperty2.default)(this, "attributions", {});
+    (0, _defineProperty2.default)(this, "credits", {});
     (0, _defineProperty2.default)(this, "stats", void 0);
     (0, _defineProperty2.default)(this, "contentFormats", {
       draco: false,
@@ -97,81 +97,52 @@ var Tileset3D = function () {
       dds: false,
       ktx2: false
     });
-    (0, _defineProperty2.default)(this, "traverseCounter", void 0);
-    (0, _defineProperty2.default)(this, "geometricError", void 0);
-    (0, _defineProperty2.default)(this, "selectedTiles", void 0);
-    (0, _defineProperty2.default)(this, "updatePromise", null);
-    (0, _defineProperty2.default)(this, "tilesetInitializationPromise", void 0);
-    (0, _defineProperty2.default)(this, "cartographicCenter", void 0);
-    (0, _defineProperty2.default)(this, "cartesianCenter", void 0);
-    (0, _defineProperty2.default)(this, "zoom", void 0);
-    (0, _defineProperty2.default)(this, "boundingVolume", void 0);
-    (0, _defineProperty2.default)(this, "gpuMemoryUsageInBytes", void 0);
-    (0, _defineProperty2.default)(this, "dynamicScreenSpaceErrorComputedDensity", void 0);
+    (0, _defineProperty2.default)(this, "cartographicCenter", null);
+    (0, _defineProperty2.default)(this, "cartesianCenter", null);
+    (0, _defineProperty2.default)(this, "zoom", 1);
+    (0, _defineProperty2.default)(this, "boundingVolume", null);
+    (0, _defineProperty2.default)(this, "dynamicScreenSpaceErrorComputedDensity", 0.0);
+    (0, _defineProperty2.default)(this, "maximumMemoryUsage", 32);
+    (0, _defineProperty2.default)(this, "gpuMemoryUsageInBytes", 0);
+    (0, _defineProperty2.default)(this, "_frameNumber", 0);
+    (0, _defineProperty2.default)(this, "_queryParams", {});
+    (0, _defineProperty2.default)(this, "_extensionsUsed", []);
+    (0, _defineProperty2.default)(this, "_tiles", {});
+    (0, _defineProperty2.default)(this, "_pendingCount", 0);
+    (0, _defineProperty2.default)(this, "selectedTiles", []);
+    (0, _defineProperty2.default)(this, "traverseCounter", 0);
+    (0, _defineProperty2.default)(this, "geometricError", 0);
+    (0, _defineProperty2.default)(this, "lastUpdatedVieports", null);
+    (0, _defineProperty2.default)(this, "_requestedTiles", []);
+    (0, _defineProperty2.default)(this, "_emptyTiles", []);
+    (0, _defineProperty2.default)(this, "frameStateData", {});
     (0, _defineProperty2.default)(this, "_traverser", void 0);
-    (0, _defineProperty2.default)(this, "_cache", void 0);
+    (0, _defineProperty2.default)(this, "_cache", new _tilesetCache.TilesetCache());
     (0, _defineProperty2.default)(this, "_requestScheduler", void 0);
-    (0, _defineProperty2.default)(this, "_frameNumber", void 0);
-    (0, _defineProperty2.default)(this, "_queryParamsString", void 0);
-    (0, _defineProperty2.default)(this, "_queryParams", void 0);
-    (0, _defineProperty2.default)(this, "_extensionsUsed", void 0);
-    (0, _defineProperty2.default)(this, "_tiles", void 0);
-    (0, _defineProperty2.default)(this, "_pendingCount", void 0);
-    (0, _defineProperty2.default)(this, "lastUpdatedVieports", void 0);
-    (0, _defineProperty2.default)(this, "_requestedTiles", void 0);
-    (0, _defineProperty2.default)(this, "_emptyTiles", void 0);
-    (0, _defineProperty2.default)(this, "frameStateData", void 0);
-    (0, _defineProperty2.default)(this, "maximumMemoryUsage", void 0);
-    (0, _loaderUtils.assert)(json);
+    (0, _defineProperty2.default)(this, "updatePromise", null);
+    (0, _defineProperty2.default)(this, "tilesetInitializationPromise", void 0);
     this.options = _objectSpread(_objectSpread({}, DEFAULT_PROPS), options);
-    this.tileset = json;
-    this.loader = json.loader;
-    this.type = json.type;
-    this.url = json.url;
-    this.basePath = json.basePath || _loaderUtils.path.dirname(this.url);
+    this.tileset = tileset;
+    this.loader = tileset.loader;
+    this.type = tileset.type;
+    this.url = tileset.url;
+    this.basePath = tileset.basePath || _loaderUtils.path.dirname(this.url);
     this.modelMatrix = this.options.modelMatrix;
     this.ellipsoid = this.options.ellipsoid;
-    this.lodMetricType = json.lodMetricType;
-    this.lodMetricValue = json.lodMetricValue;
-    this.refine = json.root.refine;
+    this.lodMetricType = tileset.lodMetricType;
+    this.lodMetricValue = tileset.lodMetricValue;
+    this.refine = tileset.root.refine;
     this.loadOptions = this.options.loadOptions || {};
-    this.root = null;
-    this.roots = {};
-    this.cartographicCenter = null;
-    this.cartesianCenter = null;
-    this.zoom = 1;
-    this.boundingVolume = null;
-    this.traverseCounter = 0;
-    this.geometricError = 0;
     this._traverser = this._initializeTraverser();
-    this._cache = new _tilesetCache.TilesetCache();
     this._requestScheduler = new _loaderUtils.RequestScheduler({
       throttleRequests: this.options.throttleRequests,
       maxRequests: this.options.maxRequests
     });
-    this._frameNumber = 0;
-    this._pendingCount = 0;
-    this._tiles = {};
-    this.selectedTiles = [];
-    this._emptyTiles = [];
-    this._requestedTiles = [];
-    this.frameStateData = {};
-    this.lastUpdatedVieports = null;
-    this._queryParams = {};
-    this._queryParamsString = '';
-    this.maximumMemoryUsage = this.options.maximumMemoryUsage || 32;
-    this.gpuMemoryUsageInBytes = 0;
     this.stats = new _stats.Stats({
       id: this.url
     });
     this._initializeStats();
-    this._extensionsUsed = undefined;
-    this.dynamicScreenSpaceErrorComputedDensity = 0.0;
-    this.extras = null;
-    this.asset = {};
-    this.credits = {};
-    this.description = this.options.description || '';
-    this.tilesetInitializationPromise = this._initializeTileSet(json);
+    this.tilesetInitializationPromise = this._initializeTileSet(tileset);
   }
   (0, _createClass2.default)(Tileset3D, [{
     key: "destroy",
@@ -196,10 +167,7 @@ var Tileset3D = function () {
   }, {
     key: "queryParams",
     get: function get() {
-      if (!this._queryParamsString) {
-        this._queryParamsString = getQueryParamString(this._queryParams);
-      }
-      return this._queryParamsString;
+      return new URLSearchParams(this._queryParams).toString();
     }
   }, {
     key: "setProps",
@@ -218,12 +186,12 @@ var Tileset3D = function () {
       if (isDataUrl) {
         return tilePath;
       }
-      return "".concat(tilePath).concat(this.queryParams);
+      return "".concat(tilePath).concat(tilePath.includes('?') ? '&' : '?').concat(this.queryParams);
     }
   }, {
     key: "hasExtension",
     value: function hasExtension(extensionName) {
-      return Boolean(this._extensionsUsed && this._extensionsUsed.indexOf(extensionName) > -1);
+      return Boolean(this._extensionsUsed.indexOf(extensionName) > -1);
     }
   }, {
     key: "update",
@@ -300,9 +268,9 @@ var Tileset3D = function () {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var viewport = _step.value;
-          var _id = viewport.id;
-          if (this._needTraverse(_id)) {
-            viewportsToTraverse.push(_id);
+          var id = viewport.id;
+          if (this._needTraverse(id)) {
+            viewportsToTraverse.push(id);
           } else {
             this.traverseCounter--;
           }
@@ -317,15 +285,15 @@ var Tileset3D = function () {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var _viewport = _step2.value;
-          var _id2 = _viewport.id;
-          if (!this.roots[_id2]) {
-            this.roots[_id2] = this._initializeTileHeaders(this.tileset, null);
+          var _id = _viewport.id;
+          if (!this.roots[_id]) {
+            this.roots[_id] = this._initializeTileHeaders(this.tileset, null);
           }
-          if (!viewportsToTraverse.includes(_id2)) {
+          if (!viewportsToTraverse.includes(_id)) {
             continue;
           }
           var frameState = (0, _frameState.getFrameState)(_viewport, this._frameNumber);
-          this._traverser.traverse(this.roots[_id2], frameState, this.options);
+          this._traverser.traverse(this.roots[_id], frameState, this.options);
         }
       } catch (err) {
         _iterator2.e(err);
@@ -559,7 +527,6 @@ var Tileset3D = function () {
     key: "calculateViewPropsTiles3D",
     value: function calculateViewPropsTiles3D() {
       var root = this.root;
-      (0, _loaderUtils.assert)(root);
       var center = root.boundingVolume.center;
       if (!center) {
         console.warn('center was not pre-calculated for the root tile');
@@ -608,8 +575,16 @@ var Tileset3D = function () {
             _step7;
           try {
             for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var _childTile$contentUrl;
               var childHeader = _step7.value;
               var childTile = new _tile3d.Tile3D(this, childHeader, _tile5);
+              if ((_childTile$contentUrl = childTile.contentUrl) !== null && _childTile$contentUrl !== void 0 && _childTile$contentUrl.includes('?session=')) {
+                var _url = new URL(childTile.contentUrl);
+                var session = _url.searchParams.get('session');
+                if (session) {
+                  this._queryParams.session = session;
+                }
+              }
               _tile5.children.push(childTile);
               childTile.depth = _tile5.depth + 1;
               stack.push(childTile);
@@ -667,7 +642,7 @@ var Tileset3D = function () {
             case 7:
               _context3.prev = 7;
               _context3.t0 = _context3["catch"](0);
-              this._onTileLoadError(tile, _context3.t0);
+              this._onTileLoadError(tile, _context3.t0 instanceof Error ? _context3.t0 : new Error('load failed'));
             case 10:
               _context3.prev = 10;
               this._onEndTileLoading();
@@ -768,13 +743,13 @@ var Tileset3D = function () {
     value: function _updateCacheStats(tile) {
       this.stats.get(TILES_LOADED).incrementCount();
       this.stats.get(TILES_IN_MEMORY).incrementCount();
-      this.gpuMemoryUsageInBytes += tile.content.byteLength || 0;
+      this.gpuMemoryUsageInBytes += tile.gpuMemoryUsageInBytes || 0;
       this.stats.get(TILES_GPU_MEMORY).count = this.gpuMemoryUsageInBytes;
     }
   }, {
     key: "_unloadTile",
     value: function _unloadTile(tile) {
-      this.gpuMemoryUsageInBytes -= tile.content && tile.content.byteLength || 0;
+      this.gpuMemoryUsageInBytes -= tile.gpuMemoryUsageInBytes || 0;
       this.stats.get(TILES_IN_MEMORY).decrementCount();
       this.stats.get(TILES_UNLOADED).incrementCount();
       this.stats.get(TILES_GPU_MEMORY).count = this.gpuMemoryUsageInBytes;
@@ -842,11 +817,16 @@ var Tileset3D = function () {
   }, {
     key: "_initializeTiles3DTileset",
     value: function _initializeTiles3DTileset(tilesetJson) {
+      if (tilesetJson.queryString) {
+        var searchParams = new URLSearchParams(tilesetJson.queryString);
+        var queryParams = Object.fromEntries(searchParams.entries());
+        this._queryParams = _objectSpread(_objectSpread({}, this._queryParams), queryParams);
+      }
       this.asset = tilesetJson.asset;
       if (!this.asset) {
         throw new Error('Tileset must have an asset property.');
       }
-      if (this.asset.version !== '0.0' && this.asset.version !== '1.0') {
+      if (this.asset.version !== '0.0' && this.asset.version !== '1.0' && this.asset.version !== '1.1') {
         throw new Error('The tileset must be 3D Tiles version 0.0 or 1.0.');
       }
       if ('tilesetVersion' in this.asset) {
@@ -858,7 +838,7 @@ var Tileset3D = function () {
       this.description = this.options.description || '';
       this.properties = tilesetJson.properties;
       this.geometricError = tilesetJson.geometricError;
-      this._extensionsUsed = tilesetJson.extensionsUsed;
+      this._extensionsUsed = tilesetJson.extensionsUsed || [];
       this.extras = tilesetJson.extras;
     }
   }, {
@@ -872,19 +852,4 @@ var Tileset3D = function () {
   return Tileset3D;
 }();
 exports.Tileset3D = Tileset3D;
-function getQueryParamString(queryParams) {
-  var queryParamStrings = [];
-  for (var _i = 0, _Object$keys = Object.keys(queryParams); _i < _Object$keys.length; _i++) {
-    var _key = _Object$keys[_i];
-    queryParamStrings.push("".concat(_key, "=").concat(queryParams[_key]));
-  }
-  switch (queryParamStrings.length) {
-    case 0:
-      return '';
-    case 1:
-      return "?".concat(queryParamStrings[0]);
-    default:
-      return "?".concat(queryParamStrings.join('&'));
-  }
-}
 //# sourceMappingURL=tileset-3d.js.map