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

package/dist/esm/i3s-converter/helpers/node-pages.js

@@ -121,7 +121,7 @@ export default class NodePages {
       for (const [index, nodePage] of this.nodePages.entries()) {
         const nodePageStr = JSON.stringify(nodePage);
         const slpkPath = join(layers0Path, 'nodepages');
-        writeQueue.enqueue({
+        await writeQueue.enqueue({
           archiveKey: "nodePages/".concat(index.toString(), ".json.gz"),
           writePromise: this.writeFile(slpkPath, nodePageStr, "".concat(index.toString(), ".json"))
         });
@@ -131,7 +131,7 @@ export default class NodePages {
         nodeCount: this.nodesCounter
       }, metadataTemplate());
       const compress = false;
-      writeQueue.enqueue({
+      await writeQueue.enqueue({
         archiveKey: 'metadata.json',
         writePromise: this.writeFile(layers0Path, JSON.stringify(metadata), 'metadata.json', compress)
       });
@@ -139,7 +139,7 @@ export default class NodePages {
       for (const [index, nodePage] of this.nodePages.entries()) {
         const nodePageStr = JSON.stringify(nodePage);
         const nodePagePath = join(layers0Path, 'nodepages', index.toString());
-        writeQueue.enqueue({
+        await writeQueue.enqueue({
           writePromise: this.writeFile(nodePagePath, nodePageStr)
         });
       }

package/dist/esm/i3s-converter/helpers/node-pages.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/i3s-converter/helpers/node-pages.ts"],"names":["join","transform","METADATA","metadataTemplate","NodePages","constructor","writeFileFunc","nodesPerPage","nodesCounter","nodePages","nodes","writeFile","useWriteFunction","func","getNodeById","id","pageIndex","Math","floor","nodeIndex","updateMaterialByNodeId","materialId","node","mesh","material","definition","resource","index","updateVertexCountByNodeId","vertexCount","geometry","updateNodeAttributeByNodeId","attribute","updateFeatureCountByNodeId","featureCount","updateTexelCountHintByNodeId","texelCountHint","addChildRelation","parentId","childId","undefined","parentNode","children","push","updateResourceInMesh","currentNodePage","length","save","layers0Path","writeQueue","slpk","nodePage","entries","nodePageStr","JSON","stringify","slpkPath","enqueue","archiveKey","toString","writePromise","metadata","nodeCount","compress","nodePagePath"],"mappings":"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","sourcesContent":["import type {WriteQueueItem} from '../../lib/utils/write-queue';\n\nimport {join} from 'path';\nimport transform from 'json-map-transform';\nimport {METADATA as metadataTemplate} from '../json-templates/metadata';\nimport {NodeInPage} from '@loaders.gl/i3s';\nimport WriteQueue from '../../lib/utils/write-queue';\n\n// @ts-nocheck\n/**\n * class NodePages - wrapper of nodePages array\n *\n * @example\n * import {writeFile} from './helpers/write-file';\n *\n * // create an instance of the class\n * const nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);\n * ...\n * // push root node\n * const parentId = nodePages.push({\n      lodThreshold: HARDCODED_MAX_SCREEN_THRESHOLD_SQ,\n      obb: coordinates.obb,\n      children: []\n    });\n * ...\n * // push node with parent relation\n * const nodeInPage = {\n      lodThreshold: HARDCODED_MAX_SCREEN_THRESHOLD_SQ,\n      obb: coordinates.obb,\n      children: [],\n      mesh: {\n        geometry: {\n          definition: 0\n        }\n      }\n    };\n * const nodeId = this.nodePages.push(nodeInPage, parentId);\n * ...\n * // save all the nodePages in the end of pushing all the nodes\n * await this.nodePages.save(layers0path);\n */\nexport default class NodePages {\n  readonly nodesPerPage: number;\n  nodesCounter: number;\n  writeFile: Function;\n  readonly nodePages: {nodes: NodeInPage[]}[];\n\n  /**\n   * @constructs\n   * Create a nodePages instance.\n   * @param writeFileFunc - function to save one nodePage into a file\n   * @param nodesPerPage - length limit for one nodePage. An additional nodePage is created when this limit is met\n   */\n  constructor(writeFileFunc, nodesPerPage) {\n    this.nodesPerPage = nodesPerPage;\n    this.nodesCounter = 0;\n    // @ts-expect-error\n    this.nodePages = [{}];\n    this.nodePages[0].nodes = [];\n    this.writeFile = writeFileFunc;\n  }\n\n  /**\n   * Setup function to save node pages\n   * @param func - function which should be used to save node pages\n   */\n  useWriteFunction(func: Function): void {\n    this.writeFile = func;\n  }\n\n  /**\n   * Get the node by its end-to-end index\n   * @param id - end-to-end index of the node\n   * @return the node object\n   */\n  getNodeById(id: number): NodeInPage {\n    const pageIndex = Math.floor(id / this.nodesPerPage);\n    const nodeIndex = id % this.nodesPerPage;\n    return this.nodePages[pageIndex].nodes[nodeIndex];\n  }\n\n  /**\n   * Update material in node.mesh object by node id\n   * @param id - end-to-end index of the node\n   * @param materialId - id from scene layer materialDefinitions\n   */\n  updateMaterialByNodeId(id: number, materialId: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.material = {\n      definition: materialId,\n      resource: node.index\n    };\n  }\n\n  /**\n   * Update vertexCount in node.mesh.geometry object by node id\n   * @param id - end-to-end index of the node\n   * @param vertexCount - vertex count for particular node\n   */\n  updateVertexCountByNodeId(id: number, vertexCount: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.geometry.vertexCount = vertexCount;\n  }\n\n  /**\n   * Update resource in node.mesh.attribute object by node id\n   * @param id - end-to-end index of the node\n   */\n  updateNodeAttributeByNodeId(id: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.attribute.resource = node.index;\n  }\n\n  /**\n   * Update featureCount in node.mesh.geometry object by node id\n   * @param id - end-to-end index of the node\n   * @param featureCount - features count of the node\n   */\n  updateFeatureCountByNodeId(id: number, featureCount: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.geometry.featureCount = featureCount;\n  }\n\n  /**\n   * Update texelCountHint in node.mesh.material object by node id\n   * @param id - end-to-end index of the node\n   * @param texelCountHint - texelCountHint of particular node\n   */\n  updateTexelCountHintByNodeId(id: number, texelCountHint: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh || !node.mesh.material) {\n      return;\n    }\n    node.mesh.material.texelCountHint = texelCountHint;\n  }\n\n  /**\n   * Add a child id into the parent node.children array\n   * @param parentId - end-to-end parent node index\n   * @param childId - end-to-end child node index\n   */\n  addChildRelation(parentId: number | undefined, childId: number): void {\n    if (parentId === null || parentId === undefined) {\n      return;\n    }\n    const parentNode = this.getNodeById(parentId);\n    parentNode.children?.push(childId);\n  }\n\n  /**\n   * Update resource index in node.mesh object\n   * @param node - node object\n   */\n  updateResourceInMesh(node: NodeInPage): void {\n    if (node.mesh) {\n      node.mesh.geometry.resource = node.index;\n    }\n  }\n\n  /**\n   * Put new node in nodePages array\n   * @param node - node object\n   * @param parentId - index of parent node\n   * @return\n   */\n  push(node: NodeInPage, parentId?: number): number {\n    let currentNodePage = this.nodePages[this.nodePages.length - 1];\n    if (currentNodePage.nodes.length === this.nodesPerPage) {\n      currentNodePage = {nodes: []};\n      this.nodePages.push(currentNodePage);\n    }\n    node.index = this.nodesCounter++;\n    currentNodePage.nodes.push(node);\n    this.addChildRelation(parentId, node.index);\n    this.updateResourceInMesh(node);\n    return node.index;\n  }\n\n  /**\n   * Save all the node pages\n   * Run this method when all nodes is pushed in nodePages\n   * @param layers0Path - path of layer\n   * @param writeQueue - write queue that controlls files write concurrency\n   * @param slpk\n   */\n  async save(\n    layers0Path: string,\n    writeQueue: WriteQueue<WriteQueueItem>,\n    slpk: boolean = false\n  ): Promise<void> {\n    if (slpk) {\n      for (const [index, nodePage] of this.nodePages.entries()) {\n        const nodePageStr = JSON.stringify(nodePage);\n        const slpkPath = join(layers0Path, 'nodepages');\n        writeQueue.enqueue({\n          archiveKey: `nodePages/${index.toString()}.json.gz`,\n          writePromise: this.writeFile(slpkPath, nodePageStr, `${index.toString()}.json`)\n        });\n      }\n      const metadata = transform({nodeCount: this.nodesCounter}, metadataTemplate());\n      const compress = false;\n      writeQueue.enqueue({\n        archiveKey: 'metadata.json',\n        writePromise: this.writeFile(\n          layers0Path,\n          JSON.stringify(metadata),\n          'metadata.json',\n          compress\n        )\n      });\n    } else {\n      for (const [index, nodePage] of this.nodePages.entries()) {\n        const nodePageStr = JSON.stringify(nodePage);\n        const nodePagePath = join(layers0Path, 'nodepages', index.toString());\n        writeQueue.enqueue({writePromise: this.writeFile(nodePagePath, nodePageStr)});\n      }\n    }\n  }\n}\n"],"file":"node-pages.js"}
+{"version":3,"sources":["../../../../src/i3s-converter/helpers/node-pages.ts"],"names":["join","transform","METADATA","metadataTemplate","NodePages","constructor","writeFileFunc","nodesPerPage","nodesCounter","nodePages","nodes","writeFile","useWriteFunction","func","getNodeById","id","pageIndex","Math","floor","nodeIndex","updateMaterialByNodeId","materialId","node","mesh","material","definition","resource","index","updateVertexCountByNodeId","vertexCount","geometry","updateNodeAttributeByNodeId","attribute","updateFeatureCountByNodeId","featureCount","updateTexelCountHintByNodeId","texelCountHint","addChildRelation","parentId","childId","undefined","parentNode","children","push","updateResourceInMesh","currentNodePage","length","save","layers0Path","writeQueue","slpk","nodePage","entries","nodePageStr","JSON","stringify","slpkPath","enqueue","archiveKey","toString","writePromise","metadata","nodeCount","compress","nodePagePath"],"mappings":"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","sourcesContent":["import type {WriteQueueItem} from '../../lib/utils/write-queue';\n\nimport {join} from 'path';\nimport transform from 'json-map-transform';\nimport {METADATA as metadataTemplate} from '../json-templates/metadata';\nimport {NodeInPage} from '@loaders.gl/i3s';\nimport WriteQueue from '../../lib/utils/write-queue';\n\n// @ts-nocheck\n/**\n * class NodePages - wrapper of nodePages array\n *\n * @example\n * import {writeFile} from './helpers/write-file';\n *\n * // create an instance of the class\n * const nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);\n * ...\n * // push root node\n * const parentId = nodePages.push({\n      lodThreshold: HARDCODED_MAX_SCREEN_THRESHOLD_SQ,\n      obb: coordinates.obb,\n      children: []\n    });\n * ...\n * // push node with parent relation\n * const nodeInPage = {\n      lodThreshold: HARDCODED_MAX_SCREEN_THRESHOLD_SQ,\n      obb: coordinates.obb,\n      children: [],\n      mesh: {\n        geometry: {\n          definition: 0\n        }\n      }\n    };\n * const nodeId = this.nodePages.push(nodeInPage, parentId);\n * ...\n * // save all the nodePages in the end of pushing all the nodes\n * await this.nodePages.save(layers0path);\n */\nexport default class NodePages {\n  readonly nodesPerPage: number;\n  nodesCounter: number;\n  writeFile: Function;\n  readonly nodePages: {nodes: NodeInPage[]}[];\n\n  /**\n   * @constructs\n   * Create a nodePages instance.\n   * @param writeFileFunc - function to save one nodePage into a file\n   * @param nodesPerPage - length limit for one nodePage. An additional nodePage is created when this limit is met\n   */\n  constructor(writeFileFunc, nodesPerPage) {\n    this.nodesPerPage = nodesPerPage;\n    this.nodesCounter = 0;\n    // @ts-expect-error\n    this.nodePages = [{}];\n    this.nodePages[0].nodes = [];\n    this.writeFile = writeFileFunc;\n  }\n\n  /**\n   * Setup function to save node pages\n   * @param func - function which should be used to save node pages\n   */\n  useWriteFunction(func: Function): void {\n    this.writeFile = func;\n  }\n\n  /**\n   * Get the node by its end-to-end index\n   * @param id - end-to-end index of the node\n   * @return the node object\n   */\n  getNodeById(id: number): NodeInPage {\n    const pageIndex = Math.floor(id / this.nodesPerPage);\n    const nodeIndex = id % this.nodesPerPage;\n    return this.nodePages[pageIndex].nodes[nodeIndex];\n  }\n\n  /**\n   * Update material in node.mesh object by node id\n   * @param id - end-to-end index of the node\n   * @param materialId - id from scene layer materialDefinitions\n   */\n  updateMaterialByNodeId(id: number, materialId: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.material = {\n      definition: materialId,\n      resource: node.index\n    };\n  }\n\n  /**\n   * Update vertexCount in node.mesh.geometry object by node id\n   * @param id - end-to-end index of the node\n   * @param vertexCount - vertex count for particular node\n   */\n  updateVertexCountByNodeId(id: number, vertexCount: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.geometry.vertexCount = vertexCount;\n  }\n\n  /**\n   * Update resource in node.mesh.attribute object by node id\n   * @param id - end-to-end index of the node\n   */\n  updateNodeAttributeByNodeId(id: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.attribute.resource = node.index;\n  }\n\n  /**\n   * Update featureCount in node.mesh.geometry object by node id\n   * @param id - end-to-end index of the node\n   * @param featureCount - features count of the node\n   */\n  updateFeatureCountByNodeId(id: number, featureCount: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh) {\n      return;\n    }\n    node.mesh.geometry.featureCount = featureCount;\n  }\n\n  /**\n   * Update texelCountHint in node.mesh.material object by node id\n   * @param id - end-to-end index of the node\n   * @param texelCountHint - texelCountHint of particular node\n   */\n  updateTexelCountHintByNodeId(id: number, texelCountHint: number): void {\n    const node = this.getNodeById(id);\n    if (!node.mesh || !node.mesh.material) {\n      return;\n    }\n    node.mesh.material.texelCountHint = texelCountHint;\n  }\n\n  /**\n   * Add a child id into the parent node.children array\n   * @param parentId - end-to-end parent node index\n   * @param childId - end-to-end child node index\n   */\n  addChildRelation(parentId: number | undefined, childId: number): void {\n    if (parentId === null || parentId === undefined) {\n      return;\n    }\n    const parentNode = this.getNodeById(parentId);\n    parentNode.children?.push(childId);\n  }\n\n  /**\n   * Update resource index in node.mesh object\n   * @param node - node object\n   */\n  updateResourceInMesh(node: NodeInPage): void {\n    if (node.mesh) {\n      node.mesh.geometry.resource = node.index;\n    }\n  }\n\n  /**\n   * Put new node in nodePages array\n   * @param node - node object\n   * @param parentId - index of parent node\n   * @return\n   */\n  push(node: NodeInPage, parentId?: number): number {\n    let currentNodePage = this.nodePages[this.nodePages.length - 1];\n    if (currentNodePage.nodes.length === this.nodesPerPage) {\n      currentNodePage = {nodes: []};\n      this.nodePages.push(currentNodePage);\n    }\n    node.index = this.nodesCounter++;\n    currentNodePage.nodes.push(node);\n    this.addChildRelation(parentId, node.index);\n    this.updateResourceInMesh(node);\n    return node.index;\n  }\n\n  /**\n   * Save all the node pages\n   * Run this method when all nodes is pushed in nodePages\n   * @param layers0Path - path of layer\n   * @param writeQueue - write queue that controlls files write concurrency\n   * @param slpk\n   */\n  async save(\n    layers0Path: string,\n    writeQueue: WriteQueue<WriteQueueItem>,\n    slpk: boolean = false\n  ): Promise<void> {\n    if (slpk) {\n      for (const [index, nodePage] of this.nodePages.entries()) {\n        const nodePageStr = JSON.stringify(nodePage);\n        const slpkPath = join(layers0Path, 'nodepages');\n        await writeQueue.enqueue({\n          archiveKey: `nodePages/${index.toString()}.json.gz`,\n          writePromise: this.writeFile(slpkPath, nodePageStr, `${index.toString()}.json`)\n        });\n      }\n      const metadata = transform({nodeCount: this.nodesCounter}, metadataTemplate());\n      const compress = false;\n      await writeQueue.enqueue({\n        archiveKey: 'metadata.json',\n        writePromise: this.writeFile(\n          layers0Path,\n          JSON.stringify(metadata),\n          'metadata.json',\n          compress\n        )\n      });\n    } else {\n      for (const [index, nodePage] of this.nodePages.entries()) {\n        const nodePageStr = JSON.stringify(nodePage);\n        const nodePagePath = join(layers0Path, 'nodepages', index.toString());\n        await writeQueue.enqueue({writePromise: this.writeFile(nodePagePath, nodePageStr)});\n      }\n    }\n  }\n}\n"],"file":"node-pages.js"}

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

@@ -14,7 +14,7 @@ import NodePages from './helpers/node-pages';
 import { writeFile, removeDir, writeFileForSlpk } from '../lib/utils/file-utils';
 import { compressWithChildProcess } from '../lib/utils/compress-util';
 import { calculateFilesSize, timeConverter } from '../lib/utils/statistic-utills';
-import convertB3dmToI3sGeometry from './helpers/geometry-converter';
+import convertB3dmToI3sGeometry, { getPropertyTable } from './helpers/geometry-converter';
 import { createBoundingVolumes, convertBoundingVolumeToI3SFullExtent } from './helpers/coordinate-converter';
 import { createSceneServerPath } from './helpers/create-scene-server-path';
 import { convertGeometricErrorToScreenThreshold } from '../lib/utils/lod-conversion-utils';
@@ -277,12 +277,12 @@ export default class I3SConverter {
       const childPath = join(this.layers0Path, 'nodes', child.path);
 
       if (this.options.slpk) {
-        this.writeQueue.enqueue({
+        await this.writeQueue.enqueue({
           archiveKey: 'nodes/1/3dNodeIndexDocument.json.gz',
           writePromise: writeFileForSlpk(childPath, JSON.stringify(child), '3dNodeIndexDocument.json')
         });
       } else {
-        this.writeQueue.enqueue({
+        await this.writeQueue.enqueue({
           writePromise: writeFile(childPath, JSON.stringify(child))
         });
       }
@@ -300,12 +300,12 @@ export default class I3SConverter {
 
   async _writeLayers0() {
     if (this.options.slpk) {
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         archiveKey: '3dSceneLayer.json.gz',
         writePromise: writeFileForSlpk(this.layers0Path, JSON.stringify(this.layers0), '3dSceneLayer.json')
       });
     } else {
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         writePromise: writeFile(this.layers0Path, JSON.stringify(this.layers0))
       });
     }
@@ -313,12 +313,12 @@ export default class I3SConverter {
 
   async _writeNodeIndexDocument(root0, nodePath, rootPath) {
     if (this.options.slpk) {
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         archiveKey: "nodes/".concat(nodePath, "/3dNodeIndexDocument.json.gz"),
         writePromise: writeFileForSlpk(rootPath, JSON.stringify(root0), '3dNodeIndexDocument.json')
       });
     } else {
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         writePromise: writeFile(rootPath, JSON.stringify(root0))
       });
     }
@@ -419,7 +419,7 @@ export default class I3SConverter {
   }
 
   async _createNode(parentTile, sourceTile, parentId, level) {
-    var _sourceTile$content;
+    var _this$layers, _this$layers$attribut;
 
     if (this.validate) {
       this._checkAddRefinementTypeForTile(sourceTile);
@@ -428,13 +428,13 @@ export default class I3SConverter {
     await this._updateTilesetOptions();
     await this.sourceTileset._loadTile(sourceTile);
     let boundingVolumes = createBoundingVolumes(sourceTile, this.geoidHeightModel);
-    const batchTable = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content = sourceTile.content) === null || _sourceTile$content === void 0 ? void 0 : _sourceTile$content.batchTableJson;
+    const propertyTable = getPropertyTable(sourceTile);
 
-    if (batchTable) {
-      this._convertAttributeStorageInfo(sourceTile.content);
+    if (propertyTable && !((_this$layers = this.layers0) !== null && _this$layers !== void 0 && (_this$layers$attribut = _this$layers.attributeStorageInfo) !== null && _this$layers$attribut !== void 0 && _this$layers$attribut.length)) {
+      this._convertPropertyTableToNodeAttributes(propertyTable);
     }
 
-    const resourcesData = await this._convertResources(sourceTile);
+    const resourcesData = await this._convertResources(sourceTile, propertyTable);
     const nodes = [];
     const nodesInPage = [];
     const emptyResources = {
@@ -491,24 +491,14 @@ export default class I3SConverter {
     return nodes;
   }
 
-  _convertAttributeStorageInfo(sourceTileContent) {
-    var _this$layers, _this$layers$attribut;
-
-    const batchTable = sourceTileContent && sourceTileContent.batchTableJson;
-
-    if (batchTable && !((_this$layers = this.layers0) !== null && _this$layers !== void 0 && (_this$layers$attribut = _this$layers.attributeStorageInfo) !== null && _this$layers$attribut !== void 0 && _this$layers$attribut.length)) {
-      this._convertBatchTableInfoToNodeAttributes(batchTable);
-    }
-  }
-
-  async _convertResources(sourceTile) {
+  async _convertResources(sourceTile, propertyTable) {
     var _this$layers2;
 
     if (!this.isContentSupported(sourceTile)) {
       return null;
     }
 
-    const resourcesData = await convertB3dmToI3sGeometry(sourceTile.content, Number(this.nodePages.nodesCounter), this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
+    const resourcesData = await convertB3dmToI3sGeometry(sourceTile.content, Number(this.nodePages.nodesCounter), propertyTable, this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
     return resourcesData;
   }
 
@@ -643,13 +633,13 @@ export default class I3SConverter {
   async _writeGeometries(geometryBuffer, compressedGeometry, childPath, slpkChildPath) {
     if (this.options.slpk) {
       const slpkGeometryPath = join(childPath, 'geometries');
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         archiveKey: "".concat(slpkChildPath, "/geometries/0.bin.gz"),
         writePromise: writeFileForSlpk(slpkGeometryPath, geometryBuffer, '0.bin')
       });
     } else {
       const geometryPath = join(childPath, 'geometries/0/');
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         writePromise: writeFile(geometryPath, geometryBuffer, 'index.bin')
       });
     }
@@ -657,13 +647,13 @@ export default class I3SConverter {
     if (this.options.draco) {
       if (this.options.slpk) {
         const slpkCompressedGeometryPath = join(childPath, 'geometries');
-        this.writeQueue.enqueue({
+        await this.writeQueue.enqueue({
           archiveKey: "".concat(slpkChildPath, "/geometries/1.bin.gz"),
           writePromise: writeFileForSlpk(slpkCompressedGeometryPath, compressedGeometry, '1.bin')
         });
       } else {
         const compressedGeometryPath = join(childPath, 'geometries/1/');
-        this.writeQueue.enqueue({
+        await this.writeQueue.enqueue({
           writePromise: writeFile(compressedGeometryPath, compressedGeometry, 'index.bin')
         });
       }
@@ -681,13 +671,13 @@ export default class I3SConverter {
 
     if (this.options.slpk) {
       const slpkSharedPath = join(childPath, 'shared');
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         archiveKey: "".concat(slpkChildPath, "/shared/sharedResource.json.gz"),
         writePromise: writeFileForSlpk(slpkSharedPath, sharedDataStr, 'sharedResource.json')
       });
     } else {
       const sharedPath = join(childPath, 'shared/');
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         writePromise: writeFile(sharedPath, sharedDataStr)
       });
     }
@@ -761,13 +751,13 @@ export default class I3SConverter {
     if (this.options.slpk) {
       const slpkTexturePath = join(childPath, 'textures');
       const compress = false;
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         archiveKey: "".concat(slpkChildPath, "/textures/").concat(name, ".").concat(format),
         writePromise: writeFileForSlpk(slpkTexturePath, textureData, "".concat(name, ".").concat(format), compress)
       });
     } else {
       const texturePath = join(childPath, "textures/".concat(name, "/"));
-      this.writeQueue.enqueue({
+      await this.writeQueue.enqueue({
         writePromise: writeFile(texturePath, textureData, "index.".concat(format))
       });
     }
@@ -783,13 +773,13 @@ export default class I3SConverter {
 
         if (this.options.slpk) {
           const slpkAttributesPath = join(childPath, 'attributes', folderName);
-          this.writeQueue.enqueue({
+          await this.writeQueue.enqueue({
             archiveKey: "".concat(slpkChildPath, "/attributes/").concat(folderName, ".bin.gz"),
             writePromise: writeFileForSlpk(slpkAttributesPath, fileBuffer, '0.bin')
           });
         } else {
           const attributesPath = join(childPath, "attributes/".concat(folderName, "/0"));
-          this.writeQueue.enqueue({
+          await this.writeQueue.enqueue({
             writePromise: writeFile(attributesPath, fileBuffer, 'index.bin')
           });
         }
@@ -920,15 +910,15 @@ export default class I3SConverter {
     };
   }
 
-  _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);
@@ -937,7 +927,7 @@ export default class I3SConverter {
 
       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);
@@ -966,14 +956,14 @@ export default class I3SConverter {
     }
   }
 
-  _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,