@loaders.gl/tile-converter 3.2.7 → 3.3.0-alpha.3

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

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof3 = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -47,7 +49,7 @@ var _compressUtil = require("../lib/utils/compress-util");
 
 var _statisticUtills = require("../lib/utils/statistic-utills");
 
-var _geometryConverter = _interopRequireDefault(require("./helpers/geometry-converter"));
+var _geometryConverter = _interopRequireWildcard(require("./helpers/geometry-converter"));
 
 var _coordinateConverter = require("./helpers/coordinate-converter");
 
@@ -81,6 +83,10 @@ var _constants = require("../constants");
 
 var _process$env;
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 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); }
@@ -896,9 +902,9 @@ var I3SConverter = function () {
     key: "_createNode",
     value: function () {
       var _createNode2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee10(parentTile, sourceTile, parentId, level) {
-        var _sourceTile$content;
+        var _this$layers, _this$layers$attribut;
 
-        var boundingVolumes, batchTable, resourcesData, nodes, nodesInPage, emptyResources, _iterator5, _step5, resources, lodSelection, maxScreenThresholdSQ, nodeInPage, node, _console;
+        var boundingVolumes, propertyTable, resourcesData, nodes, nodesInPage, emptyResources, _iterator5, _step5, resources, lodSelection, maxScreenThresholdSQ, nodeInPage, node, _console;
 
         return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) {
@@ -917,14 +923,14 @@ var I3SConverter = function () {
 
               case 5:
                 boundingVolumes = (0, _coordinateConverter.createBoundingVolumes)(sourceTile, this.geoidHeightModel);
-                batchTable = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content = sourceTile.content) === null || _sourceTile$content === void 0 ? void 0 : _sourceTile$content.batchTableJson;
+                propertyTable = (0, _geometryConverter.getPropertyTable)(sourceTile);
 
-                if (batchTable) {
-                  this._convertAttributeStorageInfo(sourceTile.content);
+                if (propertyTable && !((_this$layers = this.layers0) !== null && _this$layers !== void 0 && (_this$layers$attribut = _this$layers.attributeStorageInfo) !== null && _this$layers$attribut !== void 0 && _this$layers$attribut.length)) {
+                  this._convertPropertyTableToNodeAttributes(propertyTable);
                 }
 
                 _context10.next = 10;
-                return this._convertResources(sourceTile);
+                return this._convertResources(sourceTile, propertyTable);
 
               case 10:
                 resourcesData = _context10.sent;
@@ -1036,21 +1042,10 @@ var I3SConverter = function () {
 
       return _createNode;
     }()
-  }, {
-    key: "_convertAttributeStorageInfo",
-    value: function _convertAttributeStorageInfo(sourceTileContent) {
-      var _this$layers, _this$layers$attribut;
-
-      var batchTable = sourceTileContent && sourceTileContent.batchTableJson;
-
-      if (batchTable && !((_this$layers = this.layers0) !== null && _this$layers !== void 0 && (_this$layers$attribut = _this$layers.attributeStorageInfo) !== null && _this$layers$attribut !== void 0 && _this$layers$attribut.length)) {
-        this._convertBatchTableInfoToNodeAttributes(batchTable);
-      }
-    }
   }, {
     key: "_convertResources",
     value: function () {
-      var _convertResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee11(sourceTile) {
+      var _convertResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee11(sourceTile, propertyTable) {
         var _this$layers2;
 
         var resourcesData;
@@ -1067,7 +1062,7 @@ var I3SConverter = function () {
 
               case 2:
                 _context11.next = 4;
-                return (0, _geometryConverter.default)(sourceTile.content, Number(this.nodePages.nodesCounter), this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
+                return (0, _geometryConverter.default)(sourceTile.content, Number(this.nodePages.nodesCounter), propertyTable, this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
 
               case 4:
                 resourcesData = _context11.sent;
@@ -1081,7 +1076,7 @@ var I3SConverter = function () {
         }, _callee11, this);
       }));
 
-      function _convertResources(_x20) {
+      function _convertResources(_x20, _x21) {
         return _convertResources2.apply(this, arguments);
       }
 
@@ -1234,7 +1229,7 @@ var I3SConverter = function () {
         }, _callee12, this);
       }));
 
-      function _writeResources(_x21, _x22) {
+      function _writeResources(_x22, _x23) {
         return _writeResources2.apply(this, arguments);
       }
 
@@ -1309,7 +1304,7 @@ var I3SConverter = function () {
         }, _callee13, this);
       }));
 
-      function _writeGeometries(_x23, _x24, _x25, _x26) {
+      function _writeGeometries(_x24, _x25, _x26, _x27) {
         return _writeGeometries2.apply(this, arguments);
       }
 
@@ -1367,7 +1362,7 @@ var I3SConverter = function () {
         }, _callee14, this);
       }));
 
-      function _writeShared(_x27, _x28, _x29, _x30) {
+      function _writeShared(_x28, _x29, _x30, _x31) {
         return _writeShared2.apply(this, arguments);
       }
 
@@ -1377,13 +1372,13 @@ var I3SConverter = function () {
     key: "_writeTexture",
     value: function () {
       var _writeTexture2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee15(texture, childPath, slpkChildPath) {
-        var format, formats, textureData, ktx2TextureData, decodedFromKTX2TextureData;
+        var format, formats, textureData, copyArrayBuffer, arrayToEncode, ktx2TextureData, decodedFromKTX2TextureData;
         return _regenerator.default.wrap(function _callee15$(_context15) {
           while (1) {
             switch (_context15.prev = _context15.next) {
               case 0:
                 if (!texture) {
-                  _context15.next = 25;
+                  _context15.next = 27;
                   break;
                 }
 
@@ -1391,7 +1386,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' ? 16 : 24;
+                _context15.next = _context15.t0 === 'jpg' ? 7 : _context15.t0 === 'png' ? 7 : _context15.t0 === 'ktx2' ? 18 : 26;
                 break;
 
               case 7:
@@ -1404,7 +1399,7 @@ var I3SConverter = function () {
 
               case 10:
                 if (!this.generateTextures) {
-                  _context15.next = 15;
+                  _context15.next = 17;
                   break;
                 }
 
@@ -1412,28 +1407,32 @@ var I3SConverter = function () {
                   name: '1',
                   format: 'ktx2'
                 });
-                ktx2TextureData = (0, _core.encode)(texture.image, _textures.KTX2BasisWriterWorker, _objectSpread(_objectSpread({}, _textures.KTX2BasisWriterWorker.options), {}, {
+                copyArrayBuffer = texture.image.data.subarray();
+                arrayToEncode = new Uint8Array(copyArrayBuffer);
+                ktx2TextureData = (0, _core.encode)(_objectSpread(_objectSpread({}, texture.image), {}, {
+                  data: arrayToEncode
+                }), _textures.KTX2BasisWriterWorker, _objectSpread(_objectSpread({}, _textures.KTX2BasisWriterWorker.options), {}, {
                   source: this.workerSource.ktx2,
                   reuseWorkers: true,
                   _nodeWorkers: true
                 }));
-                _context15.next = 15;
+                _context15.next = 17;
                 return this.writeTextureFile(ktx2TextureData, '1', 'ktx2', childPath, slpkChildPath);
 
-              case 15:
-                return _context15.abrupt("break", 24);
+              case 17:
+                return _context15.abrupt("break", 26);
 
-              case 16:
+              case 18:
                 formats.push({
                   name: '1',
                   format: format
                 });
-                _context15.next = 19;
+                _context15.next = 21;
                 return this.writeTextureFile(textureData, '1', format, childPath, slpkChildPath);
 
-              case 19:
+              case 21:
                 if (!this.generateTextures) {
-                  _context15.next = 24;
+                  _context15.next = 26;
                   break;
                 }
 
@@ -1442,17 +1441,17 @@ var I3SConverter = function () {
                   format: 'jpg'
                 });
                 decodedFromKTX2TextureData = (0, _core.encode)(texture.image.data[0], _images.ImageWriter);
-                _context15.next = 24;
+                _context15.next = 26;
                 return this.writeTextureFile(decodedFromKTX2TextureData, '0', 'jpg', childPath, slpkChildPath);
 
-              case 24:
+              case 26:
                 if (!this.layers0.textureSetDefinitions.length) {
                   this.layers0.textureSetDefinitions.push({
                     formats: formats
                   });
                 }
 
-              case 25:
+              case 27:
               case "end":
                 return _context15.stop();
             }
@@ -1460,7 +1459,7 @@ var I3SConverter = function () {
         }, _callee15, this);
       }));
 
-      function _writeTexture(_x31, _x32, _x33) {
+      function _writeTexture(_x32, _x33, _x34) {
         return _writeTexture2.apply(this, arguments);
       }
 
@@ -1507,7 +1506,7 @@ var I3SConverter = function () {
         }, _callee16, this);
       }));
 
-      function writeTextureFile(_x34, _x35, _x36, _x37, _x38) {
+      function writeTextureFile(_x35, _x36, _x37, _x38, _x39) {
         return _writeTextureFile.apply(this, arguments);
       }
 
@@ -1726,16 +1725,16 @@ var I3SConverter = function () {
       };
     }
   }, {
-    key: "_convertBatchTableInfoToNodeAttributes",
-    value: function _convertBatchTableInfoToNodeAttributes(batchTable) {
+    key: "_convertPropertyTableToNodeAttributes",
+    value: function _convertPropertyTableToNodeAttributes(propertyTable) {
       var attributeIndex = 0;
 
-      var batchTableWithObjectId = _objectSpread({
+      var propertyTableWithObjectId = _objectSpread({
         OBJECTID: [0]
-      }, batchTable);
+      }, propertyTable);
 
-      for (var _key in batchTableWithObjectId) {
-        var firstAttribute = batchTableWithObjectId[_key][0];
+      for (var _key in propertyTableWithObjectId) {
+        var firstAttribute = propertyTableWithObjectId[_key][0];
         var attributeType = this.getAttributeType(_key, firstAttribute);
 
         var storageAttribute = this._createdStorageAttribute(attributeIndex, _key, attributeType);
@@ -1744,7 +1743,7 @@ var I3SConverter = function () {
 
         var fieldAttribute = this._createFieldAttribute(_key, fieldAttributeType);
 
-        var popupInfo = this._createPopupInfo(batchTableWithObjectId);
+        var popupInfo = this._createPopupInfo(propertyTableWithObjectId);
 
         this.layers0.attributeStorageInfo.push(storageAttribute);
         this.layers0.fields.push(fieldAttribute);
@@ -1775,14 +1774,14 @@ var I3SConverter = function () {
     }
   }, {
     key: "_createPopupInfo",
-    value: function _createPopupInfo(batchTable) {
+    value: function _createPopupInfo(propertyTable) {
       var title = '{OBJECTID}';
       var mediaInfos = [];
       var fieldInfos = [];
       var popupElements = [];
       var expressionInfos = [];
 
-      for (var _key2 in batchTable) {
+      for (var _key2 in propertyTable) {
         fieldInfos.push({
           fieldName: _key2,
           visible: true,
@@ -1838,7 +1837,7 @@ var I3SConverter = function () {
         }, _callee18, this);
       }));
 
-      function _finishConversion(_x39) {
+      function _finishConversion(_x40) {
         return _finishConversion2.apply(this, arguments);
       }