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

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/i3s-server/utils/server-utils.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import type { Server as HttpsServer } from 'https';
 import type { Server as HttpServer } from 'http';
 /**

package/dist/i3s-server/utils/server-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-utils.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/server-utils.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAK/C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAclE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,GAAG,MAAM,GAE5B,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,IAAI,CAuBxC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,IAAI,CAMzF"}
+{"version":3,"file":"server-utils.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/server-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAK/C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAclE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,GAAG,MAAM,GAE5B,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,IAAI,CAuBxC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,IAAI,CAMzF"}

package/dist/index.cjs

@@ -1109,8 +1109,8 @@ function prepareNodes(nodes) {
 }
 
 // dist/i3s-converter/helpers/batch-ids-extensions.js
-var import_math = require("@loaders.gl/math");
 var import_gltf = require("@loaders.gl/gltf");
+var import_math = require("@loaders.gl/math");
 function getTextureByMetadataClass(tileContent, metadataClass) {
   var _a2, _b;
   const extFeatureMetadata = (_b = (_a2 = tileContent.gltf) == null ? void 0 : _a2.extensions) == null ? void 0 : _b[import_gltf.EXT_FEATURE_METADATA];
@@ -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.8" : "latest";
 var PGMLoader = {
   dataType: null,
   batchType: null,
@@ -3486,7 +3486,6 @@ var traverseDatasetWith = async ({ tile, traversalProps, processTile, postproces
 // dist/i3s-converter/helpers/preprocess-3d-tiles.js
 var import_gltf4 = require("@loaders.gl/gltf");
 var import_core8 = require("@loaders.gl/core");
-var import_gltf5 = require("@loaders.gl/gltf");
 var GLTF_PRIMITIVE_MODES = [
   GLTFPrimitiveModeString.POINTS,
   // 0
@@ -3541,7 +3540,7 @@ var getMeshTypesFromGLTF = (gltfJson) => {
 var getMetadataClassesFromGLTF = (gltfJson) => {
   var _a2, _b, _c, _d, _e, _f;
   const result = /* @__PURE__ */ new Set();
-  const extFeatureMetadataClasses = (_c = (_b = (_a2 = gltfJson.extensions) == null ? void 0 : _a2[import_gltf5.EXT_FEATURE_METADATA]) == null ? void 0 : _b.schema) == null ? void 0 : _c.classes;
+  const extFeatureMetadataClasses = (_c = (_b = (_a2 = gltfJson.extensions) == null ? void 0 : _a2[import_gltf4.EXT_FEATURE_METADATA]) == null ? void 0 : _b.schema) == null ? void 0 : _c.classes;
   if (extFeatureMetadataClasses) {
     for (const classKey of Object.keys(extFeatureMetadataClasses)) {
       result.add(classKey);
@@ -4024,7 +4023,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 +4037,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 +5411,12 @@ 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_gltf5 = require("@loaders.gl/gltf");
 var import_d_tiles3 = 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,41 +5450,48 @@ 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_tiles3.TILE3D_TYPE.BATCHED_3D_MODEL : import_d_tiles3.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_tiles3.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();
+    const gltfBuilder = new import_gltf5.GLTFScenegraph();
     const textureIndex = await this._addI3sTextureToGLTF(tileContent, textureFormat, gltfBuilder);
     const pbrMetallicRoughness = material == null ? void 0 : material.pbrMetallicRoughness;
     if (pbrMetallicRoughness && (pbrMetallicRoughness.metallicFactor === void 0 || pbrMetallicRoughness.metallicFactor === METALLIC_FACTOR_DEFAULT) && (pbrMetallicRoughness.roughnessFactor === void 0 || pbrMetallicRoughness.roughnessFactor === ROUGHNESS_FACTOR_DEFAULT)) {
@@ -5511,13 +5519,97 @@ var B3dmConverter = class {
       material: materialIndex,
       mode: 4
     });
+    if (this.tileType === import_d_tiles3.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_gltf5.GLTFWriter, { gltfBuilder });
+  }
+  _createMetadataExtensions(gltfBuilder, meshIndex, featureAttributes, attributeStorageInfo, tileContent) {
+    var _a2;
+    const propertyAttributes = this._createPropertyAttibutes(featureAttributes, attributeStorageInfo);
+    const tableIndex = (0, import_gltf5.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_gltf5.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 +5898,7 @@ var Tiles3DConverter = class {
   };
   conversionDump;
   progress;
+  fileExt;
   constructor() {
     this.options = {};
     this.tilesetPath = "";
@@ -5817,12 +5910,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 +5929,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 +5987,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 +6034,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 +6056,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 +6133,7 @@ var Tiles3DConverter = class {
       geometricError: convertScreenThresholdToGeometricError(sourceChild),
       children: [],
       content: {
-        uri: `${sourceChild.id}.b3dm`,
+        uri: `${sourceChild.id}.${this.fileExt}`,
         boundingVolume
       }
     };