@loaders.gl/tile-converter 3.2.0-alpha.2 → 3.2.0

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

@@ -77,6 +77,10 @@ var _writeQueue = _interopRequireDefault(require("../lib/utils/write-queue"));
 
 var _i3sAttributesWorker = require("../i3s-attributes-worker");
 
+var _constants = require("../constants");
+
+var _process$env;
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -87,7 +91,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var ION_DEFAULT_TOKEN = _process.default.env.IonToken || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
+var ION_DEFAULT_TOKEN = ((_process$env = _process.default.env) === null || _process$env === void 0 ? void 0 : _process$env.IonToken) || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
 var HARDCODED_NODES_PER_PAGE = 64;
 var _3D_TILES = '3DTILES';
 var _3D_OBJECT_LAYER_TYPE = '3DObject';
@@ -149,6 +153,15 @@ var I3SConverter = function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (!_core.isBrowser) {
+                  _context.next = 3;
+                  break;
+                }
+
+                console.log(_constants.BROWSER_ERROR_MESSAGE);
+                return _context.abrupt("return", _constants.BROWSER_ERROR_MESSAGE);
+
+              case 3:
                 this.conversionStartTime = _process.default.hrtime();
                 tilesetName = options.tilesetName, slpk = options.slpk, egmFilePath = options.egmFilePath, inputUrl = options.inputUrl, validate = options.validate, outputPath = options.outputPath, draco = options.draco, sevenZipExe = options.sevenZipExe, maxDepth = options.maxDepth, token = options.token, generateTextures = options.generateTextures, generateBoundingVolumes = options.generateBoundingVolumes;
                 this.options = {
@@ -167,10 +180,10 @@ var I3SConverter = function () {
                 this.writeQueue = new _writeQueue.default();
                 this.writeQueue.startListening();
                 console.log('Loading egm file...');
-                _context.next = 12;
+                _context.next = 15;
                 return (0, _core.load)(egmFilePath, _pgmLoader.PGMLoader);
 
-              case 12:
+              case 15:
                 this.geoidHeightModel = _context.sent;
                 console.log('Loading egm file completed!');
 
@@ -178,14 +191,15 @@ var I3SConverter = function () {
                   this.nodePages.useWriteFunction(_fileUtils.writeFileForSlpk);
                 }
 
-                _context.next = 17;
+                _context.next = 20;
                 return this.loadWorkers();
 
-              case 17:
-                _context.next = 19;
+              case 20:
+                _context.prev = 20;
+                _context.next = 23;
                 return this._fetchPreloadOptions();
 
-              case 19:
+              case 23:
                 preloadOptions = _context.sent;
                 tilesetOptions = {
                   loadOptions: {
@@ -202,34 +216,43 @@ var I3SConverter = function () {
                 }
 
                 Object.assign(tilesetOptions, preloadOptions);
-                _context.next = 25;
+                _context.next = 29;
                 return (0, _core.load)(inputUrl, this.Loader, tilesetOptions.loadOptions);
 
-              case 25:
+              case 29:
                 sourceTilesetJson = _context.sent;
                 this.sourceTileset = new _tiles.Tileset3D(sourceTilesetJson, tilesetOptions);
-                _context.next = 29;
+                _context.next = 33;
                 return this._createAndSaveTileset(outputPath, tilesetName);
 
-              case 29:
-                _context.next = 31;
+              case 33:
+                _context.next = 35;
                 return this._finishConversion({
                   slpk: Boolean(slpk),
                   outputPath: outputPath,
                   tilesetName: tilesetName
                 });
 
-              case 31:
+              case 35:
+                return _context.abrupt("return", sourceTilesetJson);
+
+              case 38:
+                _context.prev = 38;
+                _context.t0 = _context["catch"](20);
+                throw _context.t0;
+
+              case 41:
+                _context.prev = 41;
                 workerFarm = _workerUtils.WorkerFarm.getWorkerFarm({});
                 workerFarm.destroy();
-                return _context.abrupt("return", sourceTilesetJson);
+                return _context.finish(41);
 
-              case 34:
+              case 45:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this);
+        }, _callee, this, [[20, 38, 41, 45]]);
       }));
 
       function convert(_x) {
@@ -342,7 +365,8 @@ var I3SConverter = function () {
         nodePages: {
           nodesPerPage: HARDCODED_NODES_PER_PAGE
         },
-        compressGeometry: this.options.draco
+        compressGeometry: this.options.draco,
+        fullExtent: fullExtent
       };
       this.layers0 = (0, _jsonMapTransform.default)(layers0data, (0, _layers.LAYERS)());
     }
@@ -1294,7 +1318,7 @@ var I3SConverter = function () {
             switch (_context15.prev = _context15.next) {
               case 0:
                 if (!texture) {
-                  _context15.next = 33;
+                  _context15.next = 25;
                   break;
                 }
 
@@ -1302,7 +1326,7 @@ var I3SConverter = function () {
                 formats = [];
                 textureData = texture.bufferView.data;
                 _context15.t0 = format;
-                _context15.next = _context15.t0 === 'jpg' ? 7 : _context15.t0 === 'png' ? 7 : _context15.t0 === 'ktx2' ? 20 : 32;
+                _context15.next = _context15.t0 === 'jpg' ? 7 : _context15.t0 === 'png' ? 7 : _context15.t0 === 'ktx2' ? 16 : 24;
                 break;
 
               case 7:
@@ -1315,7 +1339,7 @@ var I3SConverter = function () {
 
               case 10:
                 if (!this.generateTextures) {
-                  _context15.next = 19;
+                  _context15.next = 15;
                   break;
                 }
 
@@ -1323,30 +1347,28 @@ var I3SConverter = function () {
                   name: '1',
                   format: 'ktx2'
                 });
-                _context15.t1 = Uint8Array;
+                ktx2TextureData = (0, _core.encode)(texture.image, _textures.KTX2BasisWriterWorker, _objectSpread(_objectSpread({}, _textures.KTX2BasisWriterWorker.options), {}, {
+                  source: this.workerSource.ktx2,
+                  reuseWorkers: true,
+                  _nodeWorkers: true
+                }));
                 _context15.next = 15;
-                return (0, _core.encode)(texture.image, _textures.KTX2BasisWriter);
-
-              case 15:
-                _context15.t2 = _context15.sent;
-                ktx2TextureData = new _context15.t1(_context15.t2);
-                _context15.next = 19;
                 return this.writeTextureFile(ktx2TextureData, '1', 'ktx2', childPath, slpkChildPath);
 
-              case 19:
-                return _context15.abrupt("break", 32);
+              case 15:
+                return _context15.abrupt("break", 24);
 
-              case 20:
+              case 16:
                 formats.push({
                   name: '1',
                   format: format
                 });
-                _context15.next = 23;
+                _context15.next = 19;
                 return this.writeTextureFile(textureData, '1', format, childPath, slpkChildPath);
 
-              case 23:
+              case 19:
                 if (!this.generateTextures) {
-                  _context15.next = 32;
+                  _context15.next = 24;
                   break;
                 }
 
@@ -1354,24 +1376,18 @@ var I3SConverter = function () {
                   name: '0',
                   format: 'jpg'
                 });
-                _context15.t3 = Uint8Array;
-                _context15.next = 28;
-                return (0, _core.encode)(texture.image.data[0], _images.ImageWriter);
-
-              case 28:
-                _context15.t4 = _context15.sent;
-                decodedFromKTX2TextureData = new _context15.t3(_context15.t4);
-                _context15.next = 32;
+                decodedFromKTX2TextureData = (0, _core.encode)(texture.image.data[0], _images.ImageWriter);
+                _context15.next = 24;
                 return this.writeTextureFile(decodedFromKTX2TextureData, '0', 'jpg', childPath, slpkChildPath);
 
-              case 32:
+              case 24:
                 if (!this.layers0.textureSetDefinitions.length) {
                   this.layers0.textureSetDefinitions.push({
                     formats: formats
                   });
                 }
 
-              case 33:
+              case 25:
               case "end":
                 return _context15.stop();
             }
@@ -1844,7 +1860,7 @@ var I3SConverter = function () {
     key: "loadWorkers",
     value: function () {
       var _loadWorkers = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee21() {
-        var url, _sourceResponse, _source, i3sAttributesWorkerUrl, sourceResponse, source;
+        var url, _sourceResponse, _source, _url, _sourceResponse2, _source2, i3sAttributesWorkerUrl, sourceResponse, source;
 
         return _regenerator.default.wrap(function _callee21$(_context21) {
           while (1) {
@@ -1871,21 +1887,40 @@ var I3SConverter = function () {
                 this.workerSource.draco = _source;
 
               case 10:
+                if (!this.generateTextures) {
+                  _context21.next = 19;
+                  break;
+                }
+
+                _url = (0, _workerUtils.getWorkerURL)(_textures.KTX2BasisWriterWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
+                _context21.next = 14;
+                return (0, _core.fetchFile)(_url);
+
+              case 14:
+                _sourceResponse2 = _context21.sent;
+                _context21.next = 17;
+                return _sourceResponse2.text();
+
+              case 17:
+                _source2 = _context21.sent;
+                this.workerSource.ktx2 = _source2;
+
+              case 19:
                 i3sAttributesWorkerUrl = (0, _workerUtils.getWorkerURL)(_i3sAttributesWorker.I3SAttributesWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
-                _context21.next = 13;
+                _context21.next = 22;
                 return (0, _core.fetchFile)(i3sAttributesWorkerUrl);
 
-              case 13:
+              case 22:
                 sourceResponse = _context21.sent;
-                _context21.next = 16;
+                _context21.next = 25;
                 return sourceResponse.text();
 
-              case 16:
+              case 25:
                 source = _context21.sent;
                 this.workerSource.I3SAttributes = source;
                 console.log("Loading workers source completed!");
 
-              case 19:
+              case 28:
               case "end":
                 return _context21.stop();
             }