@loaders.gl/tiles 3.2.0-alpha.1 → 3.2.0-alpha.2

package/dist/dist.min.js

@@ -3672,7 +3672,7 @@
           this.worker = isBrowser2 ? this._createBrowserWorker() : this._createNodeWorker();
         }
         static isSupported() {
-          return typeof Worker !== "undefined" && isBrowser2;
+          return typeof Worker !== "undefined" && isBrowser2 || typeof Worker2 !== void 0;
         }
         destroy() {
           this.onMessage = NOOP;
@@ -5145,6 +5145,15 @@
     }
     return 1;
   }
+  function getZoomFromFullExtent(fullExtent, cartorgraphicCenter, cartesianCenter) {
+    const extentVertex = Ellipsoid.WGS84.cartographicToCartesian([fullExtent.xmax, fullExtent.ymax, fullExtent.zmax], new Vector3());
+    const extentSize = Math.sqrt(Math.pow(extentVertex[0] - cartesianCenter[0], 2) + Math.pow(extentVertex[1] - cartesianCenter[1], 2) + Math.pow(extentVertex[2] - cartesianCenter[2], 2));
+    return Math.log2(WGS84_RADIUS_Z2 / (extentSize + cartorgraphicCenter[2]));
+  }
+  function getZoomFromExtent(extent, cartorgraphicCenter, cartesianCenter) {
+    const [xmin, ymin, xmax, ymax] = extent;
+    return getZoomFromFullExtent({ xmin, xmax, ymin, ymax, zmin: 0, zmax: 0 }, cartorgraphicCenter, cartesianCenter);
+  }
   function getObbSize(halfAxes) {
     halfAxes.getColumn(0, scratchVector8);
     const axeY = halfAxes.getColumn(1);
@@ -5158,6 +5167,7 @@
     "src/tileset/helpers/zoom.ts"() {
       init_esm();
       init_esm4();
+      init_esm2();
       WGS84_RADIUS_X2 = 6378137;
       WGS84_RADIUS_Y2 = 6378137;
       WGS84_RADIUS_Z2 = 6356752314245179e-9;
@@ -5304,7 +5314,7 @@
         text += ` ${await response.text()}`;
       }
       message += text;
-      message = message.length > 60 ? `${message.slice(60)}...` : message;
+      message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
     } catch (error) {
     }
     return message;
@@ -7714,6 +7724,8 @@
       };
       TilesetTraverser = class {
         constructor(options) {
+          this.lastUpdate = new Date().getTime();
+          this.updateDebounceTime = 1e3;
           this.options = { ...DEFAULT_PROPS3, ...options };
           this._traversalStack = new ManagedArray();
           this._emptyTraversalStack = new ManagedArray();
@@ -7723,6 +7735,9 @@
           this.requestedTiles = {};
           this.emptyTiles = {};
         }
+        get traversalFinished() {
+          return true;
+        }
         traverse(root, frameState, options) {
           this.root = root;
           this.options = { ...this.options, ...options };
@@ -7770,7 +7785,11 @@
             this.touchTile(tile, frameState);
             tile._shouldRefine = shouldRefine && parentRefines;
           }
-          this.options.onTraversalEnd(frameState);
+          const newTime = new Date().getTime();
+          if (this.traversalFinished || newTime - this.lastUpdate > this.updateDebounceTime) {
+            this.lastUpdate = newTime;
+            this.options.onTraversalEnd(frameState);
+          }
         }
         updateChildTiles(tile, frameState) {
           const children = tile.children;
@@ -8327,10 +8346,35 @@
     }
   });
 
+  // src/tileset/traversers/i3s-frame-counter.ts
+  var I3SPendingTilesRegister;
+  var init_i3s_frame_counter = __esm({
+    "src/tileset/traversers/i3s-frame-counter.ts"() {
+      I3SPendingTilesRegister = class {
+        constructor() {
+          this.frameNumberMap = new Map();
+        }
+        register(frameNumber) {
+          const oldCount = this.frameNumberMap.get(frameNumber) || 0;
+          this.frameNumberMap.set(frameNumber, (oldCount || 0) + 1);
+        }
+        deregister(frameNumber) {
+          const oldCount = this.frameNumberMap.get(frameNumber) || 1;
+          this.frameNumberMap.set(frameNumber, (oldCount || 0) - 1);
+        }
+        isZero(frameNumber) {
+          const count = this.frameNumberMap.get(frameNumber) || 0;
+          return count === 0;
+        }
+      };
+    }
+  });
+
   // src/tileset/traversers/i3s-tile-manager.ts
   var STATUS, I3STileManager;
   var init_i3s_tile_manager = __esm({
     "src/tileset/traversers/i3s-tile-manager.ts"() {
+      init_i3s_frame_counter();
       STATUS = {
         REQUESTED: "REQUESTED",
         COMPLETED: "COMPLETED",
@@ -8338,28 +8382,38 @@
       };
       I3STileManager = class {
         constructor() {
+          this.pendingTilesRegister = new I3SPendingTilesRegister();
           this._statusMap = {};
         }
         add(request, key, callback, frameState) {
           if (!this._statusMap[key]) {
+            const { frameNumber } = frameState;
             this._statusMap[key] = { request, callback, key, frameState, status: STATUS.REQUESTED };
+            this.pendingTilesRegister.register(frameNumber);
             request().then((data) => {
               this._statusMap[key].status = STATUS.COMPLETED;
+              this.pendingTilesRegister.deregister(frameNumber);
               this._statusMap[key].callback(data, frameState);
             }).catch((error) => {
               this._statusMap[key].status = STATUS.ERROR;
+              this.pendingTilesRegister.deregister(frameNumber);
               callback(error);
             });
           }
         }
         update(key, frameState) {
           if (this._statusMap[key]) {
+            this.pendingTilesRegister.deregister(this._statusMap[key].frameState.frameNumber);
+            this.pendingTilesRegister.register(frameState.frameNumber);
             this._statusMap[key].frameState = frameState;
           }
         }
         find(key) {
           return this._statusMap[key];
         }
+        hasPendingTiles(frameNumber) {
+          return !this.pendingTilesRegister.isZero(frameNumber);
+        }
       };
     }
   });
@@ -8374,6 +8428,9 @@
       init_tile_3d();
       init_i3s_tile_manager();
       I3STilesetTraverser = class extends TilesetTraverser {
+        get traversalFinished() {
+          return !this._tileManager.hasPendingTiles(this._frameNumber || 0);
+        }
         constructor(options) {
           super(options);
           this._tileManager = new I3STileManager();
@@ -8424,7 +8481,7 @@
           tile.children.push(childTile);
           const frameState = this._tileManager.find(childTile.id).frameState;
           this.updateTile(childTile, frameState);
-          if (this._frameNumber === frameState.frameNumber) {
+          if (this._frameNumber === frameState.frameNumber && (this.traversalFinished || new Date().getTime() - this.lastUpdate > this.updateDebounceTime)) {
             this.executeTraversal(childTile, frameState);
           }
         }
@@ -8550,7 +8607,7 @@
           this.asset = {};
           this.credits = {};
           this.description = this.options.description || "";
-          this._initializeTileSet(json);
+          this.tilesetInitializationPromise = this._initializeTileSet(json);
         }
         destroy() {
           this._destroy();
@@ -8587,14 +8644,17 @@
           return Boolean(this._extensionsUsed && this._extensionsUsed.indexOf(extensionName) > -1);
         }
         update(viewports = null) {
-          if (!viewports && this.lastUpdatedVieports) {
-            viewports = this.lastUpdatedVieports;
-          } else {
-            this.lastUpdatedVieports = viewports;
-          }
-          this.doUpdate(viewports);
+          this.tilesetInitializationPromise.then(() => {
+            if (!viewports && this.lastUpdatedVieports) {
+              viewports = this.lastUpdatedVieports;
+            } else {
+              this.lastUpdatedVieports = viewports;
+            }
+            this.doUpdate(viewports);
+          });
         }
         async selectTiles(viewports = null) {
+          await this.tilesetInitializationPromise;
           if (viewports) {
             this.lastUpdatedVieports = viewports;
           }
@@ -8726,17 +8786,43 @@
           this.stats.get(TILES_RENDERABLE).count = tilesRenderable;
           this.stats.get(POINTS_COUNT).count = pointsRenderable;
         }
-        _initializeTileSet(tilesetJson) {
+        async _initializeTileSet(tilesetJson) {
+          if (this.type === TILESET_TYPE.I3S) {
+            this.calculateViewPropsI3S();
+            tilesetJson.root = await tilesetJson.root;
+          }
           this.root = this._initializeTileHeaders(tilesetJson, null);
           if (this.type === TILESET_TYPE.TILES3D) {
-            this._initializeCesiumTileset(tilesetJson);
+            this._initializeTiles3DTileset(tilesetJson);
+            this.calculateViewPropsTiles3D();
           }
           if (this.type === TILESET_TYPE.I3S) {
             this._initializeI3STileset();
           }
-          this._calculateViewProps();
         }
-        _calculateViewProps() {
+        calculateViewPropsI3S() {
+          const fullExtent = this.tileset.fullExtent;
+          if (fullExtent) {
+            const { xmin, xmax, ymin, ymax, zmin, zmax } = fullExtent;
+            this.cartographicCenter = new Vector3(xmin + (xmax - xmin) / 2, ymin + (ymax - ymin) / 2, zmin + (zmax - zmin) / 2);
+            this.cartesianCenter = Ellipsoid.WGS84.cartographicToCartesian(this.cartographicCenter, new Vector3());
+            this.zoom = getZoomFromFullExtent(fullExtent, this.cartographicCenter, this.cartesianCenter);
+            return;
+          }
+          const extent = this.tileset.store?.extent;
+          if (extent) {
+            const [xmin, ymin, xmax, ymax] = extent;
+            this.cartographicCenter = new Vector3(xmin + (xmax - xmin) / 2, ymin + (ymax - ymin) / 2, 0);
+            this.cartesianCenter = Ellipsoid.WGS84.cartographicToCartesian(this.cartographicCenter, new Vector3());
+            this.zoom = getZoomFromExtent(extent, this.cartographicCenter, this.cartesianCenter);
+            return;
+          }
+          console.warn("Extent is not defined in the tileset header");
+          this.cartographicCenter = new Vector3();
+          this.zoom = 1;
+          return;
+        }
+        calculateViewPropsTiles3D() {
           const root = this.root;
           assert2(root);
           const { center } = root.boundingVolume;
@@ -8894,7 +8980,7 @@
           this._unloadTile(tile);
           tile.destroy();
         }
-        _initializeCesiumTileset(tilesetJson) {
+        _initializeTiles3DTileset(tilesetJson) {
           this.asset = tilesetJson.asset;
           if (!this.asset) {
             throw new Error("Tileset must have an asset property.");

package/dist/es5/tileset/helpers/zoom.js

@@ -1,14 +1,22 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getZoomFromBoundingVolume = getZoomFromBoundingVolume;
+exports.getZoomFromFullExtent = getZoomFromFullExtent;
+exports.getZoomFromExtent = getZoomFromExtent;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _core = require("@math.gl/core");
 
 var _culling = require("@math.gl/culling");
 
+var _geospatial = require("@math.gl/geospatial");
+
 var WGS84_RADIUS_X = 6378137.0;
 var WGS84_RADIUS_Y = 6378137.0;
 var WGS84_RADIUS_Z = 6356752.3142451793;
@@ -33,6 +41,30 @@ function getZoomFromBoundingVolume(boundingVolume, cartorgraphicCenter) {
   return 1;
 }
 
+function getZoomFromFullExtent(fullExtent, cartorgraphicCenter, cartesianCenter) {
+  var extentVertex = _geospatial.Ellipsoid.WGS84.cartographicToCartesian([fullExtent.xmax, fullExtent.ymax, fullExtent.zmax], new _core.Vector3());
+
+  var extentSize = Math.sqrt(Math.pow(extentVertex[0] - cartesianCenter[0], 2) + Math.pow(extentVertex[1] - cartesianCenter[1], 2) + Math.pow(extentVertex[2] - cartesianCenter[2], 2));
+  return Math.log2(WGS84_RADIUS_Z / (extentSize + cartorgraphicCenter[2]));
+}
+
+function getZoomFromExtent(extent, cartorgraphicCenter, cartesianCenter) {
+  var _extent = (0, _slicedToArray2.default)(extent, 4),
+      xmin = _extent[0],
+      ymin = _extent[1],
+      xmax = _extent[2],
+      ymax = _extent[3];
+
+  return getZoomFromFullExtent({
+    xmin: xmin,
+    xmax: xmax,
+    ymin: ymin,
+    ymax: ymax,
+    zmin: 0,
+    zmax: 0
+  }, cartorgraphicCenter, cartesianCenter);
+}
+
 function getObbSize(halfAxes) {
   halfAxes.getColumn(0, scratchVector);
   var axeY = halfAxes.getColumn(1);

package/dist/es5/tileset/helpers/zoom.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/tileset/helpers/zoom.ts"],"names":["WGS84_RADIUS_X","WGS84_RADIUS_Y","WGS84_RADIUS_Z","scratchVector","Vector3","getZoomFromBoundingVolume","boundingVolume","cartorgraphicCenter","OrientedBoundingBox","halfAxes","obbSize","getObbSize","Math","log2","BoundingSphere","radius","width","height","zoomX","zoomY","getColumn","axeY","axeZ","farthestVertex","add","size","len"],"mappings":";;;;;;;AAAA;;AACA;;AAGA,IAAMA,cAAc,GAAG,SAAvB;AACA,IAAMC,cAAc,GAAG,SAAvB;AACA,IAAMC,cAAc,GAAG,kBAAvB;AAEA,IAAMC,aAAa,GAAG,IAAIC,aAAJ,EAAtB;;AAQO,SAASC,yBAAT,CACLC,cADK,EAELC,mBAFK,EAGL;AACA,MAAID,cAAc,YAAYE,4BAA9B,EAAmD;AAEjD,QAAOC,QAAP,GAAmBH,cAAnB,CAAOG,QAAP;AACA,QAAMC,OAAO,GAAGC,UAAU,CAACF,QAAD,CAA1B;AAGA,WAAOG,IAAI,CAACC,IAAL,CAAUX,cAAc,IAAIQ,OAAO,GAAGH,mBAAmB,CAAC,CAAD,CAAjC,CAAxB,CAAP;AACD,GAPD,MAOO,IAAID,cAAc,YAAYQ,uBAA9B,EAA8C;AAEnD,QAAOC,MAAP,GAAiBT,cAAjB,CAAOS,MAAP;AAEA,WAAOH,IAAI,CAACC,IAAL,CAAUX,cAAc,IAAIa,MAAM,GAAGR,mBAAmB,CAAC,CAAD,CAAhC,CAAxB,CAAP;AACD,GALM,MAKA,IAAID,cAAc,CAACU,KAAf,IAAwBV,cAAc,CAACW,MAA3C,EAAmD;AAExD,QAAOD,KAAP,GAAwBV,cAAxB,CAAOU,KAAP;AAAA,QAAcC,MAAd,GAAwBX,cAAxB,CAAcW,MAAd;AACA,QAAMC,KAAK,GAAGN,IAAI,CAACC,IAAL,CAAUb,cAAc,GAAGgB,KAA3B,CAAd;AACA,QAAMG,KAAK,GAAGP,IAAI,CAACC,IAAL,CAAUZ,cAAc,GAAGgB,MAA3B,CAAd;AAEA,WAAO,CAACC,KAAK,GAAGC,KAAT,IAAkB,CAAzB;AACD;;AAED,SAAO,CAAP;AACD;;AAED,SAASR,UAAT,CAAoBF,QAApB,EAA8B;AAC5BA,EAAAA,QAAQ,CAACW,SAAT,CAAmB,CAAnB,EAAsBjB,aAAtB;AACA,MAAMkB,IAAI,GAAGZ,QAAQ,CAACW,SAAT,CAAmB,CAAnB,CAAb;AACA,MAAME,IAAI,GAAGb,QAAQ,CAACW,SAAT,CAAmB,CAAnB,CAAb;AACA,MAAMG,cAAc,GAAGpB,aAAa,CAACqB,GAAd,CAAkBH,IAAlB,EAAwBG,GAAxB,CAA4BF,IAA5B,CAAvB;AACA,MAAMG,IAAI,GAAGF,cAAc,CAACG,GAAf,EAAb;AACA,SAAOD,IAAP;AACD","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {BoundingSphere, OrientedBoundingBox} from '@math.gl/culling';\nimport {BoundingRectangle} from '../../types';\n\nconst WGS84_RADIUS_X = 6378137.0;\nconst WGS84_RADIUS_Y = 6378137.0;\nconst WGS84_RADIUS_Z = 6356752.3142451793;\n\nconst scratchVector = new Vector3();\n\n/**\n * Calculate appropriate zoom value for a particular boundingVolume\n * @param boundingVolume - the instance of bounding volume\n * @param cartorgraphicCenter - cartographic center of the bounding volume\n * @returns {number} - zoom value\n */\nexport function getZoomFromBoundingVolume(\n  boundingVolume: BoundingSphere | OrientedBoundingBox | BoundingRectangle,\n  cartorgraphicCenter: Vector3\n) {\n  if (boundingVolume instanceof OrientedBoundingBox) {\n    // OrientedBoundingBox\n    const {halfAxes} = boundingVolume;\n    const obbSize = getObbSize(halfAxes);\n    // Use WGS84_RADIUS_Z to allign with BoundingSphere algorithm\n    // Add the tile elevation value for correct zooming to elevated tiles\n    return Math.log2(WGS84_RADIUS_Z / (obbSize + cartorgraphicCenter[2]));\n  } else if (boundingVolume instanceof BoundingSphere) {\n    // BoundingSphere\n    const {radius} = boundingVolume;\n    // Add the tile elevation value for correct zooming to elevated tiles\n    return Math.log2(WGS84_RADIUS_Z / (radius + cartorgraphicCenter[2]));\n  } else if (boundingVolume.width && boundingVolume.height) {\n    // BoundingRectangle\n    const {width, height} = boundingVolume;\n    const zoomX = Math.log2(WGS84_RADIUS_X / width);\n    const zoomY = Math.log2(WGS84_RADIUS_Y / height);\n\n    return (zoomX + zoomY) / 2;\n  }\n\n  return 1;\n}\n\nfunction getObbSize(halfAxes) {\n  halfAxes.getColumn(0, scratchVector);\n  const axeY = halfAxes.getColumn(1);\n  const axeZ = halfAxes.getColumn(2);\n  const farthestVertex = scratchVector.add(axeY).add(axeZ);\n  const size = farthestVertex.len();\n  return size;\n}\n"],"file":"zoom.js"}
+{"version":3,"sources":["../../../../src/tileset/helpers/zoom.ts"],"names":["WGS84_RADIUS_X","WGS84_RADIUS_Y","WGS84_RADIUS_Z","scratchVector","Vector3","getZoomFromBoundingVolume","boundingVolume","cartorgraphicCenter","OrientedBoundingBox","halfAxes","obbSize","getObbSize","Math","log2","BoundingSphere","radius","width","height","zoomX","zoomY","getZoomFromFullExtent","fullExtent","cartesianCenter","extentVertex","Ellipsoid","WGS84","cartographicToCartesian","xmax","ymax","zmax","extentSize","sqrt","pow","getZoomFromExtent","extent","xmin","ymin","zmin","getColumn","axeY","axeZ","farthestVertex","add","size","len"],"mappings":"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","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {BoundingSphere, OrientedBoundingBox} from '@math.gl/culling';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {BoundingRectangle} from '../../types';\n\nconst WGS84_RADIUS_X = 6378137.0;\nconst WGS84_RADIUS_Y = 6378137.0;\nconst WGS84_RADIUS_Z = 6356752.3142451793;\n\nconst scratchVector = new Vector3();\n\n/**\n * Calculate appropriate zoom value for a particular boundingVolume\n * @param boundingVolume - the instance of bounding volume\n * @param cartorgraphicCenter - cartographic center of the bounding volume\n * @returns {number} - zoom value\n */\nexport function getZoomFromBoundingVolume(\n  boundingVolume: BoundingSphere | OrientedBoundingBox | BoundingRectangle,\n  cartorgraphicCenter: Vector3\n) {\n  if (boundingVolume instanceof OrientedBoundingBox) {\n    // OrientedBoundingBox\n    const {halfAxes} = boundingVolume;\n    const obbSize = getObbSize(halfAxes);\n    // Use WGS84_RADIUS_Z to allign with BoundingSphere algorithm\n    // Add the tile elevation value for correct zooming to elevated tiles\n    return Math.log2(WGS84_RADIUS_Z / (obbSize + cartorgraphicCenter[2]));\n  } else if (boundingVolume instanceof BoundingSphere) {\n    // BoundingSphere\n    const {radius} = boundingVolume;\n    // Add the tile elevation value for correct zooming to elevated tiles\n    return Math.log2(WGS84_RADIUS_Z / (radius + cartorgraphicCenter[2]));\n  } else if (boundingVolume.width && boundingVolume.height) {\n    // BoundingRectangle\n    const {width, height} = boundingVolume;\n    const zoomX = Math.log2(WGS84_RADIUS_X / width);\n    const zoomY = Math.log2(WGS84_RADIUS_Y / height);\n\n    return (zoomX + zoomY) / 2;\n  }\n\n  return 1;\n}\n\n/**\n * Calculate initial zoom for the tileset from 3D `fullExtent` defined in\n * the tileset metadata\n * @param fullExtent - 3D extent of the tileset\n * @param fullExtent.xmin - minimal longitude in decimal degrees\n * @param fullExtent.xmax - maximal longitude in decimal degrees\n * @param fullExtent.ymin - minimal latitude in decimal degrees\n * @param fullExtent.ymax - maximal latitude in decimal degrees\n * @param fullExtent.zmin - minimal elevation in meters\n * @param fullExtent.zmax - maximal elevation in meters\n * @param cartorgraphicCenter - tileset center in cartographic coordinate system\n * @param cartesianCenter - tileset center in cartesian coordinate system\n * @returns - initial zoom for the tileset\n */\nexport function getZoomFromFullExtent(\n  fullExtent: {\n    xmin: number;\n    xmax: number;\n    ymin: number;\n    ymax: number;\n    zmin: number;\n    zmax: number;\n  },\n  cartorgraphicCenter: Vector3,\n  cartesianCenter: Vector3\n) {\n  const extentVertex = Ellipsoid.WGS84.cartographicToCartesian(\n    [fullExtent.xmax, fullExtent.ymax, fullExtent.zmax],\n    new Vector3()\n  );\n  const extentSize = Math.sqrt(\n    Math.pow(extentVertex[0] - cartesianCenter[0], 2) +\n      Math.pow(extentVertex[1] - cartesianCenter[1], 2) +\n      Math.pow(extentVertex[2] - cartesianCenter[2], 2)\n  );\n  return Math.log2(WGS84_RADIUS_Z / (extentSize + cartorgraphicCenter[2]));\n}\n\n/**\n * Calculate initial zoom for the tileset from 2D `extent` defined in\n * the tileset metadata\n * @param extent - 2D extent of the tileset. It is array of 4 elements [xmin, ymin, xmax, ymax]\n * @param extent[0] - minimal longitude in decimal degrees\n * @param extent[1] - minimal latitude in decimal degrees\n * @param extent[2] - maximal longitude in decimal degrees\n * @param extent[3] - maximal latitude in decimal degrees\n * @param cartorgraphicCenter - tileset center in cartographic coordinate system\n * @param cartesianCenter - tileset center in cartesian coordinate system\n * @returns - initial zoom for the tileset\n */\nexport function getZoomFromExtent(\n  extent: [number, number, number, number],\n  cartorgraphicCenter: Vector3,\n  cartesianCenter: Vector3\n) {\n  const [xmin, ymin, xmax, ymax] = extent;\n  return getZoomFromFullExtent(\n    {xmin, xmax, ymin, ymax, zmin: 0, zmax: 0},\n    cartorgraphicCenter,\n    cartesianCenter\n  );\n}\n\nfunction getObbSize(halfAxes) {\n  halfAxes.getColumn(0, scratchVector);\n  const axeY = halfAxes.getColumn(1);\n  const axeZ = halfAxes.getColumn(2);\n  const farthestVertex = scratchVector.add(axeY).add(axeZ);\n  const size = farthestVertex.len();\n  return size;\n}\n"],"file":"zoom.js"}

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

@@ -122,6 +122,7 @@ var Tileset3D = function () {
     (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);
@@ -193,8 +194,7 @@ var Tileset3D = function () {
     this.asset = {};
     this.credits = {};
     this.description = this.options.description || '';
-
-    this._initializeTileSet(json);
+    this.tilesetInitializationPromise = this._initializeTileSet(json);
   }
 
   (0, _createClass2.default)(Tileset3D, [{
@@ -255,21 +255,24 @@ var Tileset3D = function () {
   }, {
     key: "update",
     value: function update() {
-      var viewports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      var _this = this;
 
-      if (!viewports && this.lastUpdatedVieports) {
-        viewports = this.lastUpdatedVieports;
-      } else {
-        this.lastUpdatedVieports = viewports;
-      }
+      var viewports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      this.tilesetInitializationPromise.then(function () {
+        if (!viewports && _this.lastUpdatedVieports) {
+          viewports = _this.lastUpdatedVieports;
+        } else {
+          _this.lastUpdatedVieports = viewports;
+        }
 
-      this.doUpdate(viewports);
+        _this.doUpdate(viewports);
+      });
     }
   }, {
     key: "selectTiles",
     value: function () {
       var _selectTiles = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
-        var _this = this;
+        var _this2 = this;
 
         var viewports,
             _args = arguments;
@@ -278,7 +281,10 @@ var Tileset3D = function () {
             switch (_context.prev = _context.next) {
               case 0:
                 viewports = _args.length > 0 && _args[0] !== undefined ? _args[0] : null;
+                _context.next = 3;
+                return this.tilesetInitializationPromise;
 
+              case 3:
                 if (viewports) {
                   this.lastUpdatedVieports = viewports;
                 }
@@ -286,17 +292,17 @@ var Tileset3D = function () {
                 if (!this.updatePromise) {
                   this.updatePromise = new Promise(function (resolve) {
                     setTimeout(function () {
-                      _this.doUpdate(_this.lastUpdatedVieports);
+                      _this2.doUpdate(_this2.lastUpdatedVieports);
 
-                      resolve(_this._frameNumber);
-                      _this.updatePromise = null;
-                    }, _this.options.debounceTime);
+                      resolve(_this2._frameNumber);
+                      _this2.updatePromise = null;
+                    }, _this2.options.debounceTime);
                   });
                 }
 
                 return _context.abrupt("return", this.updatePromise);
 
-              case 4:
+              case 6:
               case "end":
                 return _context.stop();
             }
@@ -559,22 +565,94 @@ var Tileset3D = function () {
     }
   }, {
     key: "_initializeTileSet",
-    value: function _initializeTileSet(tilesetJson) {
-      this.root = this._initializeTileHeaders(tilesetJson, null);
+    value: function () {
+      var _initializeTileSet2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(tilesetJson) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                if (!(this.type === _constants.TILESET_TYPE.I3S)) {
+                  _context2.next = 5;
+                  break;
+                }
 
-      if (this.type === _constants.TILESET_TYPE.TILES3D) {
-        this._initializeCesiumTileset(tilesetJson);
+                this.calculateViewPropsI3S();
+                _context2.next = 4;
+                return tilesetJson.root;
+
+              case 4:
+                tilesetJson.root = _context2.sent;
+
+              case 5:
+                this.root = this._initializeTileHeaders(tilesetJson, null);
+
+                if (this.type === _constants.TILESET_TYPE.TILES3D) {
+                  this._initializeTiles3DTileset(tilesetJson);
+
+                  this.calculateViewPropsTiles3D();
+                }
+
+                if (this.type === _constants.TILESET_TYPE.I3S) {
+                  this._initializeI3STileset();
+                }
+
+              case 8:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function _initializeTileSet(_x) {
+        return _initializeTileSet2.apply(this, arguments);
       }
 
-      if (this.type === _constants.TILESET_TYPE.I3S) {
-        this._initializeI3STileset();
+      return _initializeTileSet;
+    }()
+  }, {
+    key: "calculateViewPropsI3S",
+    value: function calculateViewPropsI3S() {
+      var _this$tileset$store;
+
+      var fullExtent = this.tileset.fullExtent;
+
+      if (fullExtent) {
+        var xmin = fullExtent.xmin,
+            xmax = fullExtent.xmax,
+            ymin = fullExtent.ymin,
+            ymax = fullExtent.ymax,
+            zmin = fullExtent.zmin,
+            zmax = fullExtent.zmax;
+        this.cartographicCenter = new _core.Vector3(xmin + (xmax - xmin) / 2, ymin + (ymax - ymin) / 2, zmin + (zmax - zmin) / 2);
+        this.cartesianCenter = _geospatial.Ellipsoid.WGS84.cartographicToCartesian(this.cartographicCenter, new _core.Vector3());
+        this.zoom = (0, _zoom.getZoomFromFullExtent)(fullExtent, this.cartographicCenter, this.cartesianCenter);
+        return;
+      }
+
+      var extent = (_this$tileset$store = this.tileset.store) === null || _this$tileset$store === void 0 ? void 0 : _this$tileset$store.extent;
+
+      if (extent) {
+        var _extent = (0, _slicedToArray2.default)(extent, 4),
+            _xmin = _extent[0],
+            _ymin = _extent[1],
+            _xmax = _extent[2],
+            _ymax = _extent[3];
+
+        this.cartographicCenter = new _core.Vector3(_xmin + (_xmax - _xmin) / 2, _ymin + (_ymax - _ymin) / 2, 0);
+        this.cartesianCenter = _geospatial.Ellipsoid.WGS84.cartographicToCartesian(this.cartographicCenter, new _core.Vector3());
+        this.zoom = (0, _zoom.getZoomFromExtent)(extent, this.cartographicCenter, this.cartesianCenter);
+        return;
       }
 
-      this._calculateViewProps();
+      console.warn('Extent is not defined in the tileset header');
+      this.cartographicCenter = new _core.Vector3();
+      this.zoom = 1;
+      return;
     }
   }, {
-    key: "_calculateViewProps",
-    value: function _calculateViewProps() {
+    key: "calculateViewPropsTiles3D",
+    value: function calculateViewPropsTiles3D() {
       var root = this.root;
       (0, _loaderUtils.assert)(root);
       var center = root.boundingVolume.center;
@@ -679,48 +757,48 @@ var Tileset3D = function () {
   }, {
     key: "_loadTile",
     value: function () {
-      var _loadTile2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(tile) {
+      var _loadTile2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(tile) {
         var loaded;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
-                _context2.prev = 0;
+                _context3.prev = 0;
 
                 this._onStartTileLoading();
 
-                _context2.next = 4;
+                _context3.next = 4;
                 return tile.loadContent();
 
               case 4:
-                loaded = _context2.sent;
-                _context2.next = 10;
+                loaded = _context3.sent;
+                _context3.next = 10;
                 break;
 
               case 7:
-                _context2.prev = 7;
-                _context2.t0 = _context2["catch"](0);
+                _context3.prev = 7;
+                _context3.t0 = _context3["catch"](0);
 
-                this._onTileLoadError(tile, _context2.t0);
+                this._onTileLoadError(tile, _context3.t0);
 
               case 10:
-                _context2.prev = 10;
+                _context3.prev = 10;
 
                 this._onEndTileLoading();
 
                 this._onTileLoad(tile, loaded);
 
-                return _context2.finish(10);
+                return _context3.finish(10);
 
               case 14:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, this, [[0, 7, 10, 14]]);
+        }, _callee3, this, [[0, 7, 10, 14]]);
       }));
 
-      function _loadTile(_x) {
+      function _loadTile(_x2) {
         return _loadTile2.apply(this, arguments);
       }
 
@@ -859,8 +937,8 @@ var Tileset3D = function () {
       tile.destroy();
     }
   }, {
-    key: "_initializeCesiumTileset",
-    value: function _initializeCesiumTileset(tilesetJson) {
+    key: "_initializeTiles3DTileset",
+    value: function _initializeTiles3DTileset(tilesetJson) {
       this.asset = tilesetJson.asset;
 
       if (!this.asset) {