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

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

@@ -178,7 +178,7 @@ class I3SConverter {
             if (preloadOptions.headers) {
                 this.loadOptions.fetch = { headers: preloadOptions.headers };
             }
-            this.sourceTileset = await (0, core_1.load)(tilesetUrl, this.Loader, this.loadOptions);
+            this.sourceTileset = await (0, load_3d_tiles_1.loadFromArchive)(tilesetUrl, this.Loader, this.loadOptions);
             const preprocessResult = await this.preprocessConversion();
             if (preprocessResult) {
                 await this._createAndSaveTileset(outputPath, tilesetName);
@@ -253,7 +253,8 @@ class I3SConverter {
      * @returns - nothing
      */
     async analyzeTile(sourceTile, traversalProps) {
-        if (sourceTile.type === 'json') {
+        const isTileset = (0, load_3d_tiles_1.isNestedTileset)(sourceTile);
+        if (isTileset) {
             await (0, load_3d_tiles_1.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
             return null;
         }
@@ -417,8 +418,9 @@ class I3SConverter {
      * @returns - traversal properties for the child tiles
      */
     async convertTile(sourceTile, traversalProps) {
-        if (sourceTile.type === 'json' || sourceTile.type === 'empty') {
-            if (sourceTile.type === 'json') {
+        const isTileset = (0, load_3d_tiles_1.isNestedTileset)(sourceTile);
+        if (isTileset || sourceTile.type === 'empty') {
+            if (isTileset) {
                 if (sourceTile.id) {
                     console.log(`[load]: ${sourceTile.id}`); // eslint-disable-line
                 }
@@ -479,7 +481,14 @@ class I3SConverter {
         const sourceBoundingVolume = (0, tiles_1.createBoundingVolume)(sourceTile.boundingVolume, transformationMatrix, null);
         let boundingVolumes = (0, coordinate_converter_1.createBoundingVolumes)(sourceBoundingVolume, this.geoidHeightModel);
         const propertyTable = (0, geometry_converter_1.getPropertyTable)(tileContent, this.options.metadataClass);
-        if (propertyTable && !this.layers0?.attributeStorageInfo?.length) {
+        if (propertyTable) {
+            /*
+              Call the convertion procedure even if the node attributes have been already created.
+              We will append new attributes only in case the property table is updated.
+              According to ver 1.9 (see https://github.com/Esri/i3s-spec/blob/master/docs/1.9/attributeStorageInfo.cmn.md):
+              "The attributeStorageInfo object describes the structure of the binary attribute data resource of a layer, which is the same for every node in the layer."
+              But the specification of ver 2.1 doesn't have such a requirement ("...the same for every node...")
+            */
             this._convertPropertyTableToNodeAttributes(propertyTable);
         }
         const resourcesData = await this._convertResources(sourceTile, transformationMatrix, sourceBoundingVolume, tileContent, parentNode.inPageId, propertyTable);
@@ -531,7 +540,7 @@ class I3SConverter {
      * @param boundingVolume - initialized bounding volume of the source tile
      * @param tileContent - content of the source tile
      * @param parentId - id of parent node in node pages
-     * @param propertyTable - batch table from b3dm / feature properties from EXT_FEATURE_METADATA
+     * @param propertyTable - batch table from b3dm / feature properties from EXT_FEATURE_METADATA, EXT_MESH_FEATURES or EXT_STRUCTURAL_METADATA
      * @returns - converted node resources
      */
     async _convertResources(sourceTile, transformationMatrix, boundingVolume, tileContent, parentId, propertyTable) {
@@ -778,7 +787,10 @@ class I3SConverter {
      */
     async _writeAttributes(attributes = [], childPath, slpkChildPath) {
         if (attributes?.length && this.layers0?.attributeStorageInfo?.length) {
-            for (let index = 0; index < attributes.length; index++) {
+            const minimumLength = attributes.length < this.layers0.attributeStorageInfo.length
+                ? attributes.length
+                : this.layers0.attributeStorageInfo.length;
+            for (let index = 0; index < minimumLength; index++) {
                 const folderName = this.layers0.attributeStorageInfo[index].key;
                 const fileBuffer = new Uint8Array(attributes[index]);
                 if (this.options.slpk) {
@@ -855,16 +867,25 @@ class I3SConverter {
             ...propertyTable
         };
         for (const key in propertyTableWithObjectId) {
-            const firstAttribute = propertyTableWithObjectId[key][0];
-            const attributeType = (0, feature_attributes_1.getAttributeType)(key, firstAttribute);
-            const storageAttribute = (0, feature_attributes_1.createdStorageAttribute)(attributeIndex, key, attributeType);
-            const fieldAttributeType = (0, feature_attributes_1.getFieldAttributeType)(attributeType);
-            const fieldAttribute = (0, feature_attributes_1.createFieldAttribute)(key, fieldAttributeType);
-            const popupInfo = (0, feature_attributes_1.createPopupInfo)(propertyTableWithObjectId);
-            this.layers0.attributeStorageInfo.push(storageAttribute);
-            this.layers0.fields.push(fieldAttribute);
-            this.layers0.popupInfo = popupInfo;
-            this.layers0.layerType = _3D_OBJECT_LAYER_TYPE;
+            /*
+              We will append new attributes only in case the property table is updated.
+              According to ver 1.9 (see https://github.com/Esri/i3s-spec/blob/master/docs/1.9/attributeStorageInfo.cmn.md):
+              "The attributeStorageInfo object describes the structure of the binary attribute data resource of a layer, which is the same for every node in the layer."
+              But the specification of ver 2.1 doesn't have such a requirement ("...the same for every node...")
+            */
+            const found = this.layers0.attributeStorageInfo.find((element) => element.name === key);
+            if (!found) {
+                const firstAttribute = propertyTableWithObjectId[key][0];
+                const attributeType = (0, feature_attributes_1.getAttributeType)(key, firstAttribute);
+                const storageAttribute = (0, feature_attributes_1.createdStorageAttribute)(attributeIndex, key, attributeType);
+                const fieldAttributeType = (0, feature_attributes_1.getFieldAttributeType)(attributeType);
+                const fieldAttribute = (0, feature_attributes_1.createFieldAttribute)(key, fieldAttributeType);
+                const popupInfo = (0, feature_attributes_1.createPopupInfo)(propertyTableWithObjectId);
+                this.layers0.attributeStorageInfo.push(storageAttribute);
+                this.layers0.fields.push(fieldAttribute);
+                this.layers0.popupInfo = popupInfo;
+                this.layers0.layerType = _3D_OBJECT_LAYER_TYPE;
+            }
             attributeIndex += 1;
         }
     }

package/dist/i3s-server/controllers/slpk-controller.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileByUrl = exports.loadArchive = void 0;
 require("@loaders.gl/polyfills");
 const i3s_1 = require("@loaders.gl/i3s");
-const zip_1 = require("@loaders.gl/zip");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 let slpkArchive;
 /**
  * Open SLPK file for reading and load HASH file
  * @param fullLayerPath - full path to SLPK file
  */
 const loadArchive = async (fullLayerPath) => {
-    slpkArchive = await (0, i3s_1.parseSLPK)(await zip_1.FileHandleFile.from(fullLayerPath), (msg) => console.log(msg));
+    slpkArchive = await (0, i3s_1.parseSLPK)(await loader_utils_1.FileHandleFile.from(fullLayerPath), (msg) => console.log(msg));
     console.log('The server is ready to use');
 };
 exports.loadArchive = loadArchive;

package/dist/slpk-extractor/slpk-extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slpk-extractor.d.ts","sourceRoot":"","sources":["../../src/slpk-extractor/slpk-extractor.ts"],"names":[],"mappings":"AAsBA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC;;;;;OAKG;IACU,OAAO,CAAC,OAAO,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BtF;;;OAGG;IAEH,OAAO,CAAC,iBAAiB;YAYX,MAAM;YAWN,SAAS;CASxB"}
+{"version":3,"file":"slpk-extractor.d.ts","sourceRoot":"","sources":["../../src/slpk-extractor/slpk-extractor.ts"],"names":[],"mappings":"AAuBA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC;;;;;OAKG;IACU,OAAO,CAAC,OAAO,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BtF;;;OAGG;IAEH,OAAO,CAAC,iBAAiB;YAYX,MAAM;YAWN,SAAS;CASxB"}

package/dist/slpk-extractor/slpk-extractor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@loaders.gl/core");
 const constants_1 = require("../constants");
 const loader_utils_1 = require("@loaders.gl/loader-utils");
+const loader_utils_2 = require("@loaders.gl/loader-utils");
 const zip_1 = require("@loaders.gl/zip");
 const compression_1 = require("@loaders.gl/compression");
 const file_utils_1 = require("../lib/utils/file-utils");
@@ -27,7 +28,7 @@ class SLPKExtractor {
             return constants_1.BROWSER_ERROR_MESSAGE;
         }
         const { inputUrl } = options;
-        const provider = await zip_1.FileHandleFile.from(inputUrl);
+        const provider = await loader_utils_2.FileHandleFile.from(inputUrl);
         let localHeader = await (0, zip_1.parseZipLocalFileHeader)(0n, provider);
         while (localHeader) {
             await this.writeFile(await this.unGzip({