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

package/dist/3d-tiles-converter/3d-tiles-converter.d.ts

@@ -32,6 +32,14 @@ export default class Tiles3DConverter {
         maxDepth?: number;
         egmFilePath: string;
     }): Promise<any>;
+    /**
+     * Convert particular I3S Node
+     * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
+     * @param parentNode object in resulting tileset
+     * @param level a current level of a tree depth
+     * @param childNodeInfo child node to convert
+     */
+    private convertChildNode;
     /**
      * The recursive function of traversal of a nodes tree
      * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)

package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAkC,MAAM,iBAAiB,CAAC;AAQ3F,OAAO,EAAC,SAAS,EAAS,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAoBrC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,SAAS,GAAG,IAAI,CAAC;IAChC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAClD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;;IAa3C;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,GAAG,CAAC;IA0DhB;;;;;OAKG;YACW,YAAY;IAgE1B;;;;;OAKG;YACW,cAAc;IAyB5B;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;YAiBjB,WAAW;CAS1B"}
+{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAkC,MAAM,iBAAiB,CAAC;AAQ3F,OAAO,EAAC,SAAS,EAAS,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAmBrC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,SAAS,GAAG,IAAI,CAAC;IAChC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAClD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;;IAa3C;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,GAAG,CAAC;IA+DhB;;;;;;OAMG;YACW,gBAAgB;IAsD9B;;;;;OAKG;YACW,YAAY;IAe1B;;;;;OAKG;YACW,cAAc;IAyB5B;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;YAiBjB,WAAW;CAS1B"}

package/dist/3d-tiles-converter/3d-tiles-converter.js

@@ -15,7 +15,6 @@ const lod_conversion_utils_1 = require("../lib/utils/lod-conversion-utils");
 const file_utils_1 = require("../lib/utils/file-utils");
 const statistic_utills_1 = require("../lib/utils/statistic-utills");
 const tileset_1 = require("./json-templates/tileset");
-const b3dm_converter_1 = __importDefault(require("./helpers/b3dm-converter"));
 const coordinate_converter_1 = require("../i3s-converter/helpers/coordinate-converter");
 const _3d_tiles_attributes_worker_1 = require("../3d-tiles-attributes-worker");
 const worker_utils_1 = require("@loaders.gl/worker-utils");
@@ -60,6 +59,11 @@ class Tiles3DConverter {
         const sourceTilesetJson = await (0, core_1.load)(inputUrl, i3s_1.I3SLoader, {});
         this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, {
             loadOptions: {
+                _nodeWorkers: true,
+                reuseWorkers: true,
+                'i3s-content-nodejs': {
+                    workerUrl: './modules/i3s/dist/i3s-content-nodejs-worker.js'
+                },
                 i3s: { coordinateSystem: i3s_1.COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false }
             }
         });
@@ -92,6 +96,55 @@ class Tiles3DConverter {
         const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
         workerFarm.destroy();
     }
+    /**
+     * Convert particular I3S Node
+     * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
+     * @param parentNode object in resulting tileset
+     * @param level a current level of a tree depth
+     * @param childNodeInfo child node to convert
+     */
+    async convertChildNode(parentSourceNode, parentNode, level, childNodeInfo) {
+        const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
+        parentSourceNode.children.push(sourceChild);
+        if (sourceChild.contentUrl) {
+            await this.sourceTileset._loadTile(sourceChild);
+            this.vertexCounter += sourceChild.content.vertexCount;
+            let featureAttributes = null;
+            if (this.attributeStorageInfo) {
+                featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
+            }
+            if (!sourceChild.header.obb) {
+                sourceChild.header.obb = (0, coordinate_converter_1.createObbFromMbs)(sourceChild.header.mbs);
+            }
+            const boundingVolume = {
+                box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(sourceChild.header.obb, this.geoidHeightModel)
+            };
+            const child = {
+                boundingVolume,
+                geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(sourceChild),
+                children: []
+            };
+            const i3sAttributesData = {
+                tileContent: sourceChild.content,
+                textureFormat: sourceChild?.header?.textureFormat
+            };
+            const b3dm = await (0, _3d_tiles_attributes_worker_1.transform3DTilesAttributesOnWorker)(i3sAttributesData, {
+                source: this.workerSource.tile3dWorkerSource,
+                featureAttributes
+            });
+            child.content = {
+                uri: `${sourceChild.id}.b3dm`,
+                boundingVolume
+            };
+            await (0, file_utils_1.writeFile)(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
+            parentNode.children.push(child);
+            sourceChild.unloadContent();
+            await this._addChildren(sourceChild, child, level + 1);
+        }
+        else {
+            await this._addChildren(sourceChild, parentNode, level + 1);
+        }
+    }
     /**
      * The recursive function of traversal of a nodes tree
      * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
@@ -102,50 +155,11 @@ class Tiles3DConverter {
         if (this.options.maxDepth && level > this.options.maxDepth) {
             return;
         }
+        const promises = [];
         for (const childNodeInfo of parentSourceNode.header.children || []) {
-            const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
-            parentSourceNode.children.push(sourceChild);
-            if (sourceChild.contentUrl) {
-                await this.sourceTileset._loadTile(sourceChild);
-                this.vertexCounter += sourceChild.content.vertexCount;
-                let featureAttributes = null;
-                if (this.attributeStorageInfo) {
-                    featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
-                }
-                if (!sourceChild.header.obb) {
-                    sourceChild.header.obb = (0, coordinate_converter_1.createObbFromMbs)(sourceChild.header.mbs);
-                }
-                const boundingVolume = {
-                    box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(sourceChild.header.obb, this.geoidHeightModel)
-                };
-                const child = {
-                    boundingVolume,
-                    geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(sourceChild),
-                    children: []
-                };
-                const i3sAttributesData = {
-                    tileContent: sourceChild.content,
-                    textureFormat: sourceChild?.header?.textureFormat
-                };
-                // TODO Uncomment when 3d-tiles-attributes-worker will be published on CDN.
-                // const b3dm = await transform3DTilesAttributesOnWorker(i3sAttributesData, {
-                //   source: this.workerSource.tile3dWorkerSource,
-                //   featureAttributes
-                // });
-                const b3dm = await new b3dm_converter_1.default().convert(i3sAttributesData, featureAttributes);
-                child.content = {
-                    uri: `${sourceChild.id}.b3dm`,
-                    boundingVolume
-                };
-                await (0, file_utils_1.writeFile)(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
-                parentNode.children.push(child);
-                sourceChild.unloadContent();
-                await this._addChildren(sourceChild, child, level + 1);
-            }
-            else {
-                await this._addChildren(sourceChild, parentNode, level + 1);
-            }
+            promises.push(this.convertChildNode(parentSourceNode, parentNode, level, childNodeInfo));
         }
+        await Promise.all(promises);
     }
     /**
      * Load a child node having information from the node header

package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts

@@ -17,7 +17,7 @@ export default class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer>;
+    buildGltf(i3sAttributesData: I3SAttributesData, featureAttributes: any): Promise<ArrayBuffer>;
     /**
      * Update gltfBuilder with texture from I3S tile
      * @param {object} i3sTile - Tile3D object
@@ -44,11 +44,11 @@ export default class B3dmConverter {
      */
     _generateTransformMatrix(cartesianOrigin: any): Matrix4;
     /**
-     * Generate batchId attribute from faceRanges.
-     * @param {Uint32Array} faceRanges - the source array
-     * @returns {Float32Array} batchId list.
+     * Create _BATCHID attribute
+     * @param {Object} i3sContent - the source object
+     * @returns {void}
      */
-    _generateBatchId(faceRanges: any): Float32Array;
+    _createBatchIds(i3sContent: any, featureAttributes: any): void;
     /**
      * luma.gl can not work without indices now:
      * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115

package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAO/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IAuD3E;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,KAAA;IAiB3B;;;;;;OAMG;IACH,wBAAwB,CAAC,WAAW,KAAA;IAQpC;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}
+{"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAO/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CACb,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,GAAG,GACrB,OAAO,CAAC,WAAW,CAAC;IAwDvB;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,eAAe,CAAC,UAAU,KAAA,EAAE,iBAAiB,KAAA;IAoB7C;;;;;;OAMG;IACH,wBAAwB,CAAC,WAAW,KAAA;IAQpC;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}

package/dist/3d-tiles-converter/helpers/b3dm-converter.js

@@ -18,7 +18,7 @@ class B3dmConverter {
      * @returns - encoded content
      */
     async convert(i3sAttributesData, featureAttributes = null) {
-        const gltf = await this.buildGltf(i3sAttributesData);
+        const gltf = await this.buildGltf(i3sAttributesData, featureAttributes);
         const b3dm = (0, core_1.encodeSync)({
             gltfEncoded: new Uint8Array(gltf),
             type: 'b3dm',
@@ -32,7 +32,7 @@ class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    async buildGltf(i3sAttributesData) {
+    async buildGltf(i3sAttributesData, featureAttributes) {
         const { tileContent, textureFormat } = i3sAttributesData;
         const { material, attributes, indices: originalIndices, cartesianOrigin, cartographicOrigin, modelMatrix } = tileContent;
         const gltfBuilder = new gltf_1.GLTFScenegraph();
@@ -45,6 +45,7 @@ class B3dmConverter {
             attributes.texCoords.value = (0, texture_atlas_1.convertTextureAtlas)(attributes.texCoords.value, attributes.uvRegions.value);
         }
         attributes.positions.value = this._normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix);
+        this._createBatchIds(tileContent, featureAttributes);
         if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
             delete attributes.normals;
         }
@@ -123,23 +124,26 @@ class B3dmConverter {
         return result;
     }
     /**
-     * Generate batchId attribute from faceRanges.
-     * @param {Uint32Array} faceRanges - the source array
-     * @returns {Float32Array} batchId list.
+     * Create _BATCHID attribute
+     * @param {Object} i3sContent - the source object
+     * @returns {void}
      */
-    _generateBatchId(faceRanges) {
-        const batchIdArraySize = (faceRanges[faceRanges.length - 1] + 1) * 3;
-        const batchId = new Float32Array(batchIdArraySize);
-        let rangeIndex = 0;
-        let currentBatchId = 0;
-        for (let index = 0; index < faceRanges.length / 2; index++) {
-            const fromIndex = faceRanges[rangeIndex] * 3;
-            const untilPosition = (faceRanges[rangeIndex + 1] + 1) * 3;
-            batchId.fill(currentBatchId, fromIndex, untilPosition);
-            rangeIndex += 2;
-            currentBatchId += 1;
+    _createBatchIds(i3sContent, featureAttributes) {
+        const { featureIds } = i3sContent;
+        const { OBJECTID: objectIds } = featureAttributes || {};
+        if (!featureIds || !objectIds) {
+            return;
+        }
+        for (let i = 0; i < featureIds.length; i++) {
+            const featureId = featureIds[i];
+            const batchId = objectIds.indexOf(featureId);
+            featureIds[i] = batchId;
         }
-        return batchId;
+        i3sContent.attributes._BATCHID = {
+            size: 1,
+            byteOffset: 0,
+            value: featureIds
+        };
     }
     /**
      * luma.gl can not work without indices now: