@loaders.gl/tile-converter 4.0.0-alpha.14 → 4.0.0-alpha.15

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 "4.0.0-alpha.14" !== 'undefined' ? "4.0.0-alpha.14" : 'beta';
+var VERSION = typeof "4.0.0-alpha.15" !== 'undefined' ? "4.0.0-alpha.15" : 'beta';
 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-converter/i3s-converter.js

@@ -126,7 +126,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, preloadOptions, preprocessResult, workerFarm;
+        var tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, _options$draco, draco, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, _options$instantNodeW, instantNodeWriting, _options$mergeMateria, mergeMaterials, preloadOptions, tilesetUrl, preprocessResult, workerFarm;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -174,54 +174,58 @@ var I3SConverter = function () {
               return this._fetchPreloadOptions();
             case 24:
               preloadOptions = _context.sent;
+              tilesetUrl = inputUrl;
+              if (preloadOptions.url) {
+                tilesetUrl = preloadOptions.url;
+              }
               if (preloadOptions.headers) {
                 this.loadOptions.fetch = {
                   headers: preloadOptions.headers
                 };
               }
-              _context.next = 28;
-              return (0, _core.load)(inputUrl, this.Loader, this.loadOptions);
-            case 28:
+              _context.next = 30;
+              return (0, _core.load)(tilesetUrl, this.Loader, this.loadOptions);
+            case 30:
               this.sourceTileset = _context.sent;
-              _context.next = 31;
+              _context.next = 33;
               return this.preprocessConversion();
-            case 31:
+            case 33:
               preprocessResult = _context.sent;
               if (!preprocessResult) {
-                _context.next = 37;
+                _context.next = 39;
                 break;
               }
-              _context.next = 35;
-              return this._createAndSaveTileset(outputPath, tilesetName);
-            case 35:
               _context.next = 37;
+              return this._createAndSaveTileset(outputPath, tilesetName);
+            case 37:
+              _context.next = 39;
               return this._finishConversion({
                 slpk: Boolean(slpk),
                 outputPath: outputPath,
                 tilesetName: tilesetName
               });
-            case 37:
-              _context.next = 42;
-              break;
             case 39:
-              _context.prev = 39;
+              _context.next = 44;
+              break;
+            case 41:
+              _context.prev = 41;
               _context.t0 = _context["catch"](21);
               throw _context.t0;
-            case 42:
-              _context.prev = 42;
-              _context.next = 45;
+            case 44:
+              _context.prev = 44;
+              _context.next = 47;
               return this.writeQueue.finalize();
-            case 45:
+            case 47:
               workerFarm = _workerUtils.WorkerFarm.getWorkerFarm({});
               workerFarm.destroy();
-              return _context.finish(42);
-            case 48:
+              return _context.finish(44);
+            case 50:
               return _context.abrupt("return", 'success');
-            case 49:
+            case 51:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[21, 39, 42, 48]]);
+        }, _callee, this, [[21, 41, 44, 50]]);
       }));
       function convert(_x) {
         return _convert.apply(this, arguments);