@loaders.gl/tile-converter 3.4.7 → 3.4.9

package/dist/dist.min.js

@@ -62273,11 +62273,15 @@ var I3SConverter = class {
           "draco-nodejs": { workerUrl: "./modules/draco/dist/draco-nodejs-worker.js" }
         }
       };
+      let tilesetUrl = inputUrl;
+      if (preloadOptions.url) {
+        tilesetUrl = preloadOptions.url;
+      }
       if (preloadOptions.headers) {
         tilesetOptions.loadOptions.fetch = { headers: preloadOptions.headers };
       }
       Object.assign(tilesetOptions, preloadOptions);
-      const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
+      const sourceTilesetJson = await load(tilesetUrl, this.Loader, tilesetOptions.loadOptions);
       this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
       await this._createAndSaveTileset(outputPath, tilesetName, sourceTilesetJson?.root?.boundingVolume?.region);
       await this._finishConversion({ slpk: Boolean(slpk), outputPath, tilesetName });

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.4.7" !== 'undefined' ? "3.4.7" : 'latest';
+var VERSION = typeof "3.4.9" !== 'undefined' ? "3.4.9" : '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.4.7" !== 'undefined' ? "3.4.7" : 'latest';
+var VERSION = typeof "3.4.9" !== 'undefined' ? "3.4.9" : 'latest';
 var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 var DepsInstaller = function () {
   function DepsInstaller() {

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.4.7" !== 'undefined' ? "3.4.7" : 'latest';
+var VERSION = typeof "3.4.9" !== 'undefined' ? "3.4.9" : 'latest';
 var I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/es5/i3s-converter/i3s-converter.js

@@ -107,7 +107,7 @@ var I3SConverter = function () {
     key: "convert",
     value: function () {
       var _convert = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(options) {
-        var tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, _options$draco, draco, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, _options$instantNodeW, instantNodeWriting, _options$mergeMateria, mergeMaterials, _sourceTilesetJson$ro, _sourceTilesetJson$ro2, preloadOptions, tilesetOptions, sourceTilesetJson, workerFarm;
+        var tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, _options$draco, draco, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, _options$instantNodeW, instantNodeWriting, _options$mergeMateria, mergeMaterials, _sourceTilesetJson$ro, _sourceTilesetJson$ro2, preloadOptions, tilesetOptions, tilesetUrl, sourceTilesetJson, workerFarm;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -171,42 +171,46 @@ var I3SConverter = function () {
                   }
                 }
               };
+              tilesetUrl = inputUrl;
+              if (preloadOptions.url) {
+                tilesetUrl = preloadOptions.url;
+              }
               if (preloadOptions.headers) {
                 tilesetOptions.loadOptions.fetch = {
                   headers: preloadOptions.headers
                 };
               }
               Object.assign(tilesetOptions, preloadOptions);
-              _context.next = 30;
-              return (0, _core.load)(inputUrl, this.Loader, tilesetOptions.loadOptions);
-            case 30:
+              _context.next = 32;
+              return (0, _core.load)(tilesetUrl, this.Loader, tilesetOptions.loadOptions);
+            case 32:
               sourceTilesetJson = _context.sent;
               this.sourceTileset = new _tiles.Tileset3D(sourceTilesetJson, tilesetOptions);
-              _context.next = 34;
-              return this._createAndSaveTileset(outputPath, tilesetName, sourceTilesetJson === null || sourceTilesetJson === void 0 ? void 0 : (_sourceTilesetJson$ro = sourceTilesetJson.root) === null || _sourceTilesetJson$ro === void 0 ? void 0 : (_sourceTilesetJson$ro2 = _sourceTilesetJson$ro.boundingVolume) === null || _sourceTilesetJson$ro2 === void 0 ? void 0 : _sourceTilesetJson$ro2.region);
-            case 34:
               _context.next = 36;
+              return this._createAndSaveTileset(outputPath, tilesetName, sourceTilesetJson === null || sourceTilesetJson === void 0 ? void 0 : (_sourceTilesetJson$ro = sourceTilesetJson.root) === null || _sourceTilesetJson$ro === void 0 ? void 0 : (_sourceTilesetJson$ro2 = _sourceTilesetJson$ro.boundingVolume) === null || _sourceTilesetJson$ro2 === void 0 ? void 0 : _sourceTilesetJson$ro2.region);
+            case 36:
+              _context.next = 38;
               return this._finishConversion({
                 slpk: Boolean(slpk),
                 outputPath: outputPath,
                 tilesetName: tilesetName
               });
-            case 36:
+            case 38:
               return _context.abrupt("return", sourceTilesetJson);
-            case 39:
-              _context.prev = 39;
+            case 41:
+              _context.prev = 41;
               _context.t0 = _context["catch"](21);
               throw _context.t0;
-            case 42:
-              _context.prev = 42;
+            case 44:
+              _context.prev = 44;
               workerFarm = _workerUtils.WorkerFarm.getWorkerFarm({});
               workerFarm.destroy();
-              return _context.finish(42);
-            case 46:
+              return _context.finish(44);
+            case 48:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[21, 39, 42, 46]]);
+        }, _callee, this, [[21, 41, 44, 48]]);
       }));
       function convert(_x) {
         return _convert.apply(this, arguments);