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

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

@@ -12,6 +12,9 @@ export default class Tiles3DConverter {
     geoidHeightModel: Geoid | null;
     sourceTileset: Tileset3D | null;
     attributeStorageInfo: AttributeStorageInfo | null;
+    workerSource: {
+        [key: string]: string;
+    };
     constructor();
     /**
      * Convert i3s format data to 3dTiles
@@ -74,5 +77,6 @@ export default class Tiles3DConverter {
      * @param params - output files data
      */
     private _finishConversion;
+    private loadWorkers;
 }
 //# sourceMappingURL=3d-tiles-converter.d.ts.map

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;AAarC;;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;;IAYlD;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,GAAG,CAAC;IA+ChB;;;;;OAKG;YACW,YAAY;IAiD1B;;;;;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;CAgBhC"}
+{"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,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,GAAG,CAAC;IAsDhB;;;;;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"}

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

@@ -17,12 +17,15 @@ 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");
 const I3S = 'I3S';
 /**
  * Converter from i3s to 3d-tiles
  */
 class Tiles3DConverter {
     constructor() {
+        this.workerSource = {};
         this.options = {};
         this.tilesetPath = '';
         this.vertexCounter = 0;
@@ -30,6 +33,7 @@ class Tiles3DConverter {
         this.geoidHeightModel = null;
         this.sourceTileset = null;
         this.attributeStorageInfo = null;
+        this.workerSource = {};
     }
     /**
      * Convert i3s format data to 3dTiles
@@ -47,12 +51,14 @@ class Tiles3DConverter {
         console.log('Loading egm file...'); // eslint-disable-line
         this.geoidHeightModel = await (0, core_1.load)(egmFilePath, pgm_loader_1.PGMLoader);
         console.log('Loading egm file completed!'); // eslint-disable-line
+        await this.loadWorkers();
         const sourceTilesetJson = await (0, core_1.load)(inputUrl, i3s_1.I3SLoader, {});
         this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, {
             loadOptions: {
                 i3s: { coordinateSystem: i3s_1.COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false }
             }
         });
+        await this.sourceTileset.tilesetInitializationPromise;
         const rootNode = this.sourceTileset.root;
         if (!rootNode.header.obb) {
             rootNode.header.obb = (0, coordinate_converter_1.createObbFromMbs)(rootNode.header.mbs);
@@ -77,6 +83,9 @@ class Tiles3DConverter {
         const tileset = (0, json_map_transform_1.default)({ root: rootTile }, (0, tileset_1.TILESET)());
         await (0, file_utils_1.writeFile)(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
         this._finishConversion({ slpk: false, outputPath, tilesetName });
+        // Clean up worker pools
+        const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
+        workerFarm.destroy();
     }
     /**
      * The recursive function of traversal of a nodes tree
@@ -94,9 +103,9 @@ class Tiles3DConverter {
             if (sourceChild.contentUrl) {
                 await this.sourceTileset._loadTile(sourceChild);
                 this.vertexCounter += sourceChild.content.vertexCount;
-                let attributes = null;
+                let featureAttributes = null;
                 if (this.attributeStorageInfo) {
-                    attributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
+                    featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
                 }
                 if (!sourceChild.header.obb) {
                     sourceChild.header.obb = (0, coordinate_converter_1.createObbFromMbs)(sourceChild.header.mbs);
@@ -109,7 +118,16 @@ class Tiles3DConverter {
                     geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(sourceChild),
                     children: []
                 };
-                const b3dm = await new b3dm_converter_1.default().convert(sourceChild, attributes);
+                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
@@ -238,5 +256,13 @@ class Tiles3DConverter {
         console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line
         console.log(`------------------------------------------------`); // eslint-disable-line
     }
+    async loadWorkers() {
+        console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console
+        const tile3dAttributesWorkerUrl = (0, worker_utils_1.getWorkerURL)(_3d_tiles_attributes_worker_1.Tile3dAttributesWorker, { ...(0, core_1.getLoaderOptions)() });
+        const sourceResponse = await (0, core_1.fetchFile)(tile3dAttributesWorkerUrl);
+        const source = await sourceResponse.text();
+        this.workerSource.tile3dWorkerSource = source;
+        console.log(`Loading workers source completed!`); // eslint-disable-line no-undef, no-console
+    }
 }
 exports.default = Tiles3DConverter;

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

@@ -1,3 +1,4 @@
+import type { I3SAttributesData } from '../../3d-tiles-attributes-worker';
 import { Matrix4 } from '@math.gl/core';
 /**
  * Converts content of an I3S node to *.b3dm's file content
@@ -10,20 +11,20 @@ export default class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded content
      */
-    convert(i3sTile: Object, attributes?: any): Promise<ArrayBuffer>;
+    convert(i3sAttributesData: I3SAttributesData, featureAttributes?: any): Promise<ArrayBuffer>;
     /**
      * Build and encode gltf
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    buildGltf(i3sTile: any): Promise<ArrayBuffer>;
+    buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer>;
     /**
      * Update gltfBuilder with texture from I3S tile
      * @param {object} i3sTile - Tile3D object
      * @param {GLTFScenegraph} gltfBuilder - gltfScenegraph instance to construct GLTF
      * @returns {Promise<number | null>} - GLTF texture index
      */
-    _addI3sTextureToGltf(i3sTile: any, gltfBuilder: any): Promise<null>;
+    _addI3sTextureToGltf(tileContent: any, textureFormat: any, gltfBuilder: any): Promise<null>;
     /**
      * Generate a positions array which is correct for 3DTiles/GLTF format
      * @param {Float64Array} positionsValue - the input geometry positions array
@@ -62,7 +63,7 @@ export default class B3dmConverter {
      * @param {string} format - format name
      * @returns {string} mime type.
      */
-    _deduceMimeTypeFromFormat(format: any): "image/jpeg" | "image/ktx2" | "image/png";
+    _deduceMimeTypeFromFormat(format: any): "image/jpeg" | "image/png" | "image/ktx2";
     /**
      * Convert i3s material to GLTF compatible material
      * @param {object} material - i3s material definition

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":"AAGA,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,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,GAAE,GAAU,GAAG,OAAO,CAAC,WAAW,CAAC;IAe5E;;;;OAIG;IACG,SAAS,CAAC,OAAO,KAAA,GAAG,OAAO,CAAC,WAAW,CAAC;IAsD9C;;;;;OAKG;IACG,oBAAoB,CAAC,OAAO,KAAA,EAAE,WAAW,KAAA;IAsB/C;;;;;;;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,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"}

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

@@ -17,14 +17,13 @@ class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded content
      */
-    async convert(i3sTile, attributes = null) {
-        this.i3sTile = i3sTile;
-        const gltf = await this.buildGltf(i3sTile);
+    async convert(i3sAttributesData, featureAttributes = null) {
+        const gltf = await this.buildGltf(i3sAttributesData);
         const b3dm = (0, core_1.encodeSync)({
             gltfEncoded: new Uint8Array(gltf),
             type: 'b3dm',
-            featuresLength: this._getFeaturesLength(attributes),
-            batchTable: attributes
+            featuresLength: this._getFeaturesLength(featureAttributes),
+            batchTable: featureAttributes
         }, _3d_tiles_1.Tile3DWriter);
         return b3dm;
     }
@@ -33,10 +32,11 @@ class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    async buildGltf(i3sTile) {
-        const { material, attributes, indices: originalIndices, cartesianOrigin, cartographicOrigin, modelMatrix } = i3sTile.content;
+    async buildGltf(i3sAttributesData) {
+        const { tileContent, textureFormat } = i3sAttributesData;
+        const { material, attributes, indices: originalIndices, cartesianOrigin, cartographicOrigin, modelMatrix } = tileContent;
         const gltfBuilder = new gltf_1.GLTFScenegraph();
-        const textureIndex = await this._addI3sTextureToGltf(i3sTile, gltfBuilder);
+        const textureIndex = await this._addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder);
         const pbrMaterialInfo = this._convertI3sMaterialToGltfMaterial(material, textureIndex);
         const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);
         const positions = attributes.positions;
@@ -69,8 +69,8 @@ class B3dmConverter {
      * @param {GLTFScenegraph} gltfBuilder - gltfScenegraph instance to construct GLTF
      * @returns {Promise<number | null>} - GLTF texture index
      */
-    async _addI3sTextureToGltf(i3sTile, gltfBuilder) {
-        const { content: { texture, material, attributes }, header: { textureFormat } } = i3sTile;
+    async _addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder) {
+        const { texture, material, attributes } = tileContent;
         let textureIndex = null;
         let selectedTexture = texture;
         if (!texture && material) {