@deck.gl/geo-layers 8.9.12 → 8.9.14

package/dist/dist.dev.js

@@ -3060,7 +3060,7 @@ var __exports__ = (() => {
   }
 
   // ../../node_modules/@loaders.gl/xml/dist/esm/xml-loader.js
-  var VERSION = true ? "3.3.3" : "latest";
+  var VERSION = true ? "3.3.5" : "latest";
   var XMLLoader = {
     name: "XML",
     id: "xml",
@@ -3172,7 +3172,7 @@ var __exports__ = (() => {
   }
 
   // ../../node_modules/@loaders.gl/wms/dist/esm/wms-error-loader.js
-  var VERSION2 = true ? "3.3.3" : "latest";
+  var VERSION2 = true ? "3.3.5" : "latest";
   var WMSErrorLoader = {
     id: "wms-error",
     name: "WMS Error",
@@ -3208,7 +3208,7 @@ var __exports__ = (() => {
   }
 
   // ../../node_modules/@loaders.gl/wms/dist/esm/wms-capabilities-loader.js
-  var VERSION3 = true ? "3.3.3" : "latest";
+  var VERSION3 = true ? "3.3.5" : "latest";
   var WMSCapabilitiesLoader = {
     id: "wms-capabilities",
     name: "WMS Capabilities",
@@ -3233,7 +3233,7 @@ var __exports__ = (() => {
   };
 
   // ../../node_modules/@loaders.gl/images/dist/esm/lib/utils/version.js
-  var VERSION4 = true ? "3.3.3" : "latest";
+  var VERSION4 = true ? "3.3.5" : "latest";
 
   // ../../node_modules/@loaders.gl/loader-utils/dist/esm/lib/env-utils/assert.js
   function assert2(condition, message) {
@@ -3283,7 +3283,7 @@ var __exports__ = (() => {
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/esm/lib/library-utils/library-utils.js
   var node = __toESM(require_require_utils());
-  var VERSION5 = true ? "3.3.3" : LATEST;
+  var VERSION5 = true ? "3.3.5" : LATEST;
   var loadLibraryPromises = {};
   async function loadLibrary(libraryUrl) {
     let moduleName = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
@@ -12561,7 +12561,7 @@ varying float vTime;
   var isBrowser5 = isBrowser3();
 
   // ../../node_modules/@luma.gl/webgl/dist/esm/init.js
-  var VERSION7 = true ? "8.5.16" : "untranspiled source";
+  var VERSION7 = true ? "8.5.20" : "untranspiled source";
   var STARTUP_MESSAGE = "set luma.log.level=1 (or higher) to trace rendering";
   var StatsManager = class {
     constructor() {
@@ -12679,7 +12679,6 @@ varying float vTime;
         this._handle = this._createHandle();
       }
       this.byteLength = 0;
-      this._initStats();
       this._addStats();
     }
     toString() {
@@ -12815,9 +12814,6 @@ varying float vTime;
       this.gl.luma = this.gl.luma || {};
       return this.gl.luma;
     }
-    _initStats() {
-      this.gl.stats = this.gl.stats || new StatsManager();
-    }
     _addStats() {
       const name10 = this[Symbol.toStringTag];
       const stats = lumaStats.get("Resource Counts");
@@ -12832,27 +12828,29 @@ varying float vTime;
     }
     _trackAllocatedMemory(bytes) {
       let name10 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this[Symbol.toStringTag];
-      this._doTrackAllocatedMemory(bytes, name10);
-      this._doTrackAllocatedMemory(bytes, name10, this.gl.stats.get("Memory Usage"));
+      this._trackAllocatedMemoryForContext(bytes, name10);
+      this._trackAllocatedMemoryForContext(bytes, name10, this.gl.canvas && this.gl.canvas.id);
+      this.byteLength = bytes;
     }
-    _doTrackAllocatedMemory(bytes) {
+    _trackAllocatedMemoryForContext(bytes) {
       let name10 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this[Symbol.toStringTag];
-      let stats = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : lumaStats.get("Memory Usage");
+      let id = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "";
+      const stats = lumaStats.get("Memory Usage".concat(id));
       stats.get("GPU Memory").addCount(bytes);
       stats.get("".concat(name10, " Memory")).addCount(bytes);
-      this.byteLength = bytes;
     }
     _trackDeallocatedMemory() {
       let name10 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this[Symbol.toStringTag];
-      this._doTrackDeallocatedMemory(name10);
-      this._doTrackDeallocatedMemory(name10, this.gl.stats.get("Memory Usage"));
+      this._trackDeallocatedMemoryForContext(name10);
+      this._trackDeallocatedMemoryForContext(name10, this.gl.canvas && this.gl.canvas.id);
+      this.byteLength = 0;
     }
-    _doTrackDeallocatedMemory() {
+    _trackDeallocatedMemoryForContext() {
       let name10 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this[Symbol.toStringTag];
-      let stats = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : lumaStats.get("Memory Usage");
+      let id = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+      const stats = lumaStats.get("Memory Usage".concat(id));
       stats.get("GPU Memory").subtractCount(this.byteLength);
       stats.get("".concat(name10, " Memory")).subtractCount(this.byteLength);
-      this.byteLength = 0;
     }
   };
 
@@ -17204,6 +17202,9 @@ void main(void) {
     unselect() {
       this._selectedFrame = 0;
     }
+    _getGpuMemoryUsageInBytes() {
+      return this.content.gpuMemoryUsageInBytes || this.content.byteLength || 0;
+    }
     _getPriority() {
       const traverser = this.tileset._traverser;
       const {
@@ -17415,6 +17416,8 @@ void main(void) {
       }
       if (this._isTileset()) {
         this.hasTilesetContent = true;
+      } else {
+        this.gpuMemoryUsageInBytes = this._getGpuMemoryUsageInBytes();
       }
     }
     _updateBoundingVolume(header) {
@@ -17842,7 +17845,7 @@ void main(void) {
     }
     get queryParams() {
       if (!this._queryParamsString) {
-        this._queryParamsString = getQueryParamString(this._queryParams);
+        this._queryParamsString = new URLSearchParams(this._queryParams).toString();
       }
       return this._queryParamsString;
     }
@@ -17863,7 +17866,7 @@ void main(void) {
       if (isDataUrl) {
         return tilePath;
       }
-      return "".concat(tilePath).concat(this.queryParams);
+      return "".concat(tilePath).concat(tilePath.includes("?") ? "&" : "?").concat(this.queryParams);
     }
     hasExtension(extensionName) {
       return Boolean(this._extensionsUsed && this._extensionsUsed.indexOf(extensionName) > -1);
@@ -18111,7 +18114,12 @@ void main(void) {
           this.stats.get(TILES_TOTAL).incrementCount();
           const children = tile.header.children || [];
           for (const childHeader of children) {
+            var _childTile$contentUrl;
             const childTile = new Tile3D(this, childHeader, tile);
+            if ((_childTile$contentUrl = childTile.contentUrl) !== null && _childTile$contentUrl !== void 0 && _childTile$contentUrl.includes("?session=")) {
+              const url = new URL(childTile.contentUrl);
+              this._queryParams.session = url.searchParams.get("session");
+            }
             tile.children.push(childTile);
             childTile.depth = tile.depth + 1;
             stack2.push(childTile);
@@ -18221,11 +18229,11 @@ void main(void) {
     _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;
     }
     _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;
@@ -18292,23 +18300,9 @@ void main(void) {
       }
     }
   };
-  function getQueryParamString(queryParams) {
-    const queryParamStrings = [];
-    for (const key of Object.keys(queryParams)) {
-      queryParamStrings.push("".concat(key, "=").concat(queryParams[key]));
-    }
-    switch (queryParamStrings.length) {
-      case 0:
-        return "";
-      case 1:
-        return "?".concat(queryParamStrings[0]);
-      default:
-        return "?".concat(queryParamStrings.join("&"));
-    }
-  }
 
   // ../../node_modules/@loaders.gl/3d-tiles/dist/esm/lib/utils/version.js
-  var VERSION8 = true ? "3.3.3" : "latest";
+  var VERSION8 = true ? "3.3.5" : "latest";
 
   // ../../node_modules/@loaders.gl/3d-tiles/dist/esm/lib/constants.js
   var TILE3D_TYPE = {
@@ -18337,7 +18331,7 @@ void main(void) {
   }
 
   // ../../node_modules/@loaders.gl/draco/dist/esm/lib/utils/version.js
-  var VERSION9 = true ? "3.3.3" : "latest";
+  var VERSION9 = true ? "3.3.5" : "latest";
 
   // ../../node_modules/@loaders.gl/draco/dist/esm/draco-loader.js
   var DEFAULT_DRACO_OPTIONS = {
@@ -20503,13 +20497,13 @@ void main(void) {
   }
 
   // ../../node_modules/@loaders.gl/gltf/dist/esm/lib/utils/version.js
-  var VERSION10 = true ? "3.3.3" : "latest";
+  var VERSION10 = true ? "3.3.5" : "latest";
 
   // ../../node_modules/@loaders.gl/textures/dist/esm/lib/utils/version.js
-  var VERSION11 = true ? "3.3.3" : "beta";
+  var VERSION11 = true ? "3.3.5" : "beta";
 
   // ../../node_modules/@loaders.gl/textures/dist/esm/lib/parsers/basis-module-loader.js
-  var VERSION12 = true ? "3.3.3" : "beta";
+  var VERSION12 = true ? "3.3.5" : "beta";
   var BASIS_CDN_ENCODER_WASM = "https://unpkg.com/@loaders.gl/textures@".concat(VERSION12, "/dist/libs/basis_encoder.wasm");
   var BASIS_CDN_ENCODER_JS = "https://unpkg.com/@loaders.gl/textures@".concat(VERSION12, "/dist/libs/basis_encoder.js");
   var loadBasisTranscoderPromise;
@@ -21077,6 +21071,25 @@ void main(void) {
       byteLength
     };
   }
+  function getMemoryUsageGLTF(gltf) {
+    let {
+      images,
+      bufferViews
+    } = gltf;
+    images = images || [];
+    bufferViews = bufferViews || [];
+    const imageBufferViews = images.map((i3) => i3.bufferView);
+    bufferViews = bufferViews.filter((view) => !imageBufferViews.includes(view));
+    const bufferMemory = bufferViews.reduce((acc, view) => acc + view.byteLength, 0);
+    const pixelCount = images.reduce((acc, image) => {
+      const {
+        width,
+        height
+      } = image.image;
+      return acc + width * height;
+    }, 0);
+    return bufferMemory + Math.ceil(4 * pixelCount * 1.33);
+  }
 
   // ../../node_modules/@loaders.gl/gltf/dist/esm/lib/api/gltf-scenegraph.js
   var DEFAULT_GLTF_JSON = {
@@ -23250,6 +23263,7 @@ void main(void) {
       }
       if (tile.gltfArrayBuffer) {
         tile.gltf = await parse4(tile.gltfArrayBuffer, GLTFLoader, options, context);
+        tile.gpuMemoryUsageInBytes = getMemoryUsageGLTF(tile.gltf);
         delete tile.gltfArrayBuffer;
         delete tile.gltfByteOffset;
         delete tile.gltfByteLength;
@@ -23458,6 +23472,7 @@ void main(void) {
       parse: parse4
     } = context;
     tile.gltf = await parse4(arrayBuffer, GLTFLoader, options, context);
+    tile.gpuMemoryUsageInBytes = getMemoryUsageGLTF(tile.gltf);
   }
 
   // ../../node_modules/@loaders.gl/3d-tiles/dist/esm/lib/parsers/parse-3d-tile.js
@@ -23774,7 +23789,7 @@ void main(void) {
     if (!tile.contentUrl) {
       return TILE_TYPE.EMPTY;
     }
-    const contentUrl = tile.contentUrl;
+    const contentUrl = tile.contentUrl.split("?")[0];
     const fileExtension = contentUrl.split(".").pop();
     switch (fileExtension) {
       case "pnts":
@@ -25422,7 +25437,7 @@ void main(void) {
   }
 
   // ../../node_modules/@loaders.gl/terrain/dist/esm/lib/utils/version.js
-  var VERSION13 = true ? "3.3.3" : "latest";
+  var VERSION13 = true ? "3.3.5" : "latest";
 
   // ../../node_modules/@loaders.gl/terrain/dist/esm/terrain-loader.js
   var TerrainLoader = {
@@ -27470,7 +27485,7 @@ void main(void) {
   }
 
   // ../../node_modules/@loaders.gl/mvt/dist/esm/mvt-loader.js
-  var VERSION14 = true ? "3.3.3" : "latest";
+  var VERSION14 = true ? "3.3.5" : "latest";
   var DEFAULT_MVT_LOADER_OPTIONS = {
     mvt: {
       shape: "geojson",