@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.2

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

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,7 +34,7 @@ const node_pages_1 = __importDefault(require("./helpers/node-pages"));
 const file_utils_1 = require("../lib/utils/file-utils");
 const compress_util_1 = require("../lib/utils/compress-util");
 const statistic_utills_1 = require("../lib/utils/statistic-utills");
-const geometry_converter_1 = __importDefault(require("./helpers/geometry-converter"));
+const geometry_converter_1 = __importStar(require("./helpers/geometry-converter"));
 const coordinate_converter_1 = require("./helpers/coordinate-converter");
 const create_scene_server_path_1 = require("./helpers/create-scene-server-path");
 const lod_conversion_utils_1 = require("../lib/utils/lod-conversion-utils");
@@ -240,13 +259,13 @@ class I3SConverter {
             const [child] = await this._createNode(root0, sourceRootTile, parentId, 0);
             const childPath = (0, path_1.join)(this.layers0Path, 'nodes', child.path);
             if (this.options.slpk) {
-                this.writeQueue.enqueue({
+                await this.writeQueue.enqueue({
                     archiveKey: 'nodes/1/3dNodeIndexDocument.json.gz',
                     writePromise: (0, file_utils_1.writeFileForSlpk)(childPath, JSON.stringify(child), '3dNodeIndexDocument.json')
                 });
             }
             else {
-                this.writeQueue.enqueue({ writePromise: (0, file_utils_1.writeFile)(childPath, JSON.stringify(child)) });
+                await this.writeQueue.enqueue({ writePromise: (0, file_utils_1.writeFile)(childPath, JSON.stringify(child)) });
             }
         }
         else {
@@ -264,13 +283,13 @@ class I3SConverter {
      */
     async _writeLayers0() {
         if (this.options.slpk) {
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 archiveKey: '3dSceneLayer.json.gz',
                 writePromise: (0, file_utils_1.writeFileForSlpk)(this.layers0Path, JSON.stringify(this.layers0), '3dSceneLayer.json')
             });
         }
         else {
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 writePromise: (0, file_utils_1.writeFile)(this.layers0Path, JSON.stringify(this.layers0))
             });
         }
@@ -280,13 +299,13 @@ class I3SConverter {
      */
     async _writeNodeIndexDocument(root0, nodePath, rootPath) {
         if (this.options.slpk) {
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 archiveKey: `nodes/${nodePath}/3dNodeIndexDocument.json.gz`,
                 writePromise: (0, file_utils_1.writeFileForSlpk)(rootPath, JSON.stringify(root0), '3dNodeIndexDocument.json')
             });
         }
         else {
-            this.writeQueue.enqueue({ writePromise: (0, file_utils_1.writeFile)(rootPath, JSON.stringify(root0)) });
+            await this.writeQueue.enqueue({ writePromise: (0, file_utils_1.writeFile)(rootPath, JSON.stringify(root0)) });
         }
     }
     /**
@@ -426,11 +445,11 @@ class I3SConverter {
         await this._updateTilesetOptions();
         await this.sourceTileset._loadTile(sourceTile);
         let boundingVolumes = (0, coordinate_converter_1.createBoundingVolumes)(sourceTile, this.geoidHeightModel);
-        const batchTable = sourceTile?.content?.batchTableJson;
-        if (batchTable) {
-            this._convertAttributeStorageInfo(sourceTile.content);
+        const propertyTable = (0, geometry_converter_1.getPropertyTable)(sourceTile);
+        if (propertyTable && !this.layers0?.attributeStorageInfo?.length) {
+            this._convertPropertyTableToNodeAttributes(propertyTable);
         }
-        const resourcesData = await this._convertResources(sourceTile);
+        const resourcesData = await this._convertResources(sourceTile, propertyTable);
         const nodes = [];
         const nodesInPage = [];
         const emptyResources = {
@@ -474,19 +493,6 @@ class I3SConverter {
         });
         return nodes;
     }
-    /**
-     * Convert attributesStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
-     * from B3DM batch table
-     * @param sourceTileContent - tile content of 3DTile
-     * @return {void}
-     */
-    _convertAttributeStorageInfo(sourceTileContent) {
-        // In legacy b3dm files sometimes sourceTileContent is null.
-        const batchTable = sourceTileContent && sourceTileContent.batchTableJson;
-        if (batchTable && !this.layers0?.attributeStorageInfo?.length) {
-            this._convertBatchTableInfoToNodeAttributes(batchTable);
-        }
-    }
     /**
      * Convert tile to one or more I3S nodes
      * @param sourceTile - source tile (3DTile)
@@ -499,11 +505,11 @@ class I3SConverter {
      * result.attributes - feature attributes
      * result.featureCount - number of features
      */
-    async _convertResources(sourceTile) {
+    async _convertResources(sourceTile, propertyTable) {
         if (!this.isContentSupported(sourceTile)) {
             return null;
         }
-        const resourcesData = await (0, geometry_converter_1.default)(sourceTile.content, Number(this.nodePages.nodesCounter), this.featuresHashArray, this.layers0?.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
+        const resourcesData = await (0, geometry_converter_1.default)(sourceTile.content, Number(this.nodePages.nodesCounter), propertyTable, this.featuresHashArray, this.layers0?.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
         return resourcesData;
     }
     /**
@@ -636,28 +642,28 @@ class I3SConverter {
     async _writeGeometries(geometryBuffer, compressedGeometry, childPath, slpkChildPath) {
         if (this.options.slpk) {
             const slpkGeometryPath = (0, path_1.join)(childPath, 'geometries');
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 archiveKey: `${slpkChildPath}/geometries/0.bin.gz`,
                 writePromise: (0, file_utils_1.writeFileForSlpk)(slpkGeometryPath, geometryBuffer, '0.bin')
             });
         }
         else {
             const geometryPath = (0, path_1.join)(childPath, 'geometries/0/');
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 writePromise: (0, file_utils_1.writeFile)(geometryPath, geometryBuffer, 'index.bin')
             });
         }
         if (this.options.draco) {
             if (this.options.slpk) {
                 const slpkCompressedGeometryPath = (0, path_1.join)(childPath, 'geometries');
-                this.writeQueue.enqueue({
+                await this.writeQueue.enqueue({
                     archiveKey: `${slpkChildPath}/geometries/1.bin.gz`,
                     writePromise: (0, file_utils_1.writeFileForSlpk)(slpkCompressedGeometryPath, compressedGeometry, '1.bin')
                 });
             }
             else {
                 const compressedGeometryPath = (0, path_1.join)(childPath, 'geometries/1/');
-                this.writeQueue.enqueue({
+                await this.writeQueue.enqueue({
                     writePromise: (0, file_utils_1.writeFile)(compressedGeometryPath, compressedGeometry, 'index.bin')
                 });
             }
@@ -679,14 +685,14 @@ class I3SConverter {
         const sharedDataStr = JSON.stringify(sharedData);
         if (this.options.slpk) {
             const slpkSharedPath = (0, path_1.join)(childPath, 'shared');
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 archiveKey: `${slpkChildPath}/shared/sharedResource.json.gz`,
                 writePromise: (0, file_utils_1.writeFileForSlpk)(slpkSharedPath, sharedDataStr, 'sharedResource.json')
             });
         }
         else {
             const sharedPath = (0, path_1.join)(childPath, 'shared/');
-            this.writeQueue.enqueue({ writePromise: (0, file_utils_1.writeFile)(sharedPath, sharedDataStr) });
+            await this.writeQueue.enqueue({ writePromise: (0, file_utils_1.writeFile)(sharedPath, sharedDataStr) });
         }
     }
     /**
@@ -747,14 +753,14 @@ class I3SConverter {
         if (this.options.slpk) {
             const slpkTexturePath = (0, path_1.join)(childPath, 'textures');
             const compress = false;
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 archiveKey: `${slpkChildPath}/textures/${name}.${format}`,
                 writePromise: (0, file_utils_1.writeFileForSlpk)(slpkTexturePath, textureData, `${name}.${format}`, compress)
             });
         }
         else {
             const texturePath = (0, path_1.join)(childPath, `textures/${name}/`);
-            this.writeQueue.enqueue({
+            await this.writeQueue.enqueue({
                 writePromise: (0, file_utils_1.writeFile)(texturePath, textureData, `index.${format}`)
             });
         }
@@ -772,14 +778,14 @@ class I3SConverter {
                 const fileBuffer = new Uint8Array(attributes[index]);
                 if (this.options.slpk) {
                     const slpkAttributesPath = (0, path_1.join)(childPath, 'attributes', folderName);
-                    this.writeQueue.enqueue({
+                    await this.writeQueue.enqueue({
                         archiveKey: `${slpkChildPath}/attributes/${folderName}.bin.gz`,
                         writePromise: (0, file_utils_1.writeFileForSlpk)(slpkAttributesPath, fileBuffer, '0.bin')
                     });
                 }
                 else {
                     const attributesPath = (0, path_1.join)(childPath, `attributes/${folderName}/0`);
-                    this.writeQueue.enqueue({
+                    await this.writeQueue.enqueue({
                         writePromise: (0, file_utils_1.writeFile)(attributesPath, fileBuffer, 'index.bin')
                     });
                 }
@@ -819,7 +825,7 @@ class I3SConverter {
     /**
      * Generate storage attribute for map segmentation.
      * @param attributeIndex - order index of attribute (f_0, f_1 ...).
-     * @param key - attribute key from batch table.\
+     * @param key - attribute key from propertyTable.
      * @param attributeType - attribute type.
      * @return Updated storageAttribute.
      */
@@ -851,7 +857,7 @@ class I3SConverter {
     /**
      * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
      * @param key - attribute's key
-     * @param attribute - attribute's type in batchTable
+     * @param attribute - attribute's type in propertyTable
      */
     getAttributeType(key, attribute) {
         if (key === OBJECT_ID_TYPE) {
@@ -915,22 +921,22 @@ class I3SConverter {
         };
     }
     /**
-     * Do conversion of 3DTiles batch table to I3s node attributes.
-     * @param batchTable - Table with layer meta data.
+     * Do conversion of 3DTiles property table to I3s node attributes.
+     * @param propertyTable - Table with layer meta data.
      */
-    _convertBatchTableInfoToNodeAttributes(batchTable) {
+    _convertPropertyTableToNodeAttributes(propertyTable) {
         let attributeIndex = 0;
-        const batchTableWithObjectId = {
+        const propertyTableWithObjectId = {
             OBJECTID: [0],
-            ...batchTable
+            ...propertyTable
         };
-        for (const key in batchTableWithObjectId) {
-            const firstAttribute = batchTableWithObjectId[key][0];
+        for (const key in propertyTableWithObjectId) {
+            const firstAttribute = propertyTableWithObjectId[key][0];
             const attributeType = this.getAttributeType(key, firstAttribute);
             const storageAttribute = this._createdStorageAttribute(attributeIndex, key, attributeType);
             const fieldAttributeType = this._getFieldAttributeType(attributeType);
             const fieldAttribute = this._createFieldAttribute(key, fieldAttributeType);
-            const popupInfo = this._createPopupInfo(batchTableWithObjectId);
+            const popupInfo = this._createPopupInfo(propertyTableWithObjectId);
             this.layers0.attributeStorageInfo.push(storageAttribute);
             this.layers0.fields.push(fieldAttribute);
             this.layers0.popupInfo = popupInfo;
@@ -939,7 +945,7 @@ class I3SConverter {
         }
     }
     /**
-     * Find and return attribute type based on key form Batch table.
+     * Find and return attribute type based on key form propertyTable.
      * @param attributeType
      */
     _getFieldAttributeType(attributeType) {
@@ -958,16 +964,16 @@ class I3SConverter {
     }
     /**
      * Generate popup info to show metadata on the map.
-     * @param batchTable - Batch table data with OBJECTID.
+     * @param propertyTable - table data with OBJECTID.
      * @return data for correct rendering of popup.
      */
-    _createPopupInfo(batchTable) {
+    _createPopupInfo(propertyTable) {
         const title = '{OBJECTID}';
         const mediaInfos = [];
         const fieldInfos = [];
         const popupElements = [];
         const expressionInfos = [];
-        for (const key in batchTable) {
+        for (const key in propertyTable) {
             fieldInfos.push({
                 fieldName: key,
                 visible: true,

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

@@ -111,52 +111,4 @@ export declare type I3SMaterialWithTexture = {
     /** Texture content (image) */
     texture?: ImageDataType;
 };
-/**
- * 3DTilesNext EXT_feature_metadata extension
- * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata
- */
-export declare type ExtFeatureMetadata = {
-    /** Feature ids definition in attributes */
-    featureIdAttributes?: ExtFeatureMetadataAttribute[];
-    /** Feature ids definition in textures */
-    featureIdTextures?: ExtFeatureMetadataAttribute[];
-};
-/**
- * Attribute which described featureIds definition.
- */
-export declare type ExtFeatureMetadataAttribute = {
-    /** Name of feature table */
-    featureTable: string;
-    /** Described how feature ids are defined */
-    featureIds: ExtFeatureMetadataFeatureIds;
-};
-/**
- * Defining featureIds by attributes or implicitly.
- */
-declare type ExtFeatureMetadataFeatureIds = {
-    /** Name of attribute where featureIds are defined */
-    attribute?: string;
-    /** Sets a constant feature ID for each vertex. The default is 0. */
-    constant?: number;
-    /** Sets the rate at which feature IDs increment.
-     * If divisor is zero then constant is used.
-     * If divisor is greater than zero the feature ID increments once per divisor sets of vertices, starting at constant.
-     * The default is 0
-     */
-    divisor?: number;
-    /** gLTF textureInfo object - https://github.com/CesiumGS/glTF/blob/3d-tiles-next/specification/2.0/schema/textureInfo.schema.json */
-    texture?: ExtFeatureMetadataTexture;
-    /** Must be a single channel ("r", "g", "b", or "a") */
-    channels?: 'r' | 'g' | 'b' | 'a';
-};
-/**
- * Reference to a texture.
- */
-declare type ExtFeatureMetadataTexture = {
-    /** The set index of texture's TEXCOORD attribute used for texture coordinate mapping.*/
-    texCoord: number;
-    /** The index of the texture. */
-    index: number;
-};
-export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,4CAA4C;AAC5C,oBAAY,qBAAqB,GAAG;IAClC;;;OAGG;IACH,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACjD;;OAEG;IACH,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC9C;;OAEG;IACH,YAAY,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC5C;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;OAEG;IACH,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjC;;OAEG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;OAEG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,mBAAmB,GAAG;IAChC,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAClC,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,eAAe,EAAE,IAAI,GAAG,eAAe,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,kBAAkB,GAAG;IAC/B,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,kCAAkC;IAClC,SAAS,EAAE,WAAW,CAAC;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,oBAAY,4BAA4B,GAAG;IACzC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,+CAA+C;AAC/C,oBAAY,qBAAqB,GAAG;IAClC,oHAAoH;IACpH,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACnD,kHAAkH;IAClH,sBAAsB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2EAA2E;AAC3E,oBAAY,sBAAsB,GAAG;IACnC,2GAA2G;IAC3G,QAAQ,EAAE,qBAAqB,CAAC;IAChC,8BAA8B;IAC9B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC"}

package/dist/lib/utils/write-queue.d.ts

@@ -12,6 +12,7 @@ export default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {
     listeningInterval: number;
     writeConcurrency: number;
     constructor(listeningInterval?: number, writeConcurrency?: number);
+    enqueue(val: T): Promise<void>;
     startListening(): void;
     stopListening(): void;
     startWrite(): Promise<void>;

package/dist/lib/utils/write-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-queue.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/write-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAE9B,oBAAY,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAC,CAAiB;IAC7B,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC1C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;gBAEpB,iBAAiB,GAAE,MAAa,EAAE,gBAAgB,GAAE,MAAY;IAM5E,cAAc;IAId,aAAa;IAMP,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAKjB,OAAO;IAmBrB,OAAO,CAAC,aAAa;CAWtB"}
+{"version":3,"file":"write-queue.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/write-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAM9B,oBAAY,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAC,CAAiB;IAC7B,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC1C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;gBAEpB,iBAAiB,GAAE,MAAa,EAAE,gBAAgB,GAAE,MAAY;IAMtE,OAAO,CAAC,GAAG,EAAE,CAAC;IAQpB,cAAc;IAId,aAAa;IAMP,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAKjB,OAAO;IAmBrB,OAAO,CAAC,aAAa;CAWtB"}

package/dist/lib/utils/write-queue.js

@@ -1,6 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const queue_1 = require("./queue");
+const process_1 = __importDefault(require("process"));
+/** Memory limit size is based on testing */
+const MEMORY_LIMIT = 4 * 1024 * 1024 * 1024; // 4GB
 class WriteQueue extends queue_1.Queue {
     constructor(listeningInterval = 2000, writeConcurrency = 400) {
         super();
@@ -9,6 +15,13 @@ class WriteQueue extends queue_1.Queue {
         this.listeningInterval = listeningInterval;
         this.writeConcurrency = writeConcurrency;
     }
+    async enqueue(val) {
+        super.enqueue(val);
+        /** https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */
+        if (process_1.default.memoryUsage().rss > MEMORY_LIMIT) {
+            await this.startWrite();
+        }
+    }
     startListening() {
         this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.0-alpha.1",
+  "version": "3.3.0-alpha.2",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -43,19 +43,19 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.3.0-alpha.1",
-    "@loaders.gl/crypto": "3.3.0-alpha.1",
-    "@loaders.gl/draco": "3.3.0-alpha.1",
-    "@loaders.gl/gltf": "3.3.0-alpha.1",
-    "@loaders.gl/i3s": "3.3.0-alpha.1",
-    "@loaders.gl/images": "3.3.0-alpha.1",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.1",
-    "@loaders.gl/polyfills": "3.3.0-alpha.1",
-    "@loaders.gl/schema": "3.3.0-alpha.1",
-    "@loaders.gl/textures": "3.3.0-alpha.1",
-    "@loaders.gl/tiles": "3.3.0-alpha.1",
-    "@loaders.gl/worker-utils": "3.3.0-alpha.1",
-    "@loaders.gl/zip": "3.3.0-alpha.1",
+    "@loaders.gl/3d-tiles": "3.3.0-alpha.2",
+    "@loaders.gl/crypto": "3.3.0-alpha.2",
+    "@loaders.gl/draco": "3.3.0-alpha.2",
+    "@loaders.gl/gltf": "3.3.0-alpha.2",
+    "@loaders.gl/i3s": "3.3.0-alpha.2",
+    "@loaders.gl/images": "3.3.0-alpha.2",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.2",
+    "@loaders.gl/polyfills": "3.3.0-alpha.2",
+    "@loaders.gl/schema": "3.3.0-alpha.2",
+    "@loaders.gl/textures": "3.3.0-alpha.2",
+    "@loaders.gl/tiles": "3.3.0-alpha.2",
+    "@loaders.gl/worker-utils": "3.3.0-alpha.2",
+    "@loaders.gl/zip": "3.3.0-alpha.2",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -75,5 +75,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "85ed2df7d17dd0d204c8bd8feb44779f70bc693b"
+  "gitHead": "628f1f0eed0f14b50ccff4c561023acf6e0657e6"
 }

package/src/i3s-converter/helpers/batch-ids-extensions.ts

@@ -1,6 +1,9 @@
 import type {GLTFAccessorPostprocessed} from 'modules/gltf/src/lib/types/gltf-types';
 import type {Image, MeshPrimitive} from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';
-import type {ExtFeatureMetadata, ExtFeatureMetadataAttribute} from '../types';
+import type {
+  GLTF_EXT_feature_metadata_attribute,
+  GLTF_EXT_feature_metadata_primitive
+} from 'modules/gltf/src/lib/types/gltf-json-schema';
 
 const EXT_MESH_FEATURES = 'EXT_mesh_features';
 const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
@@ -29,7 +32,7 @@ export function handleBatchIdsExtensions(
       case EXT_FEATURE_METADATA:
         return handleExtFeatureMetadataExtension(
           attributes,
-          extensionData as ExtFeatureMetadata,
+          extensionData as GLTF_EXT_feature_metadata_primitive,
           images
         );
       case EXT_MESH_FEATURES:
@@ -54,7 +57,7 @@ function handleExtFeatureMetadataExtension(
   attributes: {
     [key: string]: GLTFAccessorPostprocessed;
   },
-  extFeatureMetadata: ExtFeatureMetadata,
+  extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,
   images: Image[]
 ): number[] {
   // Take only first extension object to get batchIds attribute name.
@@ -82,10 +85,24 @@ function handleExtFeatureMetadataExtension(
     extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];
 
   if (featureIdTexture) {
-    const textureCoordinates = attributes.TEXCOORD_0.value;
+    const textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;
+    const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;
+    const textureCoordinates = attributes[textCoordAttribute].value;
     return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);
   }
 
+  // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.
+  const featureTexture =
+    extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];
+
+  /**
+   * TODO need to get batchIds from root extension
+   */
+  if (featureTexture) {
+    console.warn("EXT_feature_metadata doesn't yet support featureTextures in primitive");
+    return [];
+  }
+
   return [];
 }
 
@@ -130,7 +147,7 @@ function generateImplicitFeatureIds(
  * @param featureIdTextures
  */
 function generateBatchIdsFromTexture(
-  featureIdTexture: ExtFeatureMetadataAttribute,
+  featureIdTexture: GLTF_EXT_feature_metadata_attribute,
   textureCoordinates: Float32Array,
   images: Image[]
 ) {

package/src/i3s-converter/helpers/feature-attributes.ts

@@ -0,0 +1,65 @@
+import type {FeatureTableJson} from '@loaders.gl/3d-tiles';
+
+/**
+ * Takes attributes from property table based on featureIds.
+ * If there is no property value for particular featureId (index) the property will be null.
+ * Example:
+ * Initial data:
+ *   OBJECTID: [0, 1, 5]
+ *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']
+ * Result:
+ *   OBJECTID: [0, 1, 5]
+ *   component: ['Windows', 'Frames', 'null']
+ * @param featureIds
+ * @param propertyTable
+ */
+export function flattenPropertyTableByFeatureIds(
+  featureIds: number[],
+  propertyTable: FeatureTableJson
+): FeatureTableJson {
+  const resultPropertyTable: FeatureTableJson = {};
+  for (const propertyName in propertyTable) {
+    const properties = propertyTable[propertyName];
+    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);
+  }
+
+  return resultPropertyTable;
+}
+
+/**
+ * Getting properties by featureId index
+ * @param properties
+ * @param featureIds
+ */
+function getPropertiesByFeatureIds(properties: any[], featureIds: number[]): any[] {
+  const resultProperties: any = [];
+
+  for (const featureId of featureIds) {
+    const property = properties[featureId] || null;
+    resultProperties.push(property);
+  }
+
+  return resultProperties;
+}
+
+/**
+ * Check that all attributes in propertyTable have the same length as FeatureIds.
+ * If there are differencies between lengths we should flatten property table based on exiesting featureIds.
+ * @param featureIds
+ * @param propertyTable
+ * @returns
+ */
+export function checkPropertiesLength(
+  featureIds: number[],
+  propertyTable: FeatureTableJson
+): boolean {
+  let needFlatten = false;
+
+  for (const attribute of Object.values(propertyTable)) {
+    if (featureIds.length !== attribute.length) {
+      needFlatten = true;
+    }
+  }
+
+  return needFlatten;
+}

package/src/i3s-converter/helpers/geometry-attributes.ts

@@ -47,7 +47,7 @@ function calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {
 } {
   let rangeIndex = 1;
   let featureIndex = 1;
-  let currentFeatureId = featureIndices[0];
+  let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));
   const faceRangeList: any[] = [];
   const featureIds: any[] = [];
   const uniqueFeatureIds = [currentFeatureId];
@@ -55,20 +55,21 @@ function calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {
   faceRangeList[0] = 0;
   featureIds[0] = currentFeatureId;
 
-  for (let index = 1; index < featureIndices.length; index++) {
-    if (currentFeatureId !== featureIndices[index]) {
+  for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {
+    const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));
+    if (currentFeatureId !== newFeatureId) {
       faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;
       faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;
-      featureIds[featureIndex] = featureIndices[index];
+      featureIds[featureIndex] = newFeatureId;
 
-      if (!uniqueFeatureIds.includes(featureIndices[index])) {
-        uniqueFeatureIds.push(featureIndices[index]);
+      if (!uniqueFeatureIds.includes(newFeatureId)) {
+        uniqueFeatureIds.push(newFeatureId);
       }
 
       rangeIndex += 2;
       featureIndex += 1;
     }
-    currentFeatureId = featureIndices[index];
+    currentFeatureId = newFeatureId;
   }
 
   faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;
@@ -79,6 +80,28 @@ function calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {
   return {faceRange, featureCount, featureIds};
 }
 
+/**
+ * Find most frequent value to avoid situation where one vertex can be part of multiple features (objects).
+ * @param values
+ */
+function getFrequentValue(values: number[]): number {
+  const map: {[key: number]: number} = {};
+
+  let mostFrequentValue = values[0];
+  let maxCount = 1;
+
+  for (const value of values) {
+    // Save item and it's frequency count to the map.
+    map[value] = (map[value] || 0) + 1;
+    // Find max count of frequency.
+    maxCount = maxCount > map[value] ? maxCount : map[value];
+    // Find the most frequent value.
+    mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;
+  }
+
+  return mostFrequentValue;
+}
+
 /**
  * Generate list of attribute object grouped by feature ids.
  * @param  attributes