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

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

@@ -1,6 +1,6 @@
 import '@loaders.gl/polyfills';
 import { parseSLPK } from '@loaders.gl/i3s';
-import { FileHandleFile } from '@loaders.gl/zip';
+import { FileHandleFile } from '@loaders.gl/loader-utils';
 let slpkArchive;
 export const loadArchive = async fullLayerPath => {
   slpkArchive = await parseSLPK(await FileHandleFile.from(fullLayerPath), msg => console.log(msg));

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

@@ -1 +1 @@
-{"version":3,"file":"slpk-controller.js","names":["parseSLPK","FileHandleFile","slpkArchive","loadArchive","fullLayerPath","from","msg","console","log","getFileByUrl","url","trimmedPath","exec","uncompressedFile","Buffer","getFile","e"],"sources":["../../../../src/i3s-server/controllers/slpk-controller.ts"],"sourcesContent":["import '@loaders.gl/polyfills';\nimport {parseSLPK} from '@loaders.gl/i3s';\nimport {FileHandleFile} from '@loaders.gl/zip';\n\nlet slpkArchive;\n\n/**\n * Open SLPK file for reading and load HASH file\n * @param fullLayerPath - full path to SLPK file\n */\nexport const loadArchive = async (fullLayerPath: string): Promise<void> => {\n  slpkArchive = await parseSLPK(await FileHandleFile.from(fullLayerPath), (msg) =>\n    console.log(msg)\n  );\n  console.log('The server is ready to use');\n};\n\n/**\n * Get a file from SLPK\n * @param url - I3S HTTP URL\n * @returns  - file content\n */\nexport async function getFileByUrl(url: string) {\n  const trimmedPath = /^\\/?(.*)\\/?$/.exec(url);\n  let uncompressedFile: Buffer | null = null;\n  if (trimmedPath) {\n    try {\n      uncompressedFile = Buffer.from(await slpkArchive.getFile(trimmedPath[1], 'http'));\n    } catch (e) {}\n  }\n  return uncompressedFile;\n}\n"],"mappings":"AAAA,OAAO,uBAAuB;AAC9B,SAAQA,SAAS,QAAO,iBAAiB;AACzC,SAAQC,cAAc,QAAO,iBAAiB;AAE9C,IAAIC,WAAW;AAMf,OAAO,MAAMC,WAAW,GAAG,MAAOC,aAAqB,IAAoB;EACzEF,WAAW,GAAG,MAAMF,SAAS,CAAC,MAAMC,cAAc,CAACI,IAAI,CAACD,aAAa,CAAC,EAAGE,GAAG,IAC1EC,OAAO,CAACC,GAAG,CAACF,GAAG,CACjB,CAAC;EACDC,OAAO,CAACC,GAAG,CAAC,4BAA4B,CAAC;AAC3C,CAAC;AAOD,OAAO,eAAeC,YAAYA,CAACC,GAAW,EAAE;EAC9C,MAAMC,WAAW,GAAG,cAAc,CAACC,IAAI,CAACF,GAAG,CAAC;EAC5C,IAAIG,gBAA+B,GAAG,IAAI;EAC1C,IAAIF,WAAW,EAAE;IACf,IAAI;MACFE,gBAAgB,GAAGC,MAAM,CAACT,IAAI,CAAC,MAAMH,WAAW,CAACa,OAAO,CAACJ,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACnF,CAAC,CAAC,OAAOK,CAAC,EAAE,CAAC;EACf;EACA,OAAOH,gBAAgB;AACzB"}
+{"version":3,"file":"slpk-controller.js","names":["parseSLPK","FileHandleFile","slpkArchive","loadArchive","fullLayerPath","from","msg","console","log","getFileByUrl","url","trimmedPath","exec","uncompressedFile","Buffer","getFile","e"],"sources":["../../../../src/i3s-server/controllers/slpk-controller.ts"],"sourcesContent":["import '@loaders.gl/polyfills';\nimport {parseSLPK} from '@loaders.gl/i3s';\nimport {FileHandleFile} from '@loaders.gl/loader-utils';\n\nlet slpkArchive;\n\n/**\n * Open SLPK file for reading and load HASH file\n * @param fullLayerPath - full path to SLPK file\n */\nexport const loadArchive = async (fullLayerPath: string): Promise<void> => {\n  slpkArchive = await parseSLPK(await FileHandleFile.from(fullLayerPath), (msg) =>\n    console.log(msg)\n  );\n  console.log('The server is ready to use');\n};\n\n/**\n * Get a file from SLPK\n * @param url - I3S HTTP URL\n * @returns  - file content\n */\nexport async function getFileByUrl(url: string) {\n  const trimmedPath = /^\\/?(.*)\\/?$/.exec(url);\n  let uncompressedFile: Buffer | null = null;\n  if (trimmedPath) {\n    try {\n      uncompressedFile = Buffer.from(await slpkArchive.getFile(trimmedPath[1], 'http'));\n    } catch (e) {}\n  }\n  return uncompressedFile;\n}\n"],"mappings":"AAAA,OAAO,uBAAuB;AAC9B,SAAQA,SAAS,QAAO,iBAAiB;AACzC,SAAQC,cAAc,QAAO,0BAA0B;AAEvD,IAAIC,WAAW;AAMf,OAAO,MAAMC,WAAW,GAAG,MAAOC,aAAqB,IAAoB;EACzEF,WAAW,GAAG,MAAMF,SAAS,CAAC,MAAMC,cAAc,CAACI,IAAI,CAACD,aAAa,CAAC,EAAGE,GAAG,IAC1EC,OAAO,CAACC,GAAG,CAACF,GAAG,CACjB,CAAC;EACDC,OAAO,CAACC,GAAG,CAAC,4BAA4B,CAAC;AAC3C,CAAC;AAOD,OAAO,eAAeC,YAAYA,CAACC,GAAW,EAAE;EAC9C,MAAMC,WAAW,GAAG,cAAc,CAACC,IAAI,CAACF,GAAG,CAAC;EAC5C,IAAIG,gBAA+B,GAAG,IAAI;EAC1C,IAAIF,WAAW,EAAE;IACf,IAAI;MACFE,gBAAgB,GAAGC,MAAM,CAACT,IAAI,CAAC,MAAMH,WAAW,CAACa,OAAO,CAACJ,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACnF,CAAC,CAAC,OAAOK,CAAC,EAAE,CAAC;EACf;EACA,OAAOH,gBAAgB;AACzB"}

package/dist/esm/pgm-loader.js

@@ -1,5 +1,5 @@
 import { parsePGM } from '@math.gl/geoid';
-const VERSION = typeof "4.0.0-alpha.22" !== 'undefined' ? "4.0.0-alpha.22" : 'latest';
+const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',

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

@@ -1,7 +1,8 @@
 import { isBrowser } from '@loaders.gl/core';
 import { BROWSER_ERROR_MESSAGE } from '../constants';
 import { path } from '@loaders.gl/loader-utils';
-import { FileHandleFile, parseZipLocalFileHeader } from '@loaders.gl/zip';
+import { FileHandleFile } from '@loaders.gl/loader-utils';
+import { parseZipLocalFileHeader } from '@loaders.gl/zip';
 import { GZipCompression } from '@loaders.gl/compression';
 import { writeFile } from '../lib/utils/file-utils';
 const indexNames = ['3dSceneLayer.json.gz', '3dNodeIndexDocument.json.gz', 'sharedResource.json.gz'];

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

@@ -1 +1 @@
-{"version":3,"file":"slpk-extractor.js","names":["isBrowser","BROWSER_ERROR_MESSAGE","path","FileHandleFile","parseZipLocalFileHeader","GZipCompression","writeFile","indexNames","SLPKExtractor","extract","options","console","log","inputUrl","provider","from","localHeader","_localHeader","unGzip","name","correctIndexNames","fileName","data","slice","fileDataOffset","compressedSize","outputPath","includes","filename","join","dirname","parts","exec","concat","at","file","_file$name","test","_file$name2","compression","decompressedData","decompress","Promise","resolve","finalPath","dirName"],"sources":["../../../src/slpk-extractor/slpk-extractor.ts"],"sourcesContent":["import {isBrowser} from '@loaders.gl/core';\n\nimport {BROWSER_ERROR_MESSAGE} from '../constants';\nimport {path} from '@loaders.gl/loader-utils';\nimport {FileHandleFile, parseZipLocalFileHeader} from '@loaders.gl/zip';\nimport {GZipCompression} from '@loaders.gl/compression';\nimport {writeFile} from '../lib/utils/file-utils';\n\nconst indexNames = [\n  '3dSceneLayer.json.gz',\n  '3dNodeIndexDocument.json.gz',\n  'sharedResource.json.gz'\n];\n\n/**\n * Description of the file in the SLPK\n */\ntype File = {\n  name: string | null;\n  data: ArrayBuffer;\n};\n\n/**\n * Converter from slpk to i3s\n */\nexport default class SLPKExtractor {\n  /**\n   * Extract slpk to i3s\n   * @param options\n   * @param options.inputUrl the url to read SLPK file\n   * @param options.outputPath the output filename\n   */\n  public async extract(options: {inputUrl: string; outputPath: string}): Promise<string> {\n    if (isBrowser) {\n      console.log(BROWSER_ERROR_MESSAGE);\n      return BROWSER_ERROR_MESSAGE;\n    }\n    const {inputUrl} = options;\n\n    const provider = await FileHandleFile.from(inputUrl);\n\n    let localHeader = await parseZipLocalFileHeader(0n, provider);\n    while (localHeader) {\n      await this.writeFile(\n        await this.unGzip({\n          name: this.correctIndexNames(localHeader.fileName),\n          data: await provider.slice(\n            localHeader.fileDataOffset,\n            localHeader.fileDataOffset + localHeader.compressedSize\n          )\n        }),\n        options.outputPath\n      );\n      localHeader = await parseZipLocalFileHeader(\n        localHeader.fileDataOffset + localHeader?.compressedSize,\n        provider\n      );\n    }\n\n    return 'success';\n  }\n\n  /**\n   * Defines file name and path for i3s format\n   * @param fileName initial file name and path\n   */\n\n  private correctIndexNames(fileName: string): string | null {\n    if (indexNames.includes(path.filename(path.join('/', fileName)))) {\n      return path.join(path.dirname(fileName), 'index.json.gz');\n    }\n    // finds path with name part and extention part\n    let parts = /^(.*\\/[^\\/\\.]*)(\\..+)$/.exec(fileName);\n    if (!parts) {\n      return null;\n    }\n    return `${parts?.at(1)}/index${parts?.at(2)}`;\n  }\n\n  private async unGzip(file: File): Promise<File> {\n    if (/\\.gz$/.test(file.name ?? '')) {\n      const compression = new GZipCompression();\n\n      const decompressedData = await compression.decompress(file.data);\n\n      return {data: decompressedData, name: (file.name ?? '').slice(0, -3)};\n    }\n    return Promise.resolve(file);\n  }\n\n  private async writeFile(options: File, outputPath: string): Promise<void> {\n    if (!options.name) {\n      return;\n    }\n    const finalPath = path.join(outputPath, options.name);\n    const dirName = path.dirname(finalPath);\n    const fileName = path.filename(finalPath);\n    await writeFile(dirName, options.data, fileName);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"slpk-extractor.js","names":["isBrowser","BROWSER_ERROR_MESSAGE","path","FileHandleFile","parseZipLocalFileHeader","GZipCompression","writeFile","indexNames","SLPKExtractor","extract","options","console","log","inputUrl","provider","from","localHeader","_localHeader","unGzip","name","correctIndexNames","fileName","data","slice","fileDataOffset","compressedSize","outputPath","includes","filename","join","dirname","parts","exec","concat","at","file","_file$name","test","_file$name2","compression","decompressedData","decompress","Promise","resolve","finalPath","dirName"],"sources":["../../../src/slpk-extractor/slpk-extractor.ts"],"sourcesContent":["import {isBrowser} from '@loaders.gl/core';\n\nimport {BROWSER_ERROR_MESSAGE} from '../constants';\nimport {path} from '@loaders.gl/loader-utils';\nimport {FileHandleFile} from '@loaders.gl/loader-utils';\nimport {parseZipLocalFileHeader} from '@loaders.gl/zip';\nimport {GZipCompression} from '@loaders.gl/compression';\nimport {writeFile} from '../lib/utils/file-utils';\n\nconst indexNames = [\n  '3dSceneLayer.json.gz',\n  '3dNodeIndexDocument.json.gz',\n  'sharedResource.json.gz'\n];\n\n/**\n * Description of the file in the SLPK\n */\ntype File = {\n  name: string | null;\n  data: ArrayBuffer;\n};\n\n/**\n * Converter from slpk to i3s\n */\nexport default class SLPKExtractor {\n  /**\n   * Extract slpk to i3s\n   * @param options\n   * @param options.inputUrl the url to read SLPK file\n   * @param options.outputPath the output filename\n   */\n  public async extract(options: {inputUrl: string; outputPath: string}): Promise<string> {\n    if (isBrowser) {\n      console.log(BROWSER_ERROR_MESSAGE);\n      return BROWSER_ERROR_MESSAGE;\n    }\n    const {inputUrl} = options;\n\n    const provider = await FileHandleFile.from(inputUrl);\n\n    let localHeader = await parseZipLocalFileHeader(0n, provider);\n    while (localHeader) {\n      await this.writeFile(\n        await this.unGzip({\n          name: this.correctIndexNames(localHeader.fileName),\n          data: await provider.slice(\n            localHeader.fileDataOffset,\n            localHeader.fileDataOffset + localHeader.compressedSize\n          )\n        }),\n        options.outputPath\n      );\n      localHeader = await parseZipLocalFileHeader(\n        localHeader.fileDataOffset + localHeader?.compressedSize,\n        provider\n      );\n    }\n\n    return 'success';\n  }\n\n  /**\n   * Defines file name and path for i3s format\n   * @param fileName initial file name and path\n   */\n\n  private correctIndexNames(fileName: string): string | null {\n    if (indexNames.includes(path.filename(path.join('/', fileName)))) {\n      return path.join(path.dirname(fileName), 'index.json.gz');\n    }\n    // finds path with name part and extention part\n    let parts = /^(.*\\/[^\\/\\.]*)(\\..+)$/.exec(fileName);\n    if (!parts) {\n      return null;\n    }\n    return `${parts?.at(1)}/index${parts?.at(2)}`;\n  }\n\n  private async unGzip(file: File): Promise<File> {\n    if (/\\.gz$/.test(file.name ?? '')) {\n      const compression = new GZipCompression();\n\n      const decompressedData = await compression.decompress(file.data);\n\n      return {data: decompressedData, name: (file.name ?? '').slice(0, -3)};\n    }\n    return Promise.resolve(file);\n  }\n\n  private async writeFile(options: File, outputPath: string): Promise<void> {\n    if (!options.name) {\n      return;\n    }\n    const finalPath = path.join(outputPath, options.name);\n    const dirName = path.dirname(finalPath);\n    const fileName = path.filename(finalPath);\n    await writeFile(dirName, options.data, fileName);\n  }\n}\n"],"mappings":"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"}

package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-ids-extensions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAE,8BAA8B,EAAC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAO3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAExD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,kBAAkB,EAC/B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,GAAG,IAAI,CAcf;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,8BAA8B,EACzC,MAAM,EAAE,CAAC,sBAAsB,GAAG,IAAI,CAAC,EAAE,EACzC,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,CAyBd"}
+{"version":3,"file":"batch-ids-extensions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAE,8BAA8B,EAAC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAW3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAGhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAExD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,kBAAkB,EAC/B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,GAAG,IAAI,CAcf;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,8BAA8B,EACzC,MAAM,EAAE,CAAC,sBAAsB,GAAG,IAAI,CAAC,EAAE,EACzC,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,CA6Bd"}

package/dist/i3s-converter/helpers/batch-ids-extensions.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBatchIdsExtensions = exports.getTextureByMetadataClass = void 0;
-const constants_1 = require("../../constants");
+const math_1 = require("@loaders.gl/math");
+const gltf_1 = require("@loaders.gl/gltf");
 /**
  * Get featureTexture by metadataClass
  * @param tileContent - 3d tile content
@@ -9,7 +10,7 @@ const constants_1 = require("../../constants");
  * @returns featureTexture key
  */
 function getTextureByMetadataClass(tileContent, metadataClass) {
-    const extFeatureMetadata = tileContent.gltf?.extensions?.[constants_1.EXT_FEATURE_METADATA];
+    const extFeatureMetadata = tileContent.gltf?.extensions?.[gltf_1.EXT_FEATURE_METADATA];
     if (!extFeatureMetadata?.featureTextures) {
         return null;
     }
@@ -37,11 +38,12 @@ function handleBatchIdsExtensions(attributes, primitive, images, featureTexture)
     }
     for (const [extensionName, extensionData] of Object.entries(extensions || {})) {
         switch (extensionName) {
-            case constants_1.EXT_FEATURE_METADATA:
+            case gltf_1.EXT_FEATURE_METADATA:
                 return handleExtFeatureMetadataExtension(attributes, extensionData, images, featureTexture);
-            case constants_1.EXT_MESH_FEATURES:
-                console.warn('EXT_mesh_features extension is not supported yet');
-                return [];
+            case gltf_1.EXT_MESH_FEATURES:
+                return handleExtMeshFeaturesExtension(attributes, extensionData);
+            case gltf_1.EXT_STRUCTURAL_METADATA:
+                return handleExtStructuralMetadataExtension(attributes, extensionData);
             default:
                 return [];
         }
@@ -49,6 +51,33 @@ function handleBatchIdsExtensions(attributes, primitive, images, featureTexture)
     return [];
 }
 exports.handleBatchIdsExtensions = handleBatchIdsExtensions;
+function handleExtStructuralMetadataExtension(attributes, extStructuralMetadata) {
+    // Take only first extension object to get batchIds attribute name.
+    const dataAttributeNames = extStructuralMetadata?.dataAttributeNames;
+    if (dataAttributeNames?.length) {
+        // Let's use the first element of the array
+        // TODO: What to do with others if any?
+        const batchIdsAttribute = attributes[dataAttributeNames[0]];
+        return batchIdsAttribute.value;
+    }
+    return [];
+}
+/**
+ * Getting batchIds from EXT_mesh_features extensions.
+ * @param attributes - gltf accessors
+ * @param extMeshFeatures - EXT_mesh_features extension
+ * @returns an array of attribute values
+ */
+function handleExtMeshFeaturesExtension(attributes, extMeshFeatures) {
+    const dataAttributeNames = extMeshFeatures?.dataAttributeNames;
+    if (dataAttributeNames?.length) {
+        // Let's use the first element of the array
+        // TODO: What to do with others if any?
+        const batchIdsAttribute = attributes[dataAttributeNames[0]];
+        return batchIdsAttribute.value;
+    }
+    return [];
+}
 /**
  * Get batchIds from EXT_feature_metadata extension.
  * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata
@@ -136,8 +165,8 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
         for (let index = 0; index < textureCoordinates.length; index += 2) {
             const u = textureCoordinates[index];
             const v = textureCoordinates[index + 1];
-            const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);
-            const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);
+            const tx = Math.min(((0, math_1.emod)(u) * image.width) | 0, image.width - 1);
+            const ty = Math.min(((0, math_1.emod)(v) * image.height) | 0, image.height - 1);
             const offset = (ty * image.width + tx) * image.components + channels;
             const batchId = new Uint8Array(image.data)[offset];
             batchIds.push(batchId);
@@ -148,11 +177,3 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
     }
     return batchIds;
 }
-/**
- * Handle UVs if they are out of range [0,1].
- * @param n
- * @param m
- */
-function emod(n) {
-    return ((n % 1) + 1) % 1;
-}

package/dist/i3s-converter/helpers/feature-attributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,KAAK,EAEL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAkBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT;AAUD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAUvE;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,SAAS,GACvB,oBAAoB,CA0BtB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,GAAG,SAAS,CAazE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,GAAG,KAAK,CAMtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,gBAAgB,GAAG,SAAS,CA8B1E"}
+{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,KAAK,EAEL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAoBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT;AAUD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAUvE;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,SAAS,GACvB,oBAAoB,CA0BtB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,GAAG,SAAS,CAazE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,GAAG,KAAK,CAMtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,gBAAgB,GAAG,SAAS,CA8B1E"}

package/dist/i3s-converter/helpers/feature-attributes.js

@@ -30,9 +30,11 @@ exports.flattenPropertyTableByFeatureIds = flattenPropertyTableByFeatureIds;
  */
 function getPropertiesByFeatureIds(properties, featureIds) {
     const resultProperties = [];
-    for (const featureId of featureIds) {
-        const property = properties[featureId] || null;
-        resultProperties.push(property);
+    if (properties) {
+        for (const featureId of featureIds) {
+            const property = properties[featureId] || null;
+            resultProperties.push(property);
+        }
     }
     return resultProperties;
 }
@@ -46,7 +48,7 @@ function getPropertiesByFeatureIds(properties, featureIds) {
 function checkPropertiesLength(featureIds, propertyTable) {
     let needFlatten = false;
     for (const attribute of Object.values(propertyTable)) {
-        if (featureIds.length !== attribute.length) {
+        if (!featureIds || !attribute || featureIds.length !== attribute.length) {
             needFlatten = true;
         }
     }

package/dist/i3s-converter/helpers/geometry-converter.d.ts

@@ -39,8 +39,8 @@ export declare function convertAttributes(attributesData: GLTFAttributesData, ma
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
  * @param tileContent - 3DTiles tile content
- * @param metadataClass - - user selected feature metadata class name
- * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
+ * @param metadataClass - user selected feature metadata class name
+ * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA, EXT_MESH_FEATURES or EXT_STRUCTURAL_METADATA
  */
 export declare function getPropertyTable(tileContent: Tiles3DTileContent | null, metadataClass?: string): FeatureTableJson | null;
 //# sourceMappingURL=geometry-converter.d.ts.map

package/dist/i3s-converter/helpers/geometry-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAW/E,OAAO,EAAU,OAAO,EAAU,MAAM,eAAe,CAAC;AAUxD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAWrC,OAAO,KAAK,EAAC,kBAAkB,EAAgD,MAAM,UAAU,CAAC;AAEhG,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAwBrE;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,mBAAmB,GAAG,cAAc,EACxD,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAgEzC;AA6ID;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,EAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAkD3C;AAirCD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,kBAAkB,GAAG,IAAI,EACtC,aAAa,CAAC,EAAE,MAAM,GACrB,gBAAgB,GAAG,IAAI,CA2BzB"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAa/E,OAAO,EAAU,OAAO,EAAU,MAAM,eAAe,CAAC;AAUxD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAWrC,OAAO,KAAK,EAAC,kBAAkB,EAAgD,MAAM,UAAU,CAAC;AAEhG,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAyBrE;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,mBAAmB,GAAG,cAAc,EACxD,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAgEzC;AA6ID;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,EAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAkD3C;AAisCD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,kBAAkB,GAAG,IAAI,EACtC,aAAa,CAAC,EAAE,MAAM,GACrB,gBAAgB,GAAG,IAAI,CAsCzB"}

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

@@ -41,7 +41,7 @@ const batch_ids_extensions_1 = require("./batch-ids-extensions");
 const feature_attributes_1 = require("./feature-attributes");
 const math_1 = require("@loaders.gl/math");
 const geometry_utils_1 = require("../../lib/utils/geometry-utils");
-const constants_1 = require("../../constants");
+const gltf_1 = require("@loaders.gl/gltf");
 // Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/pbrMetallicRoughness.cmn.md
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
@@ -980,9 +980,11 @@ function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attri
     };
     for (const propertyName in propertyTableWithObjectIds) {
         const type = getAttributeType(propertyName, attributeStorageInfo);
-        const value = propertyTableWithObjectIds[propertyName];
-        const attributeBuffer = generateAttributeBuffer(type, value);
-        attributeBuffers.push(attributeBuffer);
+        if (type) {
+            const value = propertyTableWithObjectIds[propertyName];
+            const attributeBuffer = generateAttributeBuffer(type, value);
+            attributeBuffers.push(attributeBuffer);
+        }
     }
     return attributeBuffers;
 }
@@ -1017,6 +1019,14 @@ function generateAttributeBuffer(type, value) {
  */
 function getAttributeType(key, attributeStorageInfo) {
     const attribute = attributeStorageInfo.find((attr) => attr.name === key);
+    if (!attribute) {
+        console.error(`attribute is null, key=${key}, attributeStorageInfo=${JSON.stringify(attributeStorageInfo, null, 2)}`);
+        return '';
+    }
+    if (!attribute.attributeValues) {
+        console.error(`attributeValues is null, attribute=${attribute}`);
+        return '';
+    }
     return attribute.attributeValues.valueType;
 }
 /**
@@ -1148,25 +1158,31 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
  * @param tileContent - 3DTiles tile content
- * @param metadataClass - - user selected feature metadata class name
- * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
+ * @param metadataClass - user selected feature metadata class name
+ * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA, EXT_MESH_FEATURES or EXT_STRUCTURAL_METADATA
  */
 function getPropertyTable(tileContent, metadataClass) {
     if (!tileContent) {
         return null;
     }
+    let propertyTable;
     const batchTableJson = tileContent?.batchTableJson;
     if (batchTableJson) {
         return batchTableJson;
     }
     const { extensionName, extension } = getPropertyTableExtension(tileContent);
     switch (extensionName) {
-        case constants_1.EXT_MESH_FEATURES: {
-            console.warn('The I3S converter does not yet support the EXT_mesh_features extension');
-            return null;
+        case gltf_1.EXT_MESH_FEATURES: {
+            propertyTable = getPropertyTableFromExtMeshFeatures(extension, metadataClass);
+            return propertyTable;
         }
-        case constants_1.EXT_FEATURE_METADATA: {
-            return getPropertyTableFromExtFeatureMetadata(extension, metadataClass);
+        case gltf_1.EXT_STRUCTURAL_METADATA: {
+            propertyTable = getPropertyTableFromExtStructuralMetadata(extension, metadataClass);
+            return propertyTable;
+        }
+        case gltf_1.EXT_FEATURE_METADATA: {
+            propertyTable = getPropertyTableFromExtFeatureMetadata(extension, metadataClass);
+            return propertyTable;
         }
         default:
             return null;
@@ -1178,7 +1194,11 @@ exports.getPropertyTable = getPropertyTable;
  * @param tileContent - 3DTiles tile content
  */
 function getPropertyTableExtension(tileContent) {
-    const extensionsWithPropertyTables = [constants_1.EXT_FEATURE_METADATA, constants_1.EXT_MESH_FEATURES];
+    const extensionsWithPropertyTables = [
+        gltf_1.EXT_FEATURE_METADATA,
+        gltf_1.EXT_STRUCTURAL_METADATA,
+        gltf_1.EXT_MESH_FEATURES
+    ];
     const extensionsUsed = tileContent?.gltf?.extensionsUsed;
     if (!extensionsUsed) {
         return { extensionName: null, extension: null };
@@ -1199,6 +1219,8 @@ function getPropertyTableExtension(tileContent) {
 /**
  * Handle EXT_feature_metadata to get property table
  * @param extension - global level of EXT_FEATURE_METADATA extension
+ * @param metadataClass - user selected feature metadata class name
+ * @returns {FeatureTableJson | null} Property table or null if the extension can't be handled properly.
  */
 function getPropertyTableFromExtFeatureMetadata(extension, metadataClass) {
     if (extension?.featureTables) {
@@ -1238,3 +1260,62 @@ function getPropertyTableFromExtFeatureMetadata(extension, metadataClass) {
     console.warn("The I3S converter couldn't handle EXT_feature_metadata extension: There is neither featureTables, no featureTextures in the extension.");
     return null;
 }
+/**
+ * Handle EXT_structural_metadata to get property table
+ * @param extension - global level of EXT_STRUCTURAL_METADATA extension
+ * @param metadataClass - user selected feature metadata class name
+ * @returns {FeatureTableJson | null} Property table or null if the extension can't be handled properly.
+ */
+function getPropertyTableFromExtStructuralMetadata(extension, metadataClass) {
+    if (extension?.propertyTables) {
+        /**
+         * Take only first feature table to generate attributes storage info object.
+         * TODO: Think about getting data from all feature tables?
+         * It can be tricky just because 3dTiles is able to have multiple featureId attributes and multiple feature tables.
+         * In I3S we should decide which featureIds attribute will be passed to geometry data.
+         */
+        const firstPropertyTable = extension?.propertyTables[0];
+        const propertyTableWithData = {};
+        for (const propertyName in firstPropertyTable.properties) {
+            propertyTableWithData[propertyName] = firstPropertyTable.properties[propertyName].data;
+        }
+        return propertyTableWithData;
+    }
+    if (extension?.propertyTextures) {
+        /**
+         * Take only first feature table to generate attributes storage info object.
+         * TODO: Think about getting data from all feature tables?
+         * It can be tricky just because 3dTiles is able to have multiple featureId attributes and multiple feature tables.
+         * In I3S we should decide which featureIds attribute will be passed to geometry data.
+         */
+        if (extension?.propertyTextures) {
+            const firstPropertyTexture = extension?.propertyTextures[0];
+            const propertyTableWithData = {};
+            for (const propertyName in firstPropertyTexture.properties) {
+                propertyTableWithData[propertyName] = firstPropertyTexture.properties[propertyName].data;
+            }
+            return propertyTableWithData;
+        }
+    }
+    console.warn("The I3S converter couldn't handle EXT_structural_metadata extension: There is neither propertyTables, no propertyTextures in the extension.");
+    return null;
+}
+/**
+ * Handle EXT_mesh_features to get property table
+ * @param extension - global level of EXT_MESH_FEATURES extension
+ * @param metadataClass - user selected feature metadata class name
+ * @returns {FeatureTableJson | null} Property table or null if the extension can't be handled properly.
+ */
+function getPropertyTableFromExtMeshFeatures(extension, metadataClass) {
+    if (extension?.featureIds) {
+        const firstFeatureId = extension?.featureIds[0];
+        const propertyTableWithData = {};
+        // When firstFeatureId.propertyTable is defined, the property data will be taken from EXT_structural_metadata extension
+        if (!firstFeatureId.propertyTable) {
+            console.warn('Should be implemented as we have the tileset with Ext_mesh_features not linked with EXT_structural_metadata extension');
+        }
+        return propertyTableWithData;
+    }
+    console.warn("The I3S converter couldn't handle EXT_mesh_features extension: There is no featureIds in the extension.");
+    return null;
+}

package/dist/i3s-converter/helpers/node-index-document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-index-document.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-index-document.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAIzB,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,cAAc;IACP,EAAE,EAAE,MAAM,CAAC;IAClB,uBAAuB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACxB,+BAA+B;IACxB,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAC/C,eAAe;IACR,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IAC1C,yBAAyB;IACzB,OAAO,CAAC,SAAS,CAAe;IAEhC;;;OAGG;IACH,OAAO,CAAC,UAAU,CAAkB;IACpC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;OAIG;gBACS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY;IAM/C;;;;OAIG;IACU,OAAO,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAS3E;;;OAGG;IACU,WAAW,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxE;;OAEG;IACU,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C,+CAA+C;IAClC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC,wBAAwB;IACxB,OAAO,CAAC,QAAQ;IAOhB;;;OAGG;YACW,KAAK;IAyBnB;;;OAGG;YACW,IAAI;IAalB;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;;;;OAKG;WACU,cAAc,CACzB,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAM7B;;;;;;;;;OASG;WACU,UAAU,CACrB,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAY7B;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,eAAe,EAAE,eAAe,GAAG,mBAAmB;IAqBzF;;;;;;;;;;OAUG;WACU,uBAAuB,CAClC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,mBAAmB,CAAC;CA4ChC"}
+{"version":3,"file":"node-index-document.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-index-document.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAIzB,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,cAAc;IACP,EAAE,EAAE,MAAM,CAAC;IAClB,uBAAuB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACxB,+BAA+B;IACxB,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAC/C,eAAe;IACR,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IAC1C,yBAAyB;IACzB,OAAO,CAAC,SAAS,CAAe;IAEhC;;;OAGG;IACH,OAAO,CAAC,UAAU,CAAkB;IACpC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;OAIG;gBACS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY;IAM/C;;;;OAIG;IACU,OAAO,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAS3E;;;OAGG;IACU,WAAW,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxE;;OAEG;IACU,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C,+CAA+C;IAClC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC,wBAAwB;IACxB,OAAO,CAAC,QAAQ;IAOhB;;;OAGG;YACW,KAAK;IAyBnB;;;OAGG;YACW,IAAI;IAalB;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;;;;OAKG;WACU,cAAc,CACzB,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAM7B;;;;;;;;;OASG;WACU,UAAU,CACrB,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAY7B;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,eAAe,EAAE,eAAe,GAAG,mBAAmB;IAqBzF;;;;;;;;;;OAUG;WACU,uBAAuB,CAClC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,mBAAmB,CAAC;CAgDhC"}

package/dist/i3s-converter/helpers/node-index-document.js

@@ -256,7 +256,10 @@ class NodeIndexDocument {
                 attributes.length &&
                 parentNode.converter.layers0?.attributeStorageInfo?.length) {
                 node.attributeData = [];
-                for (let index = 0; index < attributes.length; index++) {
+                const minimumLength = attributes.length < parentNode.converter.layers0.attributeStorageInfo.length
+                    ? attributes.length
+                    : parentNode.converter.layers0.attributeStorageInfo.length;
+                for (let index = 0; index < minimumLength; index++) {
                     const folderName = parentNode.converter.layers0.attributeStorageInfo[index].key;
                     node.attributeData.push({ href: `./attributes/${folderName}/0` });
                 }

package/dist/i3s-converter/helpers/preprocess-3d-tiles.js

@@ -4,7 +4,7 @@ exports.mergePreprocessData = exports.analyzeTileContent = exports.GLTF_PRIMITIV
 const types_1 = require("../types");
 const gltf_1 = require("@loaders.gl/gltf");
 const core_1 = require("@loaders.gl/core");
-const constants_1 = require("../../constants");
+const gltf_2 = require("@loaders.gl/gltf");
 /**
  * glTF primitive modes
  * @see https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode
@@ -72,7 +72,7 @@ const getMeshTypesFromGltf = (gltfJson) => {
  */
 const getMetadataClassesFromGltf = (gltfJson) => {
     const result = new Set();
-    const classes = gltfJson.extensions?.[constants_1.EXT_FEATURE_METADATA]
+    const classes = gltfJson.extensions?.[gltf_2.EXT_FEATURE_METADATA]
         ?.schema?.classes;
     if (classes) {
         for (const classKey of Object.keys(classes)) {

package/dist/i3s-converter/i3s-converter.d.ts

@@ -147,7 +147,7 @@ export default 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
      */
     private _convertResources;

package/dist/i3s-converter/i3s-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}

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

@@ -481,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);
@@ -533,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) {
@@ -780,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) {
@@ -857,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({