@loaders.gl/tile-converter 3.0.13 → 3.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.0.13",
+  "version": "3.0.14",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -39,18 +39,18 @@
     "build-converter-bundle": "webpack --config ./converter-webpack/bundle.js"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.0.13",
-    "@loaders.gl/core": "3.0.13",
-    "@loaders.gl/crypto": "3.0.13",
-    "@loaders.gl/draco": "3.0.13",
-    "@loaders.gl/gltf": "3.0.13",
-    "@loaders.gl/i3s": "3.0.13",
-    "@loaders.gl/images": "3.0.13",
-    "@loaders.gl/loader-utils": "3.0.13",
-    "@loaders.gl/polyfills": "3.0.13",
-    "@loaders.gl/tiles": "3.0.13",
-    "@loaders.gl/worker-utils": "3.0.13",
-    "@loaders.gl/zip": "3.0.13",
+    "@loaders.gl/3d-tiles": "3.0.14",
+    "@loaders.gl/core": "3.0.14",
+    "@loaders.gl/crypto": "3.0.14",
+    "@loaders.gl/draco": "3.0.14",
+    "@loaders.gl/gltf": "3.0.14",
+    "@loaders.gl/i3s": "3.0.14",
+    "@loaders.gl/images": "3.0.14",
+    "@loaders.gl/loader-utils": "3.0.14",
+    "@loaders.gl/polyfills": "3.0.14",
+    "@loaders.gl/tiles": "3.0.14",
+    "@loaders.gl/worker-utils": "3.0.14",
+    "@loaders.gl/zip": "3.0.14",
     "@luma.gl/engine": "^8.5.0",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -66,5 +66,5 @@
     "morgan": "~1.9.1",
     "uuid": "^8.1.0"
   },
-  "gitHead": "acb7e5ecb4fc82e3628a2cf47a5345e8d28c0c2a"
+  "gitHead": "dc931768fc34de549ef6baeb94e2ee5aa8163baf"
 }

package/src/i3s-converter/i3s-converter.ts

@@ -21,7 +21,7 @@ import type {
 } from '@loaders.gl/i3s';
 import {load} from '@loaders.gl/core';
 import {Tileset3D} from '@loaders.gl/tiles';
-import {CesiumIonLoader} from '@loaders.gl/3d-tiles';
+import {CesiumIonLoader, Tiles3DLoader} from '@loaders.gl/3d-tiles';
 import {join} from 'path';
 import {v4 as uuidv4} from 'uuid';
 import process from 'process';
@@ -51,6 +51,7 @@ import {SHARED_RESOURCES_TEMPLATE} from './json-templates/shared-resources';
 import {validateNodeBoundingVolumes} from './helpers/node-debug';
 import {GeoidHeightModel} from '../lib/geoid-height-model';
 import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
+import {LoaderWithParser} from '@loaders.gl/loader-utils';
 
 const ION_DEFAULT_TOKEN =
   process.env.IonToken || // eslint-disable-line
@@ -63,6 +64,7 @@ const SHORT_INT_TYPE = 'Int32';
 const DOUBLE_TYPE = 'double';
 const OBJECT_ID_TYPE = 'OBJECTID';
 const REFRESH_TOKEN_TIMEOUT = 1800; // 30 minutes in seconds
+const CESIUM_DATASET_PREFIX = 'https://';
 // const FS_FILE_TOO_LARGE = 'ERR_FS_FILE_TOO_LARGE';
 
 /**
@@ -88,6 +90,7 @@ export default class I3SConverter {
   refreshTokenTime: [number, number];
   sourceTileset: Tileset3D | null;
   geoidHeightModel: GeoidHeightModel | null;
+  Loader: LoaderWithParser = Tiles3DLoader;
 
   constructor() {
     this.nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);
@@ -148,6 +151,7 @@ export default class I3SConverter {
     } = options;
     this.options = {maxDepth, slpk, sevenZipExe, egmFilePath, draco, token, inputUrl};
     this.validate = validate;
+    this.Loader = inputUrl.indexOf(CESIUM_DATASET_PREFIX) !== -1 ? CesiumIonLoader : Tiles3DLoader;
 
     console.log('Loading egm file...'); // eslint-disable-line
     this.geoidHeightModel = await load(egmFilePath, PGMLoader);
@@ -163,7 +167,7 @@ export default class I3SConverter {
       tilesetOptions.loadOptions.fetch = {headers: preloadOptions.headers};
     }
     Object.assign(tilesetOptions, preloadOptions);
-    const sourceTilesetJson = await load(inputUrl, CesiumIonLoader, tilesetOptions.loadOptions);
+    const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
     // console.log(tilesetJson); // eslint-disable-line
     this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
 
@@ -1159,10 +1163,13 @@ export default class I3SConverter {
    * Fetch preload options for ION tileset
    */
   private async _fetchPreloadOptions(): Promise<any> {
+    if (!this.Loader.preload) {
+      return {};
+    }
     const options = {
       'cesium-ion': {accessToken: this.options.token || ION_DEFAULT_TOKEN}
     };
-    const preloadOptions = await CesiumIonLoader.preload(this.options.inputUrl, options);
+    const preloadOptions = await this.Loader.preload(this.options.inputUrl, options);
     this.refreshTokenTime = process.hrtime();
     return {...options, ...preloadOptions};
   }