@loaders.gl/tile-converter 3.3.2 → 3.3.4

package/dist/dist.min.js

@@ -10556,8 +10556,8 @@ var require_bounding_sphere = __commonJS({
       }, {
         key: "expand",
         value: function expand(point) {
-          var scratchPoint = scratchVector7.from(point);
-          var radius = scratchPoint.subtract(this.center).magnitude();
+          var scratchPoint2 = scratchVector7.from(point);
+          var radius = scratchPoint2.subtract(this.center).magnitude();
           if (radius > this.radius) {
             this.radius = radius;
           }
@@ -10580,8 +10580,8 @@ var require_bounding_sphere = __commonJS({
       }, {
         key: "distanceTo",
         value: function distanceTo(point) {
-          var scratchPoint = scratchVector7.from(point);
-          var delta = scratchPoint.subtract(this.center);
+          var scratchPoint2 = scratchVector7.from(point);
+          var delta = scratchPoint2.subtract(this.center);
           return Math.max(0, delta.len() - this.radius);
         }
       }, {
@@ -66975,6 +66975,7 @@ var import_geospatial4 = __toModule(require_es55());
 function defined2(x) {
   return x !== void 0 && x !== null;
 }
+var scratchPoint = new import_core4.Vector3();
 var scratchScale = new import_core4.Vector3();
 var scratchNorthWest = new import_core4.Vector3();
 var scratchSouthEast = new import_core4.Vector3();
@@ -66996,6 +66997,22 @@ function createBoundingVolume(boundingVolumeHeader, transform11, result) {
   }
   throw new Error("3D Tile: boundingVolume must contain a sphere, region, or box");
 }
+function getCartographicBounds(boundingVolumeHeader, boundingVolume) {
+  if (boundingVolumeHeader.box) {
+    return orientedBoundingBoxToCartographicBounds(boundingVolume);
+  }
+  if (boundingVolumeHeader.region) {
+    const [west, south, east, north, minHeight, maxHeight] = boundingVolumeHeader.region;
+    return [
+      [(0, import_core4.degrees)(west), (0, import_core4.degrees)(south), minHeight],
+      [(0, import_core4.degrees)(east), (0, import_core4.degrees)(north), maxHeight]
+    ];
+  }
+  if (boundingVolumeHeader.sphere) {
+    return boundingSphereToCartographicBounds(boundingVolume);
+  }
+  throw new Error("Unkown boundingVolume type");
+}
 function createBox(box, transform11, result) {
   const center = new import_core4.Vector3(box[0], box[1], box[2]);
   transform11.transform(center, center);
@@ -67051,6 +67068,71 @@ function createSphere(sphere, transform11, result) {
   }
   return new import_culling3.BoundingSphere(center, radius);
 }
+function orientedBoundingBoxToCartographicBounds(boundingVolume) {
+  const result = emptyCartographicBounds();
+  const { halfAxes } = boundingVolume;
+  const xAxis = new import_core4.Vector3(halfAxes.getColumn(0));
+  const yAxis = new import_core4.Vector3(halfAxes.getColumn(1));
+  const zAxis = new import_core4.Vector3(halfAxes.getColumn(2));
+  for (let x = 0; x < 2; x++) {
+    for (let y = 0; y < 2; y++) {
+      for (let z = 0; z < 2; z++) {
+        scratchPoint.copy(boundingVolume.center);
+        scratchPoint.add(xAxis);
+        scratchPoint.add(yAxis);
+        scratchPoint.add(zAxis);
+        addToCartographicBounds(result, scratchPoint);
+        zAxis.negate();
+      }
+      yAxis.negate();
+    }
+    xAxis.negate();
+  }
+  return result;
+}
+function boundingSphereToCartographicBounds(boundingVolume) {
+  const result = emptyCartographicBounds();
+  const { center, radius } = boundingVolume;
+  const point = import_geospatial4.Ellipsoid.WGS84.scaleToGeodeticSurface(center, scratchPoint);
+  let zAxis;
+  if (point) {
+    zAxis = import_geospatial4.Ellipsoid.WGS84.geodeticSurfaceNormal(point);
+  } else {
+    zAxis = new import_core4.Vector3(0, 0, 1);
+  }
+  let xAxis = new import_core4.Vector3(zAxis[2], -zAxis[1], 0);
+  if (xAxis.len() > 0) {
+    xAxis.normalize();
+  } else {
+    xAxis = new import_core4.Vector3(0, 1, 0);
+  }
+  const yAxis = xAxis.clone().cross(zAxis);
+  for (const axis of [xAxis, yAxis, zAxis]) {
+    scratchScale.copy(axis).scale(radius);
+    for (let dir = 0; dir < 2; dir++) {
+      scratchPoint.copy(center);
+      scratchPoint.add(scratchScale);
+      addToCartographicBounds(result, scratchPoint);
+      scratchScale.negate();
+    }
+  }
+  return result;
+}
+function emptyCartographicBounds() {
+  return [
+    [Infinity, Infinity, Infinity],
+    [-Infinity, -Infinity, -Infinity]
+  ];
+}
+function addToCartographicBounds(target, cartesian) {
+  import_geospatial4.Ellipsoid.WGS84.cartesianToCartographic(cartesian, scratchPoint);
+  target[0][0] = Math.min(target[0][0], scratchPoint[0]);
+  target[0][1] = Math.min(target[0][1], scratchPoint[1]);
+  target[0][2] = Math.min(target[0][2], scratchPoint[2]);
+  target[1][0] = Math.max(target[1][0], scratchPoint[0]);
+  target[1][1] = Math.max(target[1][1], scratchPoint[1]);
+  target[1][2] = Math.max(target[1][2], scratchPoint[2]);
+}
 
 // ../tiles/src/tileset/helpers/tiles-3d-lod.ts
 var import_core5 = __toModule(require_es54());
@@ -67557,6 +67639,12 @@ var Tile3D = class {
   get screenSpaceError() {
     return this._screenSpaceError;
   }
+  get boundingBox() {
+    if (!this._boundingBox) {
+      this._boundingBox = getCartographicBounds(this.header.boundingVolume, this.boundingVolume);
+    }
+    return this._boundingBox;
+  }
   getScreenSpaceError(frameState, useParentLodMetric) {
     switch (this.tileset.type) {
       case TILESET_TYPE.I3S:
@@ -68112,7 +68200,7 @@ var Tileset3D = class {
   }
   get queryParams() {
     if (!this._queryParamsString) {
-      this._queryParamsString = getQueryParamString(this._queryParams);
+      this._queryParamsString = new URLSearchParams(this._queryParams).toString();
     }
     return this._queryParamsString;
   }
@@ -68127,7 +68215,7 @@ var Tileset3D = class {
     if (isDataUrl) {
       return tilePath;
     }
-    return `${tilePath}${this.queryParams}`;
+    return `${tilePath}${tilePath.includes("?") ? "&" : "?"}${this.queryParams}`;
   }
   hasExtension(extensionName) {
     return Boolean(this._extensionsUsed && this._extensionsUsed.indexOf(extensionName) > -1);
@@ -68360,6 +68448,10 @@ var Tileset3D = class {
         const children = tile.header.children || [];
         for (const childHeader of children) {
           const childTile = new Tile3D(this, childHeader, tile);
+          if (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);
@@ -68536,20 +68628,6 @@ var Tileset3D = class {
     }
   }
 };
-function getQueryParamString(queryParams) {
-  const queryParamStrings = [];
-  for (const key of Object.keys(queryParams)) {
-    queryParamStrings.push(`${key}=${queryParams[key]}`);
-  }
-  switch (queryParamStrings.length) {
-    case 0:
-      return "";
-    case 1:
-      return `?${queryParamStrings[0]}`;
-    default:
-      return `?${queryParamStrings.join("&")}`;
-  }
-}
 
 // ../3d-tiles/src/lib/utils/version.ts
 var VERSION5 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
@@ -74684,7 +74762,7 @@ function getTileType(tile) {
   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":

package/dist/es5/3d-tiles-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
 exports.transform3DTilesAttributesOnWorker = transform3DTilesAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'latest';
+var VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'latest';
 var Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/es5/deps-installer/deps-installer.js

@@ -14,7 +14,7 @@ var _zip = require("@loaders.gl/zip");
 var _fileUtils = require("../lib/utils/file-utils");
 var _path = require("path");
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'beta';
+var VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'beta';
 var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 
 var DepsInstaller = function () {

package/dist/es5/i3s-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
 exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'latest';
+var VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'latest';
 var I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/es5/pgm-loader.js

@@ -8,7 +8,7 @@ exports.PGMLoader = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _geoid = require("@math.gl/geoid");
-var VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'latest';
+var VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'latest';
 
 var PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/dist/esm/3d-tiles-attributes-worker.js

@@ -1,6 +1,6 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
 
-const VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'latest';
+const VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'latest';
 export const Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/esm/deps-installer/deps-installer.js

@@ -4,7 +4,7 @@ import { writeFile } from '../lib/utils/file-utils';
 import { join } from 'path';
 import { ChildProcessProxy } from '@loaders.gl/worker-utils';
 
-const VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'beta';
+const VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'beta';
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 
 export class DepsInstaller {

package/dist/esm/i3s-attributes-worker.js

@@ -1,6 +1,6 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
 
-const VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'latest';
+const VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'latest';
 export const I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/esm/pgm-loader.js

@@ -1,6 +1,6 @@
 import { parsePGM } from '@math.gl/geoid';
 
-const VERSION = typeof "3.3.2" !== 'undefined' ? "3.3.2" : 'latest';
+const VERSION = typeof "3.3.4" !== 'undefined' ? "3.3.4" : 'latest';
 
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/dist/i3s-converter/helpers/node-pages.js

@@ -11,7 +11,7 @@ const file_utils_1 = require("../../lib/utils/file-utils");
  * class NodePages - wrapper of nodePages array
  *
  * @example
- * import {writeFile} from './helpers/write-file';
+ * import {writeFile} from './helpers/write-file.js';
  *
  * // create an instance of the class
  * const nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -44,19 +44,19 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.3.2",
-    "@loaders.gl/crypto": "3.3.2",
-    "@loaders.gl/draco": "3.3.2",
-    "@loaders.gl/gltf": "3.3.2",
-    "@loaders.gl/i3s": "3.3.2",
-    "@loaders.gl/images": "3.3.2",
-    "@loaders.gl/loader-utils": "3.3.2",
-    "@loaders.gl/polyfills": "3.3.2",
-    "@loaders.gl/schema": "3.3.2",
-    "@loaders.gl/textures": "3.3.2",
-    "@loaders.gl/tiles": "3.3.2",
-    "@loaders.gl/worker-utils": "3.3.2",
-    "@loaders.gl/zip": "3.3.2",
+    "@loaders.gl/3d-tiles": "3.3.4",
+    "@loaders.gl/crypto": "3.3.4",
+    "@loaders.gl/draco": "3.3.4",
+    "@loaders.gl/gltf": "3.3.4",
+    "@loaders.gl/i3s": "3.3.4",
+    "@loaders.gl/images": "3.3.4",
+    "@loaders.gl/loader-utils": "3.3.4",
+    "@loaders.gl/polyfills": "3.3.4",
+    "@loaders.gl/schema": "3.3.4",
+    "@loaders.gl/textures": "3.3.4",
+    "@loaders.gl/tiles": "3.3.4",
+    "@loaders.gl/worker-utils": "3.3.4",
+    "@loaders.gl/zip": "3.3.4",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -80,5 +80,5 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "a37b0af509ca05468aec6e5667d6a427b9c15d29"
+  "gitHead": "1d1a722ea9a04665acbe41359dfd01bf6d43a214"
 }