@loaders.gl/tile-converter 4.0.0-alpha.21 → 4.0.0-alpha.23

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

@@ -185,7 +185,7 @@ var I3SConverter = function () {
                 };
               }
               _context.next = 28;
-              return (0, _core.load)(tilesetUrl, this.Loader, this.loadOptions);
+              return (0, _load3dTiles.loadFromArchive)(tilesetUrl, this.Loader, this.loadOptions);
             case 28:
               this.sourceTileset = _context.sent;
               _context.next = 31;
@@ -314,50 +314,51 @@ var I3SConverter = function () {
     key: "analyzeTile",
     value: function () {
       var _analyzeTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(sourceTile, traversalProps) {
-        var tileContent, tilePreprocessData;
+        var isTileset, tileContent, tilePreprocessData;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(sourceTile.type === 'json')) {
-                _context3.next = 4;
+              isTileset = (0, _load3dTiles.isNestedTileset)(sourceTile);
+              if (!isTileset) {
+                _context3.next = 5;
                 break;
               }
-              _context3.next = 3;
+              _context3.next = 4;
               return (0, _load3dTiles.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
-            case 3:
-              return _context3.abrupt("return", null);
             case 4:
+              return _context3.abrupt("return", null);
+            case 5:
               if (sourceTile.id) {
                 console.log("[analyze]: ".concat(sourceTile.id));
               }
               tileContent = null;
-              _context3.prev = 6;
-              _context3.next = 9;
+              _context3.prev = 7;
+              _context3.next = 10;
               return (0, _load3dTiles.loadTile3DContent)(this.sourceTileset, sourceTile, _objectSpread(_objectSpread({}, this.loadOptions), {}, {
                 '3d-tiles': _objectSpread(_objectSpread({}, this.loadOptions['3d-tiles']), {}, {
                   loadGLTF: false
                 })
               }));
-            case 9:
+            case 10:
               tileContent = _context3.sent;
-              _context3.next = 15;
+              _context3.next = 16;
               break;
-            case 12:
-              _context3.prev = 12;
-              _context3.t0 = _context3["catch"](6);
+            case 13:
+              _context3.prev = 13;
+              _context3.t0 = _context3["catch"](7);
               console.log("[warning]: Failed to load ".concat(sourceTile.contentUrl, ". An I3S tile with empty content will be added to the output tileset"));
-            case 15:
-              _context3.next = 17;
+            case 16:
+              _context3.next = 18;
               return (0, _preprocess3dTiles.analyzeTileContent)(tileContent);
-            case 17:
+            case 18:
               tilePreprocessData = _context3.sent;
               (0, _preprocess3dTiles.mergePreprocessData)(this.preprocessData, tilePreprocessData);
               return _context3.abrupt("return", null);
-            case 20:
+            case 21:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[6, 12]]);
+        }, _callee3, this, [[7, 13]]);
       }));
       function analyzeTile(_x2, _x3) {
         return _analyzeTile.apply(this, arguments);
@@ -588,26 +589,27 @@ var I3SConverter = function () {
     key: "convertTile",
     value: function () {
       var _convertTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(sourceTile, traversalProps) {
-        var parentNodes, transform, transformationMatrix, parentNode, childNodes, newTraversalProps;
+        var isTileset, parentNodes, transform, transformationMatrix, parentNode, childNodes, newTraversalProps;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(sourceTile.type === 'json' || sourceTile.type === 'empty')) {
-                _context7.next = 6;
+              isTileset = (0, _load3dTiles.isNestedTileset)(sourceTile);
+              if (!(isTileset || sourceTile.type === 'empty')) {
+                _context7.next = 7;
                 break;
               }
-              if (!(sourceTile.type === 'json')) {
-                _context7.next = 5;
+              if (!isTileset) {
+                _context7.next = 6;
                 break;
               }
               if (sourceTile.id) {
                 console.log("[load]: ".concat(sourceTile.id));
               }
-              _context7.next = 5;
+              _context7.next = 6;
               return (0, _load3dTiles.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
-            case 5:
-              return _context7.abrupt("return", traversalProps);
             case 6:
+              return _context7.abrupt("return", traversalProps);
+            case 7:
               if (sourceTile.id) {
                 console.log("[convert]: ".concat(sourceTile.id));
               }
@@ -617,19 +619,19 @@ var I3SConverter = function () {
                 transformationMatrix = transformationMatrix.multiplyRight(sourceTile.transform);
               }
               parentNode = parentNodes[0];
-              _context7.next = 13;
+              _context7.next = 14;
               return this._createNode(parentNode, sourceTile, transformationMatrix);
-            case 13:
+            case 14:
               childNodes = _context7.sent;
-              _context7.next = 16;
+              _context7.next = 17;
               return parentNode.addChildren(childNodes);
-            case 16:
+            case 17:
               newTraversalProps = {
                 transform: transformationMatrix,
                 parentNodes: childNodes
               };
               return _context7.abrupt("return", newTraversalProps);
-            case 18:
+            case 19:
             case "end":
               return _context7.stop();
           }
@@ -737,7 +739,6 @@ var I3SConverter = function () {
     key: "_createNode",
     value: function () {
       var _createNode2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee9(parentNode, sourceTile, transformationMatrix) {
-        var _this$layers, _this$layers$attribut;
         var tileContent, sourceBoundingVolume, boundingVolumes, propertyTable, resourcesData, nodes, nodeIds, nodesInPage, emptyResources, _iterator5, _step5, resources, lodSelection, maxScreenThresholdSQ, nodeInPage, nodeData, node, _console;
         return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
@@ -762,7 +763,7 @@ var I3SConverter = function () {
               sourceBoundingVolume = (0, _tiles.createBoundingVolume)(sourceTile.boundingVolume, transformationMatrix, null);
               boundingVolumes = (0, _coordinateConverter.createBoundingVolumes)(sourceBoundingVolume, this.geoidHeightModel);
               propertyTable = (0, _geometryConverter.getPropertyTable)(tileContent, this.options.metadataClass);
-              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)) {
+              if (propertyTable) {
                 this._convertPropertyTableToNodeAttributes(propertyTable);
               }
               _context9.next = 19;
@@ -863,7 +864,7 @@ var I3SConverter = function () {
     value: function () {
       var _convertResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee11(sourceTile, transformationMatrix, boundingVolume, tileContent, parentId, propertyTable) {
         var _this3 = this,
-          _this$layers2;
+          _this$layers;
         var draftObb, resourcesData;
         return _regenerator.default.wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
@@ -896,7 +897,7 @@ var I3SConverter = function () {
                       return _context10.stop();
                   }
                 }, _callee10);
-              })), propertyTable, this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.options.mergeMaterials, this.geoidHeightModel, this.loadOptions.modules, this.options.metadataClass);
+              })), propertyTable, this.featuresHashArray, (_this$layers = this.layers0) === null || _this$layers === void 0 ? void 0 : _this$layers.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.options.mergeMaterials, this.geoidHeightModel, this.loadOptions.modules, this.options.metadataClass);
             case 5:
               resourcesData = _context11.sent;
               return _context11.abrupt("return", resourcesData);
@@ -1275,12 +1276,13 @@ var I3SConverter = function () {
     key: "_writeAttributes",
     value: function () {
       var _writeAttributes2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee18() {
-        var _this$layers3,
-          _this$layers3$attribu,
+        var _this$layers2,
+          _this$layers2$attribu,
           _this4 = this;
         var attributes,
           childPath,
           slpkChildPath,
+          minimumLength,
           _loop,
           index,
           _args19 = arguments;
@@ -1290,10 +1292,11 @@ var I3SConverter = function () {
               attributes = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : [];
               childPath = _args19.length > 1 ? _args19[1] : undefined;
               slpkChildPath = _args19.length > 2 ? _args19[2] : undefined;
-              if (!(attributes !== null && attributes !== void 0 && attributes.length && (_this$layers3 = this.layers0) !== null && _this$layers3 !== void 0 && (_this$layers3$attribu = _this$layers3.attributeStorageInfo) !== null && _this$layers3$attribu !== void 0 && _this$layers3$attribu.length)) {
-                _context19.next = 11;
+              if (!(attributes !== null && attributes !== void 0 && attributes.length && (_this$layers2 = this.layers0) !== null && _this$layers2 !== void 0 && (_this$layers2$attribu = _this$layers2.attributeStorageInfo) !== null && _this$layers2$attribu !== void 0 && _this$layers2$attribu.length)) {
+                _context19.next = 12;
                 break;
               }
+              minimumLength = attributes.length < this.layers0.attributeStorageInfo.length ? attributes.length : this.layers0.attributeStorageInfo.length;
               _loop = _regenerator.default.mark(function _loop() {
                 var folderName, fileBuffer, slpkAttributesPath, attributesPath;
                 return _regenerator.default.wrap(function _loop$(_context18) {
@@ -1331,17 +1334,17 @@ var I3SConverter = function () {
                 }, _loop);
               });
               index = 0;
-            case 6:
-              if (!(index < attributes.length)) {
-                _context19.next = 11;
+            case 7:
+              if (!(index < minimumLength)) {
+                _context19.next = 12;
                 break;
               }
-              return _context19.delegateYield(_loop(), "t0", 8);
-            case 8:
+              return _context19.delegateYield(_loop(), "t0", 9);
+            case 9:
               index++;
-              _context19.next = 6;
+              _context19.next = 7;
               break;
-            case 11:
+            case 12:
             case "end":
               return _context19.stop();
           }
@@ -1395,22 +1398,31 @@ var I3SConverter = function () {
   }, {
     key: "_convertPropertyTableToNodeAttributes",
     value: function _convertPropertyTableToNodeAttributes(propertyTable) {
+      var _this5 = this;
       var attributeIndex = 0;
       var propertyTableWithObjectId = _objectSpread({
         OBJECTID: [0]
       }, propertyTable);
-      for (var _key in propertyTableWithObjectId) {
-        var firstAttribute = propertyTableWithObjectId[_key][0];
-        var attributeType = (0, _featureAttributes.getAttributeType)(_key, firstAttribute);
-        var storageAttribute = (0, _featureAttributes.createdStorageAttribute)(attributeIndex, _key, attributeType);
-        var fieldAttributeType = (0, _featureAttributes.getFieldAttributeType)(attributeType);
-        var fieldAttribute = (0, _featureAttributes.createFieldAttribute)(_key, fieldAttributeType);
-        var popupInfo = (0, _featureAttributes.createPopupInfo)(propertyTableWithObjectId);
-        this.layers0.attributeStorageInfo.push(storageAttribute);
-        this.layers0.fields.push(fieldAttribute);
-        this.layers0.popupInfo = popupInfo;
-        this.layers0.layerType = _3D_OBJECT_LAYER_TYPE;
+      var _loop2 = function _loop2(_key) {
+        var found = _this5.layers0.attributeStorageInfo.find(function (element) {
+          return element.name === _key;
+        });
+        if (!found) {
+          var firstAttribute = propertyTableWithObjectId[_key][0];
+          var attributeType = (0, _featureAttributes.getAttributeType)(_key, firstAttribute);
+          var storageAttribute = (0, _featureAttributes.createdStorageAttribute)(attributeIndex, _key, attributeType);
+          var fieldAttributeType = (0, _featureAttributes.getFieldAttributeType)(attributeType);
+          var fieldAttribute = (0, _featureAttributes.createFieldAttribute)(_key, fieldAttributeType);
+          var popupInfo = (0, _featureAttributes.createPopupInfo)(propertyTableWithObjectId);
+          _this5.layers0.attributeStorageInfo.push(storageAttribute);
+          _this5.layers0.fields.push(fieldAttribute);
+          _this5.layers0.popupInfo = popupInfo;
+          _this5.layers0.layerType = _3D_OBJECT_LAYER_TYPE;
+        }
         attributeIndex += 1;
+      };
+      for (var _key in propertyTableWithObjectId) {
+        _loop2(_key);
       }
     }
   }, {