@loaders.gl/tile-converter 3.1.8 → 3.2.0-alpha.3

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

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const queue_1 = require("./queue");
+class WriteQueue extends queue_1.Queue {
+    constructor(listeningInterval = 2000, writeConcurrency = 400) {
+        super();
+        this.writePromise = null;
+        this.fileMap = {};
+        this.listeningInterval = listeningInterval;
+        this.writeConcurrency = writeConcurrency;
+    }
+    startListening() {
+        this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);
+    }
+    stopListening() {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+        }
+    }
+    async startWrite() {
+        if (this.writePromise) {
+            await this.writePromise;
+            this.writePromise = null;
+            return;
+        }
+        this.writePromise = this.doWrite();
+        await this.writePromise;
+        this.writePromise = null;
+    }
+    async finalize() {
+        this.stopListening();
+        await this.startWrite();
+    }
+    async doWrite() {
+        while (this.length) {
+            const promises = [];
+            const archiveKeys = [];
+            for (let i = 0; i < this.writeConcurrency; i++) {
+                const item = this.dequeue();
+                if (!item) {
+                    break;
+                }
+                const { archiveKey, writePromise } = item;
+                archiveKeys.push(archiveKey);
+                promises.push(writePromise);
+            }
+            const writeResults = await Promise.all(promises);
+            this.updateFileMap(archiveKeys, writeResults);
+        }
+        this.writePromise = null;
+    }
+    updateFileMap(archiveKeys, writeResults) {
+        for (let i = 0; i < archiveKeys.length; i++) {
+            const archiveKey = archiveKeys[i];
+            if (!archiveKey) {
+                continue;
+            }
+            this.fileMap[archiveKey] = writeResults[i];
+        }
+    }
+}
+exports.default = WriteQueue;

package/dist/pgm-loader.d.ts

@@ -0,0 +1,6 @@
+import type { LoaderWithParser } from '@loaders.gl/loader-utils';
+/**
+ * Loader for PGM - Netpbm grayscale image format
+ */
+export declare const PGMLoader: LoaderWithParser;
+//# sourceMappingURL=pgm-loader.d.ts.map

package/dist/pgm-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgm-loader.d.ts","sourceRoot":"","sources":["../src/pgm-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQ/D;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAYvB,CAAC"}

package/dist/pgm-loader.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PGMLoader = void 0;
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+const geoid_1 = require("@math.gl/geoid");
+/**
+ * Loader for PGM - Netpbm grayscale image format
+ */
+exports.PGMLoader = {
+    name: 'PGM - Netpbm grayscale image format',
+    id: 'pgm',
+    module: 'tile-converter',
+    version: VERSION,
+    mimeTypes: ['image/x-portable-graymap'],
+    parse: async (arrayBuffer, options) => (0, geoid_1.parsePGM)(new Uint8Array(arrayBuffer), options),
+    extensions: ['pgm'],
+    options: {
+        // TODO - use pgm namespace
+        cubic: false
+    }
+};

package/dist/workers/3d-tiles-attributes-worker.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=3d-tiles-attributes-worker.d.ts.map

package/dist/workers/3d-tiles-attributes-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"3d-tiles-attributes-worker.d.ts","sourceRoot":"","sources":["../../src/workers/3d-tiles-attributes-worker.ts"],"names":[],"mappings":""}

package/dist/workers/3d-tiles-attributes-worker.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_utils_1 = require("@loaders.gl/worker-utils");
+const b3dm_converter_1 = __importDefault(require("../3d-tiles-converter/helpers/b3dm-converter"));
+const b3dmConverter = new b3dm_converter_1.default();
+(0, worker_utils_1.createWorker)(async (data, options = {}) => b3dmConverter.convert(data, options.attributes));

package/dist/workers/i3s-attributes-worker.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=i3s-attributes-worker.d.ts.map

package/dist/workers/i3s-attributes-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i3s-attributes-worker.d.ts","sourceRoot":"","sources":["../../src/workers/i3s-attributes-worker.ts"],"names":[],"mappings":""}

package/dist/workers/i3s-attributes-worker.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_utils_1 = require("@loaders.gl/worker-utils");
+const geometry_converter_1 = require("../i3s-converter/helpers/geometry-converter");
+(0, worker_utils_1.createWorker)(async (data, options = {}) => await (0, geometry_converter_1.convertAttributes)(data, options.useCartesianPositions));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.1.8",
+  "version": "3.2.0-alpha.3",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -33,25 +33,26 @@
     "fs": false
   },
   "scripts": {
-    "pre-build": "npm run build-bundle",
-    "post-build": "npm run build-converter-bundle",
+    "pre-build": "npm run build-bundle && npm run build-converter-bundle && npm run build-i3s-attributes-worker && npm run build-3d-tiles-attributes-worker",
     "build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/dist.min.js --platform=node",
     "build-converter-bundle": "webpack --display errors-only --config ./converter-webpack/bundle.js",
-    "build-bin": "BABEL_ENV=es5 babel scripts --config-file ../../babel.config.js --out-dir dist/scripts"
+    "build-i3s-attributes-worker": "esbuild src/workers/i3s-attributes-worker.ts --outfile=dist/i3s-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "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.1.8",
-    "@loaders.gl/crypto": "3.1.8",
-    "@loaders.gl/draco": "3.1.8",
-    "@loaders.gl/gltf": "3.1.8",
-    "@loaders.gl/i3s": "3.1.8",
-    "@loaders.gl/images": "3.1.8",
-    "@loaders.gl/loader-utils": "3.1.8",
-    "@loaders.gl/polyfills": "3.1.8",
-    "@loaders.gl/textures": "3.1.8",
-    "@loaders.gl/tiles": "3.1.8",
-    "@loaders.gl/worker-utils": "3.1.8",
-    "@loaders.gl/zip": "3.1.8",
+    "@loaders.gl/3d-tiles": "3.2.0-alpha.3",
+    "@loaders.gl/crypto": "3.2.0-alpha.3",
+    "@loaders.gl/draco": "3.2.0-alpha.3",
+    "@loaders.gl/gltf": "3.2.0-alpha.3",
+    "@loaders.gl/i3s": "3.2.0-alpha.3",
+    "@loaders.gl/images": "3.2.0-alpha.3",
+    "@loaders.gl/loader-utils": "3.2.0-alpha.3",
+    "@loaders.gl/polyfills": "3.2.0-alpha.3",
+    "@loaders.gl/schema": "3.2.0-alpha.3",
+    "@loaders.gl/textures": "3.2.0-alpha.3",
+    "@loaders.gl/tiles": "3.2.0-alpha.3",
+    "@loaders.gl/worker-utils": "3.2.0-alpha.3",
+    "@loaders.gl/zip": "3.2.0-alpha.3",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -69,7 +70,7 @@
     "uuid": "^8.1.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "^3.1.0"
+    "@loaders.gl/core": "3.2.0-alpha.2"
   },
-  "gitHead": "0ef07b4e9fc20f5a882224cf241c6fd1bad898d8"
+  "gitHead": "f0d4b801efeb7094283106352ee759eccfb21f10"
 }

package/src/3d-tiles-attributes-worker.ts

@@ -0,0 +1,43 @@
+import type {WorkerObject} from '@loaders.gl/worker-utils';
+import type {FeatureAttribute} from '@loaders.gl/i3s';
+
+import {processOnWorker} from '@loaders.gl/worker-utils';
+
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
+export type Tile3DAttributesWorkerOptions = {
+  featureAttributes: FeatureAttribute | null;
+  source: string;
+};
+
+export type I3SAttributesData = {
+  tileContent: any;
+  textureFormat: string;
+};
+
+/**
+ * I3S Attributes Worker to handle B3DM object
+ */
+export const Tile3dAttributesWorker = {
+  id: '3d-tiles-attributes',
+  name: '3DTiles Attributes Worker',
+  module: 'tile-converter',
+  version: VERSION,
+  options: {
+    attributes: null
+  }
+};
+
+/**
+ * Performs I3S attributes transformation
+ */
+export function transform3DTilesAttributesOnWorker(
+  i3sAttributesData: I3SAttributesData,
+  options: Tile3DAttributesWorkerOptions
+): Promise<ArrayBuffer> {
+  return processOnWorker(Tile3dAttributesWorker, i3sAttributesData, options);
+}
+
+export const _typecheckI3SAttributesWorker: WorkerObject = Tile3dAttributesWorker;

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

@@ -4,7 +4,7 @@ import type {Node3D} from '@loaders.gl/3d-tiles';
 import {join} from 'path';
 import process from 'process';
 import transform from 'json-map-transform';
-import {load} from '@loaders.gl/core';
+import {fetchFile, getLoaderOptions, load} from '@loaders.gl/core';
 import {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';
 import {Tileset3D, Tile3D} from '@loaders.gl/tiles';
 import {Geoid} from '@math.gl/geoid';
@@ -17,6 +17,12 @@ 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';
+import {
+  I3SAttributesData,
+  Tile3dAttributesWorker
+  /*transform3DTilesAttributesOnWorker*/
+} from '../3d-tiles-attributes-worker';
+import {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';
 
 const I3S = 'I3S';
 
@@ -31,6 +37,7 @@ export default class Tiles3DConverter {
   geoidHeightModel: Geoid | null;
   sourceTileset: Tileset3D | null;
   attributeStorageInfo: AttributeStorageInfo | null;
+  workerSource: {[key: string]: string} = {};
 
   constructor() {
     this.options = {};
@@ -40,6 +47,7 @@ export default class Tiles3DConverter {
     this.geoidHeightModel = null;
     this.sourceTileset = null;
     this.attributeStorageInfo = null;
+    this.workerSource = {};
   }
 
   /**
@@ -55,7 +63,7 @@ export default class Tiles3DConverter {
     inputUrl: string;
     outputPath: string;
     tilesetName: string;
-    maxDepth: number;
+    maxDepth?: number;
     egmFilePath: string;
   }): Promise<any> {
     const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;
@@ -66,11 +74,17 @@ export default class Tiles3DConverter {
     this.geoidHeightModel = await load(egmFilePath, PGMLoader);
     console.log('Loading egm file completed!'); // eslint-disable-line
 
+    await this.loadWorkers();
+
     const sourceTilesetJson = await load(inputUrl, I3SLoader, {});
+
     this.sourceTileset = new Tileset3D(sourceTilesetJson, {
-      loadOptions: {i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS}}
+      loadOptions: {
+        i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false}
+      }
     });
 
+    await this.sourceTileset.tilesetInitializationPromise;
     const rootNode = this.sourceTileset.root!;
     if (!rootNode.header.obb) {
       rootNode.header.obb = createObbFromMbs(rootNode.header.mbs);
@@ -99,6 +113,10 @@ export default class Tiles3DConverter {
     await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
 
     this._finishConversion({slpk: false, outputPath, tilesetName});
+
+    // Clean up worker pools
+    const workerFarm = WorkerFarm.getWorkerFarm({});
+    workerFarm.destroy();
   }
 
   /**
@@ -122,9 +140,12 @@ export default class Tiles3DConverter {
         await this.sourceTileset!._loadTile(sourceChild);
         this.vertexCounter += sourceChild.content.vertexCount;
 
-        let attributes: FeatureAttribute | null = null;
+        let featureAttributes: FeatureAttribute | null = null;
         if (this.attributeStorageInfo) {
-          attributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
+          featureAttributes = await this._loadChildAttributes(
+            sourceChild,
+            this.attributeStorageInfo
+          );
         }
 
         if (!sourceChild.header.obb) {
@@ -140,7 +161,19 @@ export default class Tiles3DConverter {
           children: []
         };
 
-        const b3dm = await new B3dmConverter().convert(sourceChild, attributes);
+        const i3sAttributesData: 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 B3dmConverter().convert(i3sAttributesData, featureAttributes);
+
         child.content = {
           uri: `${sourceChild.id}.b3dm`,
           boundingVolume
@@ -287,4 +320,14 @@ export default class Tiles3DConverter {
     console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line
     console.log(`------------------------------------------------`); // eslint-disable-line
   }
+
+  private async loadWorkers(): Promise<void> {
+    console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console
+    const tile3dAttributesWorkerUrl = getWorkerURL(Tile3dAttributesWorker, {...getLoaderOptions()});
+    const sourceResponse = await fetchFile(tile3dAttributesWorkerUrl);
+    const source = await sourceResponse.text();
+
+    this.workerSource.tile3dWorkerSource = source;
+    console.log(`Loading workers source completed!`); // eslint-disable-line no-undef, no-console
+  }
 }

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

@@ -1,7 +1,8 @@
-import {encode, encodeSync} from '@loaders.gl/core';
+import type {I3SAttributesData} from '../../3d-tiles-attributes-worker';
+
+import {encodeSync} from '@loaders.gl/core';
 import {GLTFScenegraph, GLTFWriter} from '@loaders.gl/gltf';
 import {Tile3DWriter} from '@loaders.gl/3d-tiles';
-import {ImageWriter} from '@loaders.gl/images';
 import {Matrix4, Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 import {convertTextureAtlas} from './texture-atlas';
@@ -22,15 +23,17 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded content
    */
-  async convert(i3sTile: Object, attributes: any = null): Promise<ArrayBuffer> {
-    this.i3sTile = i3sTile;
-    const gltf = await this.buildGltf(i3sTile);
+  async convert(
+    i3sAttributesData: I3SAttributesData,
+    featureAttributes: any = null
+  ): Promise<ArrayBuffer> {
+    const gltf = await this.buildGltf(i3sAttributesData);
     const b3dm = encodeSync(
       {
         gltfEncoded: new Uint8Array(gltf),
         type: 'b3dm',
-        featuresLength: this._getFeaturesLength(attributes),
-        batchTable: attributes
+        featuresLength: this._getFeaturesLength(featureAttributes),
+        batchTable: featureAttributes
       },
       Tile3DWriter
     );
@@ -42,7 +45,8 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded glb content
    */
-  async buildGltf(i3sTile): Promise<ArrayBuffer> {
+  async buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer> {
+    const {tileContent, textureFormat} = i3sAttributesData;
     const {
       material,
       attributes,
@@ -50,10 +54,10 @@ export default class B3dmConverter {
       cartesianOrigin,
       cartographicOrigin,
       modelMatrix
-    } = i3sTile.content;
+    } = tileContent;
     const gltfBuilder = new 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);
 
@@ -81,7 +85,8 @@ export default class B3dmConverter {
     const meshIndex = gltfBuilder.addMesh({
       attributes,
       indices,
-      material: materialIndex
+      material: materialIndex,
+      mode: 4
     });
     const transformMatrix = this._generateTransformMatrix(cartesianOrigin);
     const nodeIndex = gltfBuilder.addNode({meshIndex, matrix: transformMatrix});
@@ -101,11 +106,8 @@ export default 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) {
@@ -116,8 +118,7 @@ export default class B3dmConverter {
     }
     if (selectedTexture) {
       const mimeType = this._deduceMimeTypeFromFormat(textureFormat);
-      const imageBuffer = await encode(selectedTexture, ImageWriter);
-      const imageIndex = gltfBuilder.addImage(imageBuffer, mimeType);
+      const imageIndex = gltfBuilder.addImage(selectedTexture, mimeType);
       textureIndex = gltfBuilder.addTexture({imageIndex});
       delete attributes.colors;
     }
@@ -210,6 +211,8 @@ export default class B3dmConverter {
         return 'image/jpeg';
       case 'png':
         return 'image/png';
+      case 'ktx2':
+        return 'image/ktx2';
       default:
         console.warn(`Unexpected texture format in I3S: ${format}`); // eslint-disable-line no-console, no-undef
         return 'image/jpeg';