@loaders.gl/tile-converter 4.0.0-alpha.5 → 4.0.0-alpha.6

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
@@ -26,9 +29,17 @@ export default class Tiles3DConverter {
         inputUrl: string;
         outputPath: string;
         tilesetName: string;
-        maxDepth: number;
+        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)
@@ -74,5 +85,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,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

@@ -1,247 +1,287 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { join } from 'path';
-import process from 'process';
-import transform from 'json-map-transform';
-import { load } from '@loaders.gl/core';
-import { I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM } from '@loaders.gl/i3s';
-import { Tileset3D, Tile3D } from '@loaders.gl/tiles';
-import { PGMLoader } from '../pgm-loader';
-import { i3sObbTo3dTilesObb } from './helpers/i3s-obb-to-3d-tiles-obb';
-import { convertScreenThresholdToGeometricError } from '../lib/utils/lod-conversion-utils';
-import { writeFile, removeDir } from '../lib/utils/file-utils';
-import { calculateFilesSize, timeConverter } from '../lib/utils/statistic-utills';
-import { TILESET as tilesetTemplate } from './json-templates/tileset';
-import B3dmConverter from './helpers/b3dm-converter';
-import { createObbFromMbs } from '../i3s-converter/helpers/coordinate-converter';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const process_1 = __importDefault(require("process"));
+const json_map_transform_1 = __importDefault(require("json-map-transform"));
+const core_1 = require("@loaders.gl/core");
+const i3s_1 = require("@loaders.gl/i3s");
+const tiles_1 = require("@loaders.gl/tiles");
+const pgm_loader_1 = require("../pgm-loader");
+const i3s_obb_to_3d_tiles_obb_1 = require("./helpers/i3s-obb-to-3d-tiles-obb");
+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 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 constants_1 = require("../constants");
 const I3S = 'I3S';
-export default class Tiles3DConverter {
-  constructor() {
-    _defineProperty(this, "options", void 0);
-
-    _defineProperty(this, "tilesetPath", void 0);
-
-    _defineProperty(this, "vertexCounter", void 0);
-
-    _defineProperty(this, "conversionStartTime", void 0);
-
-    _defineProperty(this, "geoidHeightModel", void 0);
-
-    _defineProperty(this, "sourceTileset", void 0);
-
-    _defineProperty(this, "attributeStorageInfo", void 0);
-
-    this.options = {};
-    this.tilesetPath = '';
-    this.vertexCounter = 0;
-    this.conversionStartTime = [0, 0];
-    this.geoidHeightModel = null;
-    this.sourceTileset = null;
-    this.attributeStorageInfo = null;
-  }
-
-  async convert(options) {
-    const {
-      inputUrl,
-      outputPath,
-      tilesetName,
-      maxDepth,
-      egmFilePath
-    } = options;
-    this.conversionStartTime = process.hrtime();
-    this.options = {
-      maxDepth
-    };
-    console.log('Loading egm file...');
-    this.geoidHeightModel = await load(egmFilePath, PGMLoader);
-    console.log('Loading egm file completed!');
-    const sourceTilesetJson = await load(inputUrl, I3SLoader, {});
-    this.sourceTileset = new Tileset3D(sourceTilesetJson, {
-      loadOptions: {
-        i3s: {
-          coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS,
-          decodeTextures: false
+/**
+ * Converter from i3s to 3d-tiles
+ */
+class Tiles3DConverter {
+    constructor() {
+        this.workerSource = {};
+        this.options = {};
+        this.tilesetPath = '';
+        this.vertexCounter = 0;
+        this.conversionStartTime = [0, 0];
+        this.geoidHeightModel = null;
+        this.sourceTileset = null;
+        this.attributeStorageInfo = null;
+        this.workerSource = {};
+    }
+    /**
+     * Convert i3s format data to 3dTiles
+     * @param options
+     * @param options.inputUrl the url to read the tileset from
+     * @param options.outputPath the output filename
+     * @param options.tilesetName the output name of the tileset
+     * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format
+     * @param options.maxDepth The max tree depth of conversion
+     */
+    async convert(options) {
+        if (core_1.isBrowser) {
+            console.log(constants_1.BROWSER_ERROR_MESSAGE);
+            return constants_1.BROWSER_ERROR_MESSAGE;
+        }
+        const { inputUrl, outputPath, tilesetName, maxDepth, egmFilePath } = options;
+        this.conversionStartTime = process_1.default.hrtime();
+        this.options = { maxDepth };
+        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: {
+                _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 }
+            }
+        });
+        await this.sourceTileset.tilesetInitializationPromise;
+        const rootNode = this.sourceTileset.root;
+        if (!rootNode.header.obb) {
+            rootNode.header.obb = (0, coordinate_converter_1.createObbFromMbs)(rootNode.header.mbs);
+        }
+        this.tilesetPath = (0, path_1.join)(`${outputPath}`, `${tilesetName}`);
+        this.attributeStorageInfo = sourceTilesetJson.attributeStorageInfo;
+        // Removing the tilesetPath needed to exclude erroneous files after conversion
+        try {
+            await (0, file_utils_1.removeDir)(this.tilesetPath);
         }
-      }
-    });
-    const rootNode = this.sourceTileset.root;
-
-    if (!rootNode.header.obb) {
-      rootNode.header.obb = createObbFromMbs(rootNode.header.mbs);
+        catch (e) {
+            // do nothing
+        }
+        const rootTile = {
+            boundingVolume: {
+                box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(rootNode.header.obb, this.geoidHeightModel)
+            },
+            geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(rootNode),
+            children: []
+        };
+        await this._addChildren(rootNode, rootTile, 1);
+        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();
     }
-
-    this.tilesetPath = join("".concat(outputPath), "".concat(tilesetName));
-    this.attributeStorageInfo = sourceTilesetJson.attributeStorageInfo;
-
-    try {
-      await removeDir(this.tilesetPath);
-    } catch (e) {}
-
-    const rootTile = {
-      boundingVolume: {
-        box: i3sObbTo3dTilesObb(rootNode.header.obb, this.geoidHeightModel)
-      },
-      geometricError: convertScreenThresholdToGeometricError(rootNode),
-      children: []
-    };
-    await this._addChildren(rootNode, rootTile, 1);
-    const tileset = transform({
-      root: rootTile
-    }, tilesetTemplate());
-    await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
-
-    this._finishConversion({
-      slpk: false,
-      outputPath,
-      tilesetName
-    });
-  }
-
-  async _addChildren(parentSourceNode, parentNode, level) {
-    if (this.options.maxDepth && level > this.options.maxDepth) {
-      return;
+    /**
+     * 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);
+        }
     }
-
-    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 attributes = null;
-
-        if (this.attributeStorageInfo) {
-          attributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
+    /**
+     * The recursive function of traversal of a nodes tree
+     * @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
+     */
+    async _addChildren(parentSourceNode, parentNode, level) {
+        if (this.options.maxDepth && level > this.options.maxDepth) {
+            return;
         }
-
-        if (!sourceChild.header.obb) {
-          sourceChild.header.obb = createObbFromMbs(sourceChild.header.mbs);
+        const promises = [];
+        for (const childNodeInfo of parentSourceNode.header.children || []) {
+            promises.push(this.convertChildNode(parentSourceNode, parentNode, level, childNodeInfo));
         }
-
-        const boundingVolume = {
-          box: i3sObbTo3dTilesObb(sourceChild.header.obb, this.geoidHeightModel)
-        };
-        const child = {
-          boundingVolume,
-          geometricError: convertScreenThresholdToGeometricError(sourceChild),
-          children: []
-        };
-        const b3dm = await new B3dmConverter().convert(sourceChild, attributes);
-        child.content = {
-          uri: "".concat(sourceChild.id, ".b3dm"),
-          boundingVolume
-        };
-        await writeFile(this.tilesetPath, new Uint8Array(b3dm), "".concat(sourceChild.id, ".b3dm"));
-        parentNode.children.push(child);
-        sourceChild.unloadContent();
-        await this._addChildren(sourceChild, child, level + 1);
-      } else {
-        await this._addChildren(sourceChild, parentNode, level + 1);
-      }
+        await Promise.all(promises);
     }
-  }
-
-  async _loadChildNode(parentNode, childNodeInfo) {
-    let header;
-
-    if (this.sourceTileset.tileset.nodePages) {
-      console.log("Node conversion: ".concat(childNodeInfo.id));
-      header = await this.sourceTileset.tileset.nodePagesTile.formTileFromNodePages(childNodeInfo.id);
-    } else {
-      const {
-        loader
-      } = this.sourceTileset;
-
-      const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href);
-
-      const options = {
-        i3s: { ...this.sourceTileset.loadOptions,
-          isTileHeader: true,
-          loadContent: false
+    /**
+     * Load a child node having information from the node header
+     * @param parentNode a parent node tile object (@loaders.gl/tiles/Tile3D)
+     * @param childNodeInfo child information from 3DNodeIndexDocument
+     *   (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodeReference.cmn.md)
+     */
+    async _loadChildNode(parentNode, childNodeInfo) {
+        let header;
+        if (this.sourceTileset.tileset.nodePages) {
+            console.log(`Node conversion: ${childNodeInfo.id}`); // eslint-disable-line no-console,no-undef
+            header = await this.sourceTileset.tileset.nodePagesTile.formTileFromNodePages(childNodeInfo.id);
+        }
+        else {
+            const { loader } = this.sourceTileset;
+            const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href);
+            // load metadata
+            const options = {
+                i3s: {
+                    ...this.sourceTileset.loadOptions,
+                    isTileHeader: true,
+                    loadContent: false
+                }
+            };
+            console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef
+            header = await (0, core_1.load)(nodeUrl, loader, options);
         }
-      };
-      console.log("Node conversion: ".concat(nodeUrl));
-      header = await load(nodeUrl, loader, options);
+        return new tiles_1.Tile3D(this.sourceTileset, header, parentNode);
     }
-
-    return new Tile3D(this.sourceTileset, header, parentNode);
-  }
-
-  _relativeUrlToFullUrl(baseUrl, relativeUrl) {
-    let resultArray = baseUrl.split('/');
-    const relativeUrlArray = relativeUrl.split('/');
-
-    for (const folder of relativeUrlArray) {
-      switch (folder) {
-        case '.':
-          continue;
-
-        case '..':
-          resultArray = resultArray.slice(0, -1);
-          break;
-
-        default:
-          resultArray.push(folder);
-      }
+    /**
+     * Make an url of a resource from its relative url having the base url
+     * @param baseUrl the base url. A resulting url will be related from this url
+     * @param relativeUrl a realtive url of a resource
+     */
+    _relativeUrlToFullUrl(baseUrl, relativeUrl) {
+        let resultArray = baseUrl.split('/');
+        const relativeUrlArray = relativeUrl.split('/');
+        for (const folder of relativeUrlArray) {
+            switch (folder) {
+                case '.':
+                    continue; // eslint-disable-line no-continue
+                case '..':
+                    resultArray = resultArray.slice(0, -1);
+                    break;
+                default:
+                    resultArray.push(folder);
+            }
+        }
+        return resultArray.join('/');
+    }
+    /**
+     * Do loading all attributes related to particular node.
+     * @param sourceChild
+     * @param attributeStorageInfo
+     * @returns Promise of attributes object.
+     */
+    async _loadChildAttributes(sourceChild, attributeStorageInfo) {
+        const promises = [];
+        const { attributeUrls } = sourceChild.header;
+        for (let index = 0; index < attributeUrls.length; index++) {
+            const inputUrl = attributeUrls[index];
+            const attribute = attributeStorageInfo[index];
+            const options = {
+                attributeName: attribute.name,
+                attributeType: this._getAttributeType(attribute)
+            };
+            promises.push((0, core_1.load)(inputUrl, i3s_1.I3SAttributeLoader, options));
+        }
+        const attributesList = await Promise.all(promises);
+        this._replaceNestedArrays(attributesList);
+        return Object.assign({}, ...attributesList);
     }
-
-    return resultArray.join('/');
-  }
-
-  async _loadChildAttributes(sourceChild, attributeStorageInfo) {
-    const promises = [];
-    const {
-      attributeUrls
-    } = sourceChild.header;
-
-    for (let index = 0; index < attributeUrls.length; index++) {
-      const inputUrl = attributeUrls[index];
-      const attribute = attributeStorageInfo[index];
-      const options = {
-        attributeName: attribute.name,
-        attributeType: this._getAttributeType(attribute)
-      };
-      promises.push(load(inputUrl, I3SAttributeLoader, options));
+    /**
+     * Returns attribute type for loading attributes
+     * @param attribute
+     * Workaround for I3S v1.6. There is no attribute.attributeValues.valueType field in attribute.
+     * There is an 'Oid32' type if attribute has objectIds property.
+     * Doc: https://github.com/Esri/i3s-spec/blob/master/docs/1.6/attributeStorageInfo.cmn.md
+     */
+    _getAttributeType(attribute) {
+        if (attribute.attributeValues) {
+            return attribute.attributeValues.valueType;
+        }
+        else if (attribute.objectIds) {
+            return 'Oid32';
+        }
+        return '';
+    }
+    /**
+     * Make simple arrays from attribute typed arrays.
+     * @param attributesList
+     */
+    _replaceNestedArrays(attributesList) {
+        for (let index = 0; index < attributesList.length; index++) {
+            const attributeObject = attributesList[index];
+            for (const key in attributeObject) {
+                attributeObject[key] = Array.from(attributeObject[key]);
+            }
+        }
     }
-
-    const attributesList = await Promise.all(promises);
-
-    this._replaceNestedArrays(attributesList);
-
-    return Object.assign({}, ...attributesList);
-  }
-
-  _getAttributeType(attribute) {
-    if (attribute.attributeValues) {
-      return attribute.attributeValues.valueType;
-    } else if (attribute.objectIds) {
-      return 'Oid32';
+    /**
+     * Print statistics in the end of conversion
+     * @param params - output files data
+     */
+    async _finishConversion(params) {
+        const filesSize = await (0, statistic_utills_1.calculateFilesSize)(params);
+        const diff = process_1.default.hrtime(this.conversionStartTime);
+        const conversionTime = (0, statistic_utills_1.timeConverter)(diff);
+        console.log(`------------------------------------------------`); // eslint-disable-line
+        console.log(`Finish conversion of ${I3S}`); // eslint-disable-line
+        console.log(`Total conversion time: ${conversionTime}`); // eslint-disable-line
+        console.log(`Vertex count: `, this.vertexCounter); // eslint-disable-line
+        console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line
+        console.log(`------------------------------------------------`); // eslint-disable-line
     }
-
-    return '';
-  }
-
-  _replaceNestedArrays(attributesList) {
-    for (let index = 0; index < attributesList.length; index++) {
-      const attributeObject = attributesList[index];
-
-      for (const key in attributeObject) {
-        attributeObject[key] = Array.from(attributeObject[key]);
-      }
+    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
     }
-  }
-
-  async _finishConversion(params) {
-    const filesSize = await calculateFilesSize(params);
-    const diff = process.hrtime(this.conversionStartTime);
-    const conversionTime = timeConverter(diff);
-    console.log("------------------------------------------------");
-    console.log("Finish conversion of ".concat(I3S));
-    console.log("Total conversion time: ".concat(conversionTime));
-    console.log("Vertex count: ", this.vertexCounter);
-    console.log("File(s) size: ", filesSize, ' bytes');
-    console.log("------------------------------------------------");
-  }
-
 }
-//# sourceMappingURL=3d-tiles-converter.js.map
+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, featureAttributes: any): 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
@@ -43,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
@@ -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,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"}