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

package/dist/i3s-server/routes/index.d.ts

@@ -0,0 +1,3 @@
+export = router;
+declare const router: any;
+//# sourceMappingURL=index.d.ts.map

package/dist/i3s-server/routes/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/index.js"],"names":[],"mappings":";AACA,0BAAgC"}

package/dist/index.d.ts

@@ -0,0 +1,5 @@
+export { default as I3SConverter } from './i3s-converter/i3s-converter';
+export { default as NodePages } from './i3s-converter/helpers/node-pages';
+export { default as Tiles3DConverter } from './3d-tiles-converter/3d-tiles-converter';
+export { DepsInstaller } from './deps-installer/deps-installer';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AAEpF,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC"}

package/dist/lib/utils/compress-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compress-util.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/compress-util.js"],"names":[],"mappings":"AAWA,kEAiBC;AAED,kGAoDC;AAED,wEAOC;AA0CD,yFA6CC;AASD,6GAGC"}

package/dist/lib/utils/file-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.js"],"names":[],"mappings":"AAIA,oFAUC;AAED,+GASC;AAED,oDAEC;AAED,qDAEC;AAED,wDAEC"}

package/dist/lib/utils/lod-conversion-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lod-conversion-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/lod-conversion-utils.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH;;;IAsBC;AAED,0EAeC"}

package/dist/lib/utils/statistic-utills.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statistic-utills.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/statistic-utills.js"],"names":[],"mappings":"AAIA,iDA4BC;AAED,wEAkBC"}

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

@@ -1,12 +1,12 @@
-const VERSION = typeof "4.0.0-alpha.4" !== 'undefined' ? "4.0.0-alpha.4" : 'latest';
-import { parsePgm } from './lib/pgm-parser';
+const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
+import { parsePGM } from '@math.gl/geoid';
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',
   module: 'tile-converter',
   version: VERSION,
   mimeTypes: ['image/x-portable-graymap'],
-  parse: (arrayBuffer, options) => parsePgm(new Uint8Array(arrayBuffer), options),
+  parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),
   extensions: ['pgm'],
   options: {
     cubic: false

package/dist/pgm-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/pgm-loader.ts"],"names":["VERSION","parsePgm","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","extensions","cubic"],"mappings":"AAIA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEA,SAAQC,QAAR,QAAuB,kBAAvB;AAKA,OAAO,MAAMC,SAA2B,GAAG;AACzCC,EAAAA,IAAI,EAAE,qCADmC;AAEzCC,EAAAA,EAAE,EAAE,KAFqC;AAGzCC,EAAAA,MAAM,EAAE,gBAHiC;AAIzCC,EAAAA,OAAO,EAAEN,OAJgC;AAKzCO,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAL8B;AAMzCC,EAAAA,KAAK,EAAE,CAACC,WAAD,EAAcC,OAAd,KAA0BT,QAAQ,CAAC,IAAIU,UAAJ,CAAeF,WAAf,CAAD,EAA8BC,OAA9B,CANA;AAOzCE,EAAAA,UAAU,EAAE,CAAC,KAAD,CAP6B;AAQzCF,EAAAA,OAAO,EAAE;AAEPG,IAAAA,KAAK,EAAE;AAFA;AARgC,CAApC","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nimport {parsePgm} from './lib/pgm-parser';\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  parse: (arrayBuffer, options) => parsePgm(new Uint8Array(arrayBuffer), options),\n  extensions: ['pgm'],\n  options: {\n    // TODO - use pgm namespace\n    cubic: false\n  }\n};\n"],"file":"pgm-loader.js"}
+{"version":3,"sources":["../src/pgm-loader.ts"],"names":["VERSION","parsePGM","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","extensions","cubic"],"mappings":"AAIA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEA,SAAQC,QAAR,QAAuB,gBAAvB;AAKA,OAAO,MAAMC,SAA2B,GAAG;AACzCC,EAAAA,IAAI,EAAE,qCADmC;AAEzCC,EAAAA,EAAE,EAAE,KAFqC;AAGzCC,EAAAA,MAAM,EAAE,gBAHiC;AAIzCC,EAAAA,OAAO,EAAEN,OAJgC;AAKzCO,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAL8B;AAMzCC,EAAAA,KAAK,EAAE,OAAOC,WAAP,EAAoBC,OAApB,KAAgCT,QAAQ,CAAC,IAAIU,UAAJ,CAAeF,WAAf,CAAD,EAA8BC,OAA9B,CANN;AAOzCE,EAAAA,UAAU,EAAE,CAAC,KAAD,CAP6B;AAQzCF,EAAAA,OAAO,EAAE;AAEPG,IAAAA,KAAK,EAAE;AAFA;AARgC,CAApC","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nimport {parsePGM} from '@math.gl/geoid';\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),\n  extensions: ['pgm'],\n  options: {\n    // TODO - use pgm namespace\n    cubic: false\n  }\n};\n"],"file":"pgm-loader.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.5",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -15,7 +15,7 @@
     "3dTiles",
     "i3s"
   ],
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "sideEffects": false,
@@ -33,26 +33,28 @@
     "fs": false
   },
   "scripts": {
-    "pre-build": "npm run build-bundle",
-    "post-build": "npm run build-converter-bundle",
-    "build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/bundle.js --platform=node",
-    "build-converter-bundle": "webpack --display errors-only --config ./converter-webpack/bundle.js"
+    "pre-build": "npm run build-bundle  && npm run build-converter-bundle",
+    "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"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.0.0-alpha.4",
-    "@loaders.gl/crypto": "4.0.0-alpha.4",
-    "@loaders.gl/draco": "4.0.0-alpha.4",
-    "@loaders.gl/gltf": "4.0.0-alpha.4",
-    "@loaders.gl/i3s": "4.0.0-alpha.4",
-    "@loaders.gl/images": "4.0.0-alpha.4",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.4",
-    "@loaders.gl/polyfills": "4.0.0-alpha.4",
-    "@loaders.gl/tiles": "4.0.0-alpha.4",
-    "@loaders.gl/worker-utils": "4.0.0-alpha.4",
-    "@loaders.gl/zip": "4.0.0-alpha.4",
+    "@loaders.gl/3d-tiles": "4.0.0-alpha.5",
+    "@loaders.gl/crypto": "4.0.0-alpha.5",
+    "@loaders.gl/draco": "4.0.0-alpha.5",
+    "@loaders.gl/gltf": "4.0.0-alpha.5",
+    "@loaders.gl/i3s": "4.0.0-alpha.5",
+    "@loaders.gl/images": "4.0.0-alpha.5",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.5",
+    "@loaders.gl/polyfills": "4.0.0-alpha.5",
+    "@loaders.gl/textures": "4.0.0-alpha.5",
+    "@loaders.gl/tiles": "4.0.0-alpha.5",
+    "@loaders.gl/worker-utils": "4.0.0-alpha.5",
+    "@loaders.gl/zip": "4.0.0-alpha.5",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
+    "@math.gl/geoid": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
     "archiver": "^5.0.0",
     "cors": "^2.8.5",
@@ -66,7 +68,7 @@
     "uuid": "^8.1.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "^3.0.0"
+    "@loaders.gl/core": "4.0.0-alpha.4"
   },
-  "gitHead": "53026061b3c8871f7e96d3a5826125cc6613bddc"
+  "gitHead": "7a71a54bdf1ddf985cc3af3db90b82e7fa97d025"
 }

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

@@ -7,6 +7,7 @@ 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 {Geoid} from '@math.gl/geoid';
 
 import {PGMLoader} from '../pgm-loader';
 import {i3sObbTo3dTilesObb} from './helpers/i3s-obb-to-3d-tiles-obb';
@@ -16,7 +17,6 @@ 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 {GeoidHeightModel} from '../lib/geoid-height-model';
 
 const I3S = 'I3S';
 
@@ -28,9 +28,9 @@ export default class Tiles3DConverter {
   tilesetPath: string;
   vertexCounter: number;
   conversionStartTime: [number, number];
-  geoidHeightModel: GeoidHeightModel;
-  sourceTileset: Tileset3D;
-  attributeStorageInfo: AttributeStorageInfo;
+  geoidHeightModel: Geoid | null;
+  sourceTileset: Tileset3D | null;
+  attributeStorageInfo: AttributeStorageInfo | null;
 
   constructor() {
     this.options = {};
@@ -51,7 +51,7 @@ export default class Tiles3DConverter {
    * @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
    */
-  private async convert(options: {
+  public async convert(options: {
     inputUrl: string;
     outputPath: string;
     tilesetName: string;
@@ -67,12 +67,16 @@ export default class Tiles3DConverter {
     console.log('Loading egm file completed!'); // eslint-disable-line
 
     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}
+      }
     });
 
-    if (!this.sourceTileset.root.header.obb) {
-      this.sourceTileset.root.header.obb = createObbFromMbs(this.sourceTileset.root.header.mbs);
+    const rootNode = this.sourceTileset.root!;
+    if (!rootNode.header.obb) {
+      rootNode.header.obb = createObbFromMbs(rootNode.header.mbs);
     }
 
     this.tilesetPath = join(`${outputPath}`, `${tilesetName}`);
@@ -86,15 +90,15 @@ export default class Tiles3DConverter {
 
     const rootTile: Node3D = {
       boundingVolume: {
-        box: i3sObbTo3dTilesObb(this.sourceTileset.root.header.obb, this.geoidHeightModel)
+        box: i3sObbTo3dTilesObb(rootNode.header.obb, this.geoidHeightModel)
       },
-      geometricError: convertScreenThresholdToGeometricError(this.sourceTileset.root),
+      geometricError: convertScreenThresholdToGeometricError(rootNode),
       children: []
     };
 
-    await this._addChildren(this.sourceTileset.root, rootTile, 1);
+    await this._addChildren(rootNode, rootTile, 1);
 
-    const tileset = transform({root: rootTile}, tilesetTemplate);
+    const tileset = transform({root: rootTile}, tilesetTemplate());
     await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
 
     this._finishConversion({slpk: false, outputPath, tilesetName});
@@ -118,10 +122,10 @@ export default class Tiles3DConverter {
       const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
       parentSourceNode.children.push(sourceChild);
       if (sourceChild.contentUrl) {
-        await this.sourceTileset._loadTile(sourceChild);
+        await this.sourceTileset!._loadTile(sourceChild);
         this.vertexCounter += sourceChild.content.vertexCount;
 
-        let attributes = null;
+        let attributes: FeatureAttribute | null = null;
         if (this.attributeStorageInfo) {
           attributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
         }
@@ -163,18 +167,18 @@ export default class Tiles3DConverter {
    */
   private async _loadChildNode(parentNode: Tile3D, childNodeInfo: NodeReference): Promise<Tile3D> {
     let header;
-    if (this.sourceTileset.tileset.nodePages) {
+    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(
+      header = await this.sourceTileset!.tileset.nodePagesTile.formTileFromNodePages(
         childNodeInfo.id
       );
     } else {
-      const {loader} = this.sourceTileset;
-      const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href);
+      const {loader} = this.sourceTileset!;
+      const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href!);
       // load metadata
       const options = {
         i3s: {
-          ...this.sourceTileset.loadOptions,
+          ...this.sourceTileset!.loadOptions,
           isTileHeader: true,
           loadContent: false
         }
@@ -183,7 +187,7 @@ export default class Tiles3DConverter {
       console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef
       header = await load(nodeUrl, loader, options);
     }
-    return new Tile3D(this.sourceTileset, header, parentNode);
+    return new Tile3D(this.sourceTileset!, header, parentNode);
   }
 
   /**
@@ -218,7 +222,7 @@ export default class Tiles3DConverter {
     sourceChild: Tile3D,
     attributeStorageInfo: AttributeStorageInfo
   ): Promise<FeatureAttribute> {
-    const promises = [];
+    const promises: any[] = [];
     const {attributeUrls} = sourceChild.header;
 
     for (let index = 0; index < attributeUrls.length; index++) {

package/src/3d-tiles-converter/helpers/{b3dm-converter.js → b3dm-converter.ts}

@@ -1,7 +1,6 @@
-import {encode, encodeSync} from '@loaders.gl/core';
+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';
@@ -9,8 +8,20 @@ import {convertTextureAtlas} from './texture-atlas';
 const Z_UP_TO_Y_UP_MATRIX = new Matrix4([1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1]);
 const scratchVector = new Vector3();
 
+/**
+ * Converts content of an I3S node to *.b3dm's file content
+ */
 export default class B3dmConverter {
-  async convert(i3sTile, attributes = null) {
+  // @ts-expect-error
+  rtcCenter: Float32Array;
+  i3sTile: any;
+
+  /**
+   * The starter of content conversion
+   * @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);
     const b3dm = encodeSync(
@@ -25,13 +36,19 @@ export default class B3dmConverter {
     return b3dm;
   }
 
-  async buildGltf(i3sTile) {
+  /**
+   * Build and encode gltf
+   * @param i3sTile - Tile3D instance for I3S node
+   * @returns - encoded glb content
+   */
+  async buildGltf(i3sTile): Promise<ArrayBuffer> {
     const {
       material,
       attributes,
       indices: originalIndices,
       cartesianOrigin,
-      cartographicOrigin
+      cartographicOrigin,
+      modelMatrix
     } = i3sTile.content;
     const gltfBuilder = new GLTFScenegraph();
 
@@ -52,7 +69,8 @@ export default class B3dmConverter {
     attributes.positions.value = this._normalizePositions(
       positionsValue,
       cartesianOrigin,
-      cartographicOrigin
+      cartographicOrigin,
+      modelMatrix
     );
     if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
       delete attributes.normals;
@@ -62,7 +80,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});
@@ -97,8 +116,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;
     }
@@ -109,14 +127,18 @@ export default class B3dmConverter {
    * Generate a positions array which is correct for 3DTiles/GLTF format
    * @param {Float64Array} positionsValue - the input geometry positions array
    * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system
+   * @param {number[]} cartographicOrigin - the tile center in the cartographic coordinate system
+   * @param {number[]} modelMatrix - the model matrix of geometry
    * @returns {Float32Array} - the output geometry positions array
    */
-  _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin) {
+  _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix) {
     const newPositionsValue = new Float32Array(positionsValue.length);
     for (let index = 0; index < positionsValue.length; index += 3) {
       const vertex = positionsValue.subarray(index, index + 3);
       const cartesianOriginVector = new Vector3(cartesianOrigin);
-      let vertexVector = new Vector3(Array.from(vertex)).add(cartographicOrigin);
+      let vertexVector = new Vector3(Array.from(vertex))
+        .transform(modelMatrix)
+        .add(cartographicOrigin);
       Ellipsoid.WGS84.cartographicToCartesian(vertexVector, scratchVector);
       vertexVector = scratchVector.subtract(cartesianOriginVector);
       newPositionsValue.set(vertexVector, index);
@@ -187,6 +209,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';

package/src/3d-tiles-converter/helpers/{i3s-obb-to-3d-tiles-obb.js → i3s-obb-to-3d-tiles-obb.ts}

@@ -1,8 +1,23 @@
 import {Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 import {OrientedBoundingBox} from '@math.gl/culling';
+// @ts-expect-error
+import {GeoidHeightModel} from '@loaders.gl/tile-converter/lib/geoid-height-model';
 
-export function i3sObbTo3dTilesObb(i3SObb, geoidHeightModel) {
+/**
+ * Convert quaternion-based OBB to half-axes-based OBB
+ * @param i3SObb quaternion based OBB
+ * @param geoidHeightModel the Earth Gravity Model instance
+ * @returns number[12] 3DTiles OBB https://github.com/CesiumGS/3d-tiles/tree/master/specification#box
+ */
+export function i3sObbTo3dTilesObb(
+  i3SObb: {
+    center: number[];
+    halfSize: number[];
+    quaternion: number[];
+  },
+  geoidHeightModel: GeoidHeightModel
+): number[] {
   const tiles3DCenter = [
     i3SObb.center[0],
     i3SObb.center[1],

package/src/3d-tiles-converter/helpers/texture-atlas.ts

@@ -13,7 +13,7 @@ export function convertTextureAtlas(texCoords: Float32Array, uvRegions: Uint16Ar
     const uv = texCoords.subarray(index, index + 2);
     const regions = normalisedRegions.slice(index * 2, index * 2 + 4);
     // fract(texCoords)
-    const fractatedUV = fract(uv);
+    const fractatedUV = fract([uv[0], uv[1]]);
     // (uvRegions.zw - uvRegions.xy)
     const subtracted = [regions[2] - regions[0], regions[3] - regions[1]];
     // fract(texCoords) * (uvRegions.zw - uvRegions.xy)
@@ -35,7 +35,7 @@ export function convertTextureAtlas(texCoords: Float32Array, uvRegions: Uint16Ar
  * Do fractation of UV array.
  * @param uv
  */
-function fract(uv: number[2]): number[2] {
+function fract(uv: [number, number]): [number, number] {
   return [uv[0] - Math.floor(uv[0]), uv[1] - Math.floor(uv[1])];
 }
 
@@ -43,9 +43,9 @@ function fract(uv: number[2]): number[2] {
  * Normalize uvRegions by dividing by the maximum Uint16 value
  * @param regions
  */
-function normalizeRegions(regions: Uint16Array): number[4] {
+function normalizeRegions(regions: Uint16Array): number[] {
   const MAX_UINT_16_VALUE = 65535;
-  const normalizedRegions = [];
+  const normalizedRegions: number[] = [];
 
   for (let index = 0; index < regions.length; index++) {
     normalizedRegions[index] = regions[index] / MAX_UINT_16_VALUE;

package/src/3d-tiles-converter/json-templates/{tileset.js → tileset.ts}

@@ -1,13 +1,13 @@
 import transform from 'json-map-transform';
 
-const ASSET = {
+const ASSET = () => ({
   version: {
     path: 'version',
     default: '1.0'
   }
-};
+});
 
-const TILE = {
+const TILE = () => ({
   boundingVolume: {
     path: 'boundingVolume'
   },
@@ -19,14 +19,14 @@ const TILE = {
   },
   children: {
     path: 'children',
-    transform: (val) => val.map((tile) => transform(tile, TILE))
+    transform: (val) => val.map((tile) => transform(tile, TILE()))
   }
-};
+});
 
-export const TILESET = {
+export const TILESET = () => ({
   asset: {
     path: 'asset',
-    transform: (val) => transform(val, ASSET)
+    transform: (val) => transform(val, ASSET())
   },
   geometricError: {
     path: 'root',
@@ -34,6 +34,6 @@ export const TILESET = {
   },
   root: {
     path: 'root',
-    transform: (val) => transform(val, TILE)
+    transform: (val) => transform(val, TILE())
   }
-};
+});

package/src/deps-installer/deps-installer.js

@@ -3,12 +3,12 @@ import {ZipLoader} from '@loaders.gl/zip';
 import {writeFile} from '../lib/utils/file-utils';
 import {join} from 'path';
 
-const PGM_LINK = 'https://github.com/visgl/deck.gl-data/raw/master/egm/egm2008-5.zip';
+const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 
 export class DepsInstaller {
   async install(path = '') {
     console.log('Installing "EGM2008-5" model...'); // eslint-disable-line no-console
-    const fileMap = await load(PGM_LINK, ZipLoader, {fetch: {followRedirect: true}});
+    const fileMap = await load(PGM_LINK, ZipLoader, {});
 
     let depsPath = process.cwd();
     if (path) {

package/src/i3s-converter/helpers/coordinate-converter.ts

@@ -2,9 +2,13 @@ import type {BoundingVolumes, Extent, Mbs, Obb} from '@loaders.gl/i3s';
 
 import {Matrix3, Quaternion, Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
-import {OrientedBoundingBox} from '@math.gl/culling';
+import {
+  OrientedBoundingBox,
+  makeOrientedBoundingBoxFromPoints,
+  makeBoundingSphereFromPoints
+} from '@math.gl/culling';
 import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
-import {GeoidHeightModel} from '../../lib/geoid-height-model';
+import {Geoid} from '@math.gl/geoid';
 import {Tileset3D} from '@loaders.gl/tiles';
 
 /**
@@ -13,10 +17,7 @@ import {Tileset3D} from '@loaders.gl/tiles';
  * @param geoidHeightModel
  * @returns - Bounding volumes object
  */
-export function createBoundingVolumes(
-  tile: TileHeader,
-  geoidHeightModel: GeoidHeightModel
-): BoundingVolumes {
+export function createBoundingVolumes(tile: TileHeader, geoidHeightModel: Geoid): BoundingVolumes {
   let radius;
   let halfSize;
   let quaternion;
@@ -51,14 +52,66 @@ export function createBoundingVolumes(
   };
 }
 
+/**
+ * Generates bounding volumes from geometry positions
+ * @param cartesianPositions
+ * @param geoidHeightModel
+ */
+export function createBoundingVolumesFromGeometry(
+  cartesianPositions: Float32Array,
+  geoidHeightModel: Geoid
+): {mbs: Mbs; obb: Obb} {
+  const positionVectors = convertPositionsToVectors(cartesianPositions);
+
+  const geometryObb = makeOrientedBoundingBoxFromPoints(positionVectors);
+  const geometryMbs = makeBoundingSphereFromPoints(positionVectors);
+
+  let mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());
+  let obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());
+
+  mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);
+  obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);
+
+  return {
+    mbs: [mbsCenter[0], mbsCenter[1], mbsCenter[2], geometryMbs.radius],
+    obb: {
+      center: obbCenter,
+      halfSize: geometryObb.halfSize,
+      quaternion: geometryObb.quaternion
+    }
+  };
+}
+
+/**
+ * Create array of posisitons where each vertex is vector
+ * @param {array} positions
+ * @returns {Vector3[]}
+ */
+export function convertPositionsToVectors(positions: Float32Array): Vector3[] {
+  const result: Vector3[] = [];
+
+  for (let i = 0; i < positions.length; i += 3) {
+    // TODO: (perf) new Vector3 is not optimal but required in `makeOrientedBoundingBoxFromPoints`.
+    // modify `makeOrientedBoundingBoxFromPoints` to use scratch vectors
+    const positionVector = new Vector3([positions[i], positions[i + 1], positions[i + 2]]);
+    result.push(positionVector);
+  }
+
+  return result;
+}
+
 /**
  * Convert common coordinate to extent coordinate
  * @param tileset
  * @returns - Extent
+ * @todo why lodMetricValue is radius? need to check this function
  */
-export function convertCommonToI3SExtentCoordinate(tileset: Tileset3D): Extent {
-  const cartesianCenter = tileset.cartesianCenter;
-  const radius = tileset.lodMetricValue;
+export function convertCommonToI3SExtentCoordinate(tileset: Tileset3D | null): Extent | null {
+  const cartesianCenter = tileset?.cartesianCenter;
+  if (!cartesianCenter) {
+    return null;
+  }
+  const radius = tileset?.lodMetricValue;
   const rightTop = Ellipsoid.WGS84.cartesianToCartographic(
     new Vector3(cartesianCenter[0] + radius, cartesianCenter[1] + radius, cartesianCenter[2]),
     new Vector3()

package/src/i3s-converter/helpers/{create-scene-server-path.js → create-scene-server-path.ts}

@@ -2,7 +2,7 @@ import {v4 as uuidv4} from 'uuid';
 import transform from 'json-map-transform';
 import {join} from 'path';
 
-import {SCENE_SERVER_TEMPLATE} from '../json-templates/scene-server';
+import {SCENE_SERVER as sceneServerTemplate} from '../json-templates/scene-server';
 import {writeFile} from '../../lib/utils/file-utils';
 
 /**
@@ -19,7 +19,7 @@ export async function createSceneServerPath(layerName, layers0, rootPath) {
     layers0
   };
 
-  const sceneServer = transform(sceneServerData, SCENE_SERVER_TEMPLATE);
+  const sceneServer = transform(sceneServerData, sceneServerTemplate());
   const nodePagePath = join(rootPath, 'SceneServer');
   await writeFile(nodePagePath, JSON.stringify(sceneServer));
 }

package/src/i3s-converter/helpers/{geometry-attributes.js → geometry-attributes.ts}

@@ -41,8 +41,8 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
   let rangeIndex = 1;
   let featureIndex = 1;
   let currentFeatureId = featureIndices[0];
-  const faceRangeList = [];
-  const featureIds = [];
+  const faceRangeList: any[] = [];
+  const featureIds: any[] = [];
   const uniqueFeatureIds = [currentFeatureId];
 
   faceRangeList[0] = 0;
@@ -79,7 +79,7 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
  */
 function makeAttributeObjects(attributes) {
   const {featureIds, positions, normals, colors, texCoords, faceRange} = attributes;
-  const groupedData = [];
+  const groupedData: any[] = [];
 
   let positionsList = new Float32Array(positions);
   let normalsList = new Float32Array(normals);
@@ -149,7 +149,7 @@ function getSliceAttributeCount(attributeName, startIndex, endIndex) {
  * @returns {Array} - unique list of objects
  */
 function unifyObjectsByFeatureId(sortedData) {
-  const uniqueObjects = [];
+  const uniqueObjects: any[] = [];
 
   for (let index = 0; index < sortedData.length; index++) {
     const currentObject = sortedData[index];