@loaders.gl/tile-converter 4.3.0-alpha.7 → 4.3.0-alpha.8

package/dist/deps-installer/deps-installer.js

@@ -9,7 +9,7 @@ import { ChildProcessProxy } from '@loaders.gl/worker-utils';
 import { DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS } from '@loaders.gl/draco';
 import { BASIS_EXTERNAL_LIBRARIES } from '@loaders.gl/textures';
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.6" !== 'undefined' ? "4.3.0-alpha.6" : 'latest';
+const VERSION = typeof "4.3.0-alpha.7" !== 'undefined' ? "4.3.0-alpha.7" : 'latest';
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 /**
  * Install external dependencies for converter:

package/dist/i3s-converter/i3s-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}

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

@@ -38,6 +38,7 @@ import { analyzeTileContent, mergePreprocessData } from "./helpers/preprocess-3d
 import { Progress } from "./helpers/progress.js";
 import { composeHashFile, createZip } from '@loaders.gl/zip';
 import { ConversionDump } from "../lib/utils/conversion-dump.js";
+// eslint-disable-next-line no-process-env
 const ION_DEFAULT_TOKEN = process.env?.IonToken;
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';

package/dist/i3s-server/bin/www.js

@@ -11,12 +11,14 @@ import { formErrorHandler, formListeningHandler, normalizePort } from "../utils/
 // const __filename = fileURLToPath(import.meta.url);
 // const __dirname = path.dirname(__filename);
 /** Get port from environment and store in Express. */
+// eslint-disable-next-line no-process-env
 const httpPort = normalizePort(process.env.PORT || '80');
 if (httpPort === false) {
     // eslint-disable-next-line no-console
     console.error('Incorrect HTTP port');
     process.exit(1); // eslint-disable-line no-process-exit
 }
+// eslint-disable-next-line no-process-env
 const httpsPort = normalizePort(process.env.HTTPS_PORT || '443');
 if (httpsPort === false) {
     // eslint-disable-next-line no-console

package/dist/index.cjs

@@ -2325,7 +2325,7 @@ function convertScreenThresholdToGeometricError(node) {
 
 // dist/pgm-loader.js
 var import_geoid = require("@math.gl/geoid");
-var VERSION = true ? "4.3.0-alpha.6" : "latest";
+var VERSION = true ? "4.3.0-alpha.7" : "latest";
 var PGMLoader = {
   dataType: null,
   batchType: null,
@@ -4024,7 +4024,7 @@ var ConversionDump = class {
    * @param currentOptions - converter options
    */
   async createDump(currentOptions) {
-    const { tilesetName, slpk, egmFilePath, inputUrl, outputPath, draco = true, maxDepth, token, generateTextures, generateBoundingVolumes, mergeMaterials: mergeMaterials2 = true, metadataClass, analyze = false } = currentOptions;
+    const { tilesetName, slpk, egmFilePath, inputUrl, outputPath, draco = true, maxDepth, token, generateTextures, generateBoundingVolumes, mergeMaterials: mergeMaterials2 = true, metadataClass, analyze = false, outputVersion = "1.1" } = currentOptions;
     this.options = {
       tilesetName,
       slpk,
@@ -4038,7 +4038,8 @@ var ConversionDump = class {
       generateBoundingVolumes,
       mergeMaterials: mergeMaterials2,
       metadataClass,
-      analyze
+      analyze,
+      outputVersion
     };
     const dumpFilename = (0, import_path6.join)(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`);
     if (await isFileExists(dumpFilename)) {
@@ -5411,11 +5412,13 @@ var TILESET = () => ({
 // dist/3d-tiles-converter/3d-tiles-converter.js
 var import_worker_utils2 = require("@loaders.gl/worker-utils");
 
-// dist/3d-tiles-converter/helpers/b3dm-converter.js
+// dist/3d-tiles-converter/helpers/3d-tiles-content-converter.js
 var import_core12 = require("@loaders.gl/core");
 var import_gltf6 = require("@loaders.gl/gltf");
 var import_d_tiles3 = require("@loaders.gl/3d-tiles");
+var import_d_tiles4 = require("@loaders.gl/3d-tiles");
 var import_core13 = require("@math.gl/core");
+var import_types5 = require("@math.gl/types");
 var import_geospatial6 = require("@math.gl/geospatial");
 
 // dist/3d-tiles-converter/helpers/texture-atlas.js
@@ -5449,38 +5452,45 @@ function normalizeRegions(regions) {
   return normalizedRegions;
 }
 
-// dist/3d-tiles-converter/helpers/b3dm-converter.js
+// dist/3d-tiles-converter/helpers/3d-tiles-content-converter.js
 var Z_UP_TO_Y_UP_MATRIX = new import_core13.Matrix4([1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1]);
 var scratchVector2 = new import_core13.Vector3();
 var KHR_MATERIALS_UNLIT = "KHR_materials_unlit";
 var METALLIC_FACTOR_DEFAULT = 1;
 var ROUGHNESS_FACTOR_DEFAULT = 1;
-var B3dmConverter = class {
+var Tiles3DContentConverter = class {
   // @ts-expect-error
   rtcCenter;
   i3sTile;
+  tileType;
+  constructor(options = { outputVersion: "1.1" }) {
+    this.tileType = options.outputVersion === "1.0" ? import_d_tiles4.TILE3D_TYPE.BATCHED_3D_MODEL : import_d_tiles4.TILE3D_TYPE.GLTF;
+  }
   /**
    * The starter of content conversion
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded content
    */
-  async convert(i3sAttributesData, featureAttributes = null) {
-    const gltf = await this.buildGLTF(i3sAttributesData, featureAttributes);
-    const b3dm = (0, import_core12.encodeSync)({
-      gltfEncoded: new Uint8Array(gltf),
-      type: "b3dm",
-      featuresLength: this._getFeaturesLength(featureAttributes),
-      batchTable: featureAttributes
-    }, import_d_tiles3.Tile3DWriter);
-    return b3dm;
+  async convert(i3sAttributesData, featureAttributes = null, attributeStorageInfo) {
+    const gltf = await this.buildGLTF(i3sAttributesData, featureAttributes, attributeStorageInfo);
+    if (this.tileType === import_d_tiles4.TILE3D_TYPE.BATCHED_3D_MODEL) {
+      const b3dm = (0, import_core12.encodeSync)({
+        gltfEncoded: new Uint8Array(gltf),
+        type: "b3dm",
+        featuresLength: this._getFeaturesLength(featureAttributes),
+        batchTable: featureAttributes
+      }, import_d_tiles3.Tile3DWriter);
+      return b3dm;
+    }
+    return gltf;
   }
   /**
    * Build and encode gltf
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded glb content
    */
-  // eslint-disable-next-line max-statements
-  async buildGLTF(i3sAttributesData, featureAttributes) {
+  // eslint-disable-next-line complexity, max-statements
+  async buildGLTF(i3sAttributesData, featureAttributes, attributeStorageInfo) {
     const { tileContent, textureFormat, box } = i3sAttributesData;
     const { material, attributes, indices: originalIndices, modelMatrix } = tileContent;
     const gltfBuilder = new import_gltf6.GLTFScenegraph();
@@ -5511,13 +5521,97 @@ var B3dmConverter = class {
       material: materialIndex,
       mode: 4
     });
+    if (this.tileType === import_d_tiles4.TILE3D_TYPE.GLTF) {
+      this._createMetadataExtensions(gltfBuilder, meshIndex, featureAttributes, attributeStorageInfo, tileContent);
+    }
     const transformMatrix = this._generateTransformMatrix(cartesianOrigin);
     const nodeIndex = gltfBuilder.addNode({ meshIndex, matrix: transformMatrix });
     const sceneIndex = gltfBuilder.addScene({ nodeIndices: [nodeIndex] });
     gltfBuilder.setDefaultScene(sceneIndex);
     gltfBuilder.createBinaryChunk();
-    const gltfBuffer = (0, import_core12.encodeSync)(gltfBuilder.gltf, import_gltf6.GLTFWriter);
-    return gltfBuffer;
+    return (0, import_core12.encodeSync)(gltfBuilder.gltf, import_gltf6.GLTFWriter, { gltfBuilder });
+  }
+  _createMetadataExtensions(gltfBuilder, meshIndex, featureAttributes, attributeStorageInfo, tileContent) {
+    var _a2;
+    const propertyAttributes = this._createPropertyAttibutes(featureAttributes, attributeStorageInfo);
+    const tableIndex = (0, import_gltf6.createExtStructuralMetadata)(gltfBuilder, propertyAttributes);
+    const mesh = gltfBuilder.getMesh(meshIndex);
+    for (const primitive of mesh.primitives) {
+      if ((_a2 = tileContent.attributes._BATCHID) == null ? void 0 : _a2.value) {
+        (0, import_gltf6.createExtMeshFeatures)(gltfBuilder, primitive, tileContent.attributes._BATCHID.value, tableIndex);
+      }
+    }
+  }
+  _createPropertyAttibutes(featureAttributes, attributeStorageInfo) {
+    if (!featureAttributes || !attributeStorageInfo) {
+      return [];
+    }
+    const propertyAttributeArray = [];
+    for (const attributeName in featureAttributes) {
+      const propertyAttribute = this._convertAttributeStorageInfoToPropertyAttribute(attributeName, attributeStorageInfo, featureAttributes);
+      if (propertyAttribute) {
+        propertyAttributeArray.push(propertyAttribute);
+      }
+    }
+    return propertyAttributeArray;
+  }
+  // eslint-disable-next-line complexity
+  _convertAttributeStorageInfoToPropertyAttribute(attributeName, attributeStorageInfo, featureAttributes) {
+    const attributeValues = featureAttributes[attributeName];
+    const info = attributeStorageInfo.find((e) => e.name === attributeName);
+    if (!info) {
+      return null;
+    }
+    const attributeMetadata = info.attributeValues;
+    if (!(attributeMetadata == null ? void 0 : attributeMetadata.valueType)) {
+      return null;
+    }
+    let elementType;
+    let componentType;
+    switch (attributeMetadata.valueType.toLowerCase()) {
+      case "oid32":
+        elementType = "SCALAR";
+        componentType = "UINT32";
+        break;
+      case "int32":
+        elementType = "SCALAR";
+        componentType = "INT32";
+        break;
+      case "uint32":
+        elementType = "SCALAR";
+        componentType = "UINT32";
+        break;
+      case "int16":
+        elementType = "SCALAR";
+        componentType = "INT16";
+        break;
+      case "uint16":
+        elementType = "SCALAR";
+        componentType = "UINT16";
+        break;
+      case "float64":
+        elementType = "SCALAR";
+        componentType = "FLOAT64";
+        break;
+      case "string":
+        elementType = "STRING";
+        break;
+      default:
+        elementType = "";
+        break;
+    }
+    const propertyAttribute = {
+      name: attributeName,
+      elementType,
+      componentType,
+      values: []
+    };
+    if ((0, import_types5.isTypedArray)(attributeValues)) {
+      propertyAttribute.values = Array.from(attributeValues);
+    } else if (attributeValues !== null) {
+      propertyAttribute.values = attributeValues;
+    }
+    return propertyAttribute;
   }
   /**
    * Update gltfBuilder with texture from I3S tile
@@ -5806,6 +5900,7 @@ var Tiles3DConverter = class {
   };
   conversionDump;
   progress;
+  fileExt;
   constructor() {
     this.options = {};
     this.tilesetPath = "";
@@ -5817,12 +5912,14 @@ var Tiles3DConverter = class {
     this.workerSource = {};
     this.conversionDump = new ConversionDump();
     this.progress = new Progress();
+    this.fileExt = "";
   }
   /**
    * 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.outputVersion the version of 3DTiles
    * @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
@@ -5834,9 +5931,10 @@ var Tiles3DConverter = class {
       console.log(BROWSER_ERROR_MESSAGE);
       return BROWSER_ERROR_MESSAGE;
     }
-    const { inputUrl, outputPath, tilesetName, maxDepth, egmFilePath, inquirer, analyze } = options;
+    const { inputUrl, outputPath, outputVersion, tilesetName, maxDepth, egmFilePath, inquirer, analyze } = options;
     this.conversionStartTime = import_process5.default.hrtime();
-    this.options = { maxDepth, inquirer };
+    this.options = { maxDepth, inquirer, outputVersion };
+    this.fileExt = this.options.outputVersion === "1.0" ? "b3dm" : "glb";
     console.log("Loading egm file...");
     this.geoidHeightModel = await (0, import_core15.load)(egmFilePath, PGMLoader);
     console.log("Loading egm file completed!");
@@ -5891,7 +5989,7 @@ var Tiles3DConverter = class {
       refine: "REPLACE"
     };
     await this._addChildren(rootNode, rootTile, 1);
-    const tileset = (0, import_json_map_transform10.default)({ root: rootTile }, TILESET());
+    const tileset = (0, import_json_map_transform10.default)({ asset: { version: outputVersion }, root: rootTile }, TILESET());
     await writeFile(this.tilesetPath, JSON.stringify(tileset), "tileset.json");
     await this.conversionDump.deleteDumpFile();
     this.progress.stopMonitoring();
@@ -5938,7 +6036,7 @@ var Tiles3DConverter = class {
     let nextParentNode = parentNode;
     const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
     if (sourceChild.contentUrl) {
-      if (this.conversionDump.restored && this.conversionDump.isFileConversionComplete(`${sourceChild.id}.b3dm`) && (sourceChild.obb || sourceChild.mbs)) {
+      if (this.conversionDump.restored && this.conversionDump.isFileConversionComplete(`${sourceChild.id}.${this.fileExt}`) && (sourceChild.obb || sourceChild.mbs)) {
         const { child: child2 } = this._createChildAndBoundingVolume(sourceChild);
         parentNode.children.push(child2);
         await this._addChildren(sourceChild, child2, level + 1);
@@ -5960,11 +6058,11 @@ var Tiles3DConverter = class {
         box: boundingVolume.box || [],
         textureFormat: sourceChild.textureFormat
       };
-      const b3dmConverter = new B3dmConverter();
-      const b3dm = await b3dmConverter.convert(i3sAttributesData, featureAttributes);
-      await this.conversionDump.addNode(`${sourceChild.id}.b3dm`, sourceChild.id);
-      await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
-      await this.conversionDump.updateConvertedNodesDumpFile(`${sourceChild.id}.b3dm`, sourceChild.id, true);
+      const converter = new Tiles3DContentConverter({ outputVersion: this.options.outputVersion });
+      const contentData = await converter.convert(i3sAttributesData, featureAttributes, this.attributeStorageInfo);
+      await this.conversionDump.addNode(`${sourceChild.id}.${this.fileExt}`, sourceChild.id);
+      await writeFile(this.tilesetPath, new Uint8Array(contentData), `${sourceChild.id}.${this.fileExt}`);
+      await this.conversionDump.updateConvertedNodesDumpFile(`${sourceChild.id}.${this.fileExt}`, sourceChild.id, true);
       parentNode.children.push(child);
       nextParentNode = child;
     }
@@ -6037,7 +6135,7 @@ var Tiles3DConverter = class {
       geometricError: convertScreenThresholdToGeometricError(sourceChild),
       children: [],
       content: {
-        uri: `${sourceChild.id}.b3dm`,
+        uri: `${sourceChild.id}.${this.fileExt}`,
         boundingVolume
       }
     };