@loaders.gl/tile-converter 4.0.0 → 4.0.2

package/dist/index.cjs

@@ -35,6 +35,218 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/i3s-converter/types.ts
+var AttributeType = {
+  /** Type of attribute that is linked with feature ids */
+  OBJECT_ID_TYPE: "OBJECTID",
+  /** String data type name for feature attributes */
+  STRING_TYPE: "string",
+  /** Double data type name for feature attributes */
+  DOUBLE_TYPE: "double",
+  /** Integer data type name for feature attributes */
+  SHORT_INT_TYPE: "Int32"
+};
+
+// src/i3s-converter/helpers/attribute-metadata-info.ts
+var AttributeMetadataInfo = class {
+  constructor() {
+    this._attributeStorageInfo = [];
+    this._fields = [];
+  }
+  get attributeStorageInfo() {
+    return this._attributeStorageInfo;
+  }
+  get fields() {
+    return this._fields;
+  }
+  get popupInfo() {
+    return this._popupInfo;
+  }
+  /**
+   * Creates and stores Attribute Storage Info, Fields and PopupInfo objects based on attribute's types.
+   * Appends objects that have not been stored yet.
+   * @param attributeTypesMap - set of attribute's types
+   * @example AttributeStorageInfo, Fields and PopupInfo already contain objects for the following attributes:
+   * {
+   *   color: 'string',
+   *   name: 'string',
+   *   opt_uint8: 'Int32'
+   * }
+   * Then, we call the addMetadataInfo method with the following attributeTypesMap:
+   * {
+   *   // The same attributes
+   *   color: 'string',
+   *   name: 'string',
+   *   opt_uint8: 'Int32',
+   *   // New attributes
+   *   opt_uint64: 'string',
+   *   opt_float32: 'double',
+   * }
+   * The method creates and stores objects for opt_uint64, opt_float32 attributes.
+   */
+  addMetadataInfo(attributeTypesMap) {
+    if (!Object.keys(attributeTypesMap).length) {
+      return;
+    }
+    const attributeTypes = {
+      OBJECTID: AttributeType.OBJECT_ID_TYPE,
+      ...attributeTypesMap
+    };
+    let isUpdated = false;
+    let attributeIndex = this._attributeStorageInfo.length;
+    for (const key in attributeTypes) {
+      const elementFound = this._attributeStorageInfo.find((element) => element.name === key);
+      if (!elementFound) {
+        const attributeType = attributeTypes[key];
+        const storageAttribute = this.createStorageAttribute(attributeIndex, key, attributeType);
+        const fieldAttributeType = this.getFieldAttributeType(attributeType);
+        const fieldAttribute = this.createFieldAttribute(key, fieldAttributeType);
+        this._attributeStorageInfo.push(storageAttribute);
+        this._fields.push(fieldAttribute);
+        attributeIndex += 1;
+        isUpdated = true;
+      }
+    }
+    if (isUpdated) {
+      const attributeNames = [];
+      for (let info of this._attributeStorageInfo) {
+        attributeNames.push(info.name);
+      }
+      this._popupInfo = this.createPopupInfo(attributeNames);
+    }
+  }
+  /**
+   * Generates storage attribute for map segmentation.
+   * @param attributeIndex - order index of attribute (f_0, f_1 ...).
+   * @param key - attribute key from propertyTable.
+   * @param attributeType - attribute type.
+   * @return Updated storageAttribute.
+   */
+  createStorageAttribute(attributeIndex, key, attributeType) {
+    const storageAttribute = {
+      key: `f_${attributeIndex}`,
+      name: key,
+      ordering: ["attributeValues"],
+      header: [{ property: "count", valueType: "UInt32" }],
+      attributeValues: { valueType: "Int32", valuesPerElement: 1 }
+    };
+    switch (attributeType) {
+      case AttributeType.OBJECT_ID_TYPE:
+        this.setupIdAttribute(storageAttribute);
+        break;
+      case AttributeType.STRING_TYPE:
+        this.setupStringAttribute(storageAttribute);
+        break;
+      case AttributeType.DOUBLE_TYPE:
+        this.setupDoubleAttribute(storageAttribute);
+        break;
+      case AttributeType.SHORT_INT_TYPE:
+        break;
+      default:
+        this.setupStringAttribute(storageAttribute);
+    }
+    return storageAttribute;
+  }
+  /**
+   * Finds and returns attribute type based on key form propertyTable.
+   * @param attributeType
+   */
+  getFieldAttributeType(attributeType) {
+    switch (attributeType) {
+      case AttributeType.OBJECT_ID_TYPE:
+        return "esriFieldTypeOID";
+      case AttributeType.STRING_TYPE:
+        return "esriFieldTypeString";
+      case AttributeType.SHORT_INT_TYPE:
+        return "esriFieldTypeInteger";
+      case AttributeType.DOUBLE_TYPE:
+        return "esriFieldTypeDouble";
+      default:
+        return "esriFieldTypeString";
+    }
+  }
+  /**
+   * Sets up Id attribute for map segmentation.
+   * @param storageAttribute - attribute for map segmentation .
+   */
+  setupIdAttribute(storageAttribute) {
+    storageAttribute.attributeValues = {
+      valueType: "Oid32",
+      valuesPerElement: 1
+    };
+  }
+  /**
+   * Sets up storage attribute as string.
+   * @param storageAttribute - attribute for map segmentation.
+   */
+  setupStringAttribute(storageAttribute) {
+    storageAttribute.ordering.unshift("attributeByteCounts");
+    storageAttribute.header.push({ property: "attributeValuesByteCount", valueType: "UInt32" });
+    storageAttribute.attributeValues = {
+      valueType: "String",
+      encoding: "UTF-8",
+      valuesPerElement: 1
+    };
+    storageAttribute.attributeByteCounts = {
+      valueType: "UInt32",
+      valuesPerElement: 1
+    };
+  }
+  /**
+   * Sets up double attribute for map segmentation.
+   * @param storageAttribute - attribute for map segmentation .
+   */
+  setupDoubleAttribute(storageAttribute) {
+    storageAttribute.attributeValues = {
+      valueType: "Float64",
+      valuesPerElement: 1
+    };
+  }
+  /**
+   * Sets up field attribute for map segmentation.
+   * @param key - attribute for map segmentation.
+   * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').
+   */
+  createFieldAttribute(key, fieldAttributeType) {
+    return {
+      name: key,
+      type: fieldAttributeType,
+      alias: key
+    };
+  }
+  /**
+   * Generates popup info to show metadata on the map.
+   * @param propertyNames - array of property names including OBJECTID.
+   * @return data for correct rendering of popup.
+   */
+  createPopupInfo(propertyNames) {
+    const title = "{OBJECTID}";
+    const mediaInfos = [];
+    const fieldInfos = [];
+    const popupElements = [];
+    const expressionInfos = [];
+    for (const propertyName of propertyNames) {
+      fieldInfos.push({
+        fieldName: propertyName,
+        visible: true,
+        isEditable: false,
+        label: propertyName
+      });
+    }
+    popupElements.push({
+      fieldInfos,
+      type: "fields"
+    });
+    return {
+      title,
+      mediaInfos,
+      popupElements,
+      fieldInfos,
+      expressionInfos
+    };
+  }
+};
+
 // src/i3s-converter/i3s-converter.ts
 var import_core9 = require("@loaders.gl/core");
 var import_d_tiles2 = require("@loaders.gl/3d-tiles");
@@ -1106,116 +1318,15 @@ function checkPropertiesLength(featureIds, propertyTable) {
   }
   return needFlatten;
 }
-var STRING_TYPE = "string";
-var SHORT_INT_TYPE = "Int32";
-var DOUBLE_TYPE = "double";
-var OBJECT_ID_TYPE = "OBJECTID";
 function getAttributeType(attribute) {
-  if (typeof attribute === STRING_TYPE || typeof attribute === "bigint") {
-    return STRING_TYPE;
+  if (typeof attribute === "string" || typeof attribute === "bigint") {
+    return AttributeType.STRING_TYPE;
   } else if (typeof attribute === "number") {
-    return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;
+    return Number.isInteger(attribute) ? AttributeType.SHORT_INT_TYPE : AttributeType.DOUBLE_TYPE;
   }
-  return STRING_TYPE;
+  return AttributeType.STRING_TYPE;
 }
-function createdStorageAttribute(attributeIndex, key, attributeType) {
-  const storageAttribute = {
-    key: `f_${attributeIndex}`,
-    name: key,
-    ordering: ["attributeValues"],
-    header: [{ property: "count", valueType: "UInt32" }],
-    attributeValues: { valueType: "Int32", valuesPerElement: 1 }
-  };
-  switch (attributeType) {
-    case OBJECT_ID_TYPE:
-      setupIdAttribute(storageAttribute);
-      break;
-    case STRING_TYPE:
-      setupStringAttribute(storageAttribute);
-      break;
-    case DOUBLE_TYPE:
-      setupDoubleAttribute(storageAttribute);
-      break;
-    case SHORT_INT_TYPE:
-      break;
-    default:
-      setupStringAttribute(storageAttribute);
-  }
-  return storageAttribute;
-}
-function getFieldAttributeType(attributeType) {
-  switch (attributeType) {
-    case OBJECT_ID_TYPE:
-      return "esriFieldTypeOID";
-    case STRING_TYPE:
-      return "esriFieldTypeString";
-    case SHORT_INT_TYPE:
-      return "esriFieldTypeInteger";
-    case DOUBLE_TYPE:
-      return "esriFieldTypeDouble";
-    default:
-      return "esriFieldTypeString";
-  }
-}
-function createFieldAttribute(key, fieldAttributeType) {
-  return {
-    name: key,
-    type: fieldAttributeType,
-    alias: key
-  };
-}
-function createPopupInfo(propertyNames) {
-  const title = "{OBJECTID}";
-  const mediaInfos = [];
-  const fieldInfos = [];
-  const popupElements = [];
-  const expressionInfos = [];
-  for (const propertyName of propertyNames) {
-    fieldInfos.push({
-      fieldName: propertyName,
-      visible: true,
-      isEditable: false,
-      label: propertyName
-    });
-  }
-  popupElements.push({
-    fieldInfos,
-    type: "fields"
-  });
-  return {
-    title,
-    mediaInfos,
-    popupElements,
-    fieldInfos,
-    expressionInfos
-  };
-}
-function setupStringAttribute(storageAttribute) {
-  storageAttribute.ordering.unshift("attributeByteCounts");
-  storageAttribute.header.push({ property: "attributeValuesByteCount", valueType: "UInt32" });
-  storageAttribute.attributeValues = {
-    valueType: "String",
-    encoding: "UTF-8",
-    valuesPerElement: 1
-  };
-  storageAttribute.attributeByteCounts = {
-    valueType: "UInt32",
-    valuesPerElement: 1
-  };
-}
-function setupIdAttribute(storageAttribute) {
-  storageAttribute.attributeValues = {
-    valueType: "Oid32",
-    valuesPerElement: 1
-  };
-}
-function setupDoubleAttribute(storageAttribute) {
-  storageAttribute.attributeValues = {
-    valueType: "Float64",
-    valuesPerElement: 1
-  };
-}
-function getAttributeTypesFromPropertyTable(propertyTable) {
+function getAttributeTypesMapFromPropertyTable(propertyTable) {
   const attributeTypesMap = {};
   for (const key in propertyTable) {
     const firstAttribute = propertyTable[key][0];
@@ -1224,7 +1335,7 @@ function getAttributeTypesFromPropertyTable(propertyTable) {
   }
   return attributeTypesMap;
 }
-var getAttributeTypesFromSchema = (gltfJson, metadataClass) => {
+var getAttributeTypesMapFromSchema = (gltfJson, metadataClass) => {
   var _a2, _b, _c, _d, _e, _f, _g, _h;
   const attributeTypesMap = {};
   const extFeatureMetadataSchemaClass = (_d = (_c = (_b = (_a2 = gltfJson.extensions) == null ? void 0 : _a2[import_gltf2.EXT_FEATURE_METADATA]) == null ? void 0 : _b.schema) == null ? void 0 : _c.classes) == null ? void 0 : _d[metadataClass];
@@ -1256,11 +1367,11 @@ var getAttributeTypeFromExtFeatureMetadata = (property) => {
     case "UINT16":
     case "INT32":
     case "UINT32":
-      attributeType = SHORT_INT_TYPE;
+      attributeType = AttributeType.SHORT_INT_TYPE;
       break;
     case "FLOAT32":
     case "FLOAT64":
-      attributeType = DOUBLE_TYPE;
+      attributeType = AttributeType.DOUBLE_TYPE;
       break;
     case "INT64":
     case "UINT64":
@@ -1268,10 +1379,10 @@ var getAttributeTypeFromExtFeatureMetadata = (property) => {
     case "ENUM":
     case "STRING":
     case "ARRAY":
-      attributeType = STRING_TYPE;
+      attributeType = AttributeType.STRING_TYPE;
       break;
     default:
-      attributeType = STRING_TYPE;
+      attributeType = AttributeType.STRING_TYPE;
       break;
   }
   return attributeType;
@@ -1279,7 +1390,7 @@ var getAttributeTypeFromExtFeatureMetadata = (property) => {
 var getAttributeTypeFromExtStructuralMetadata = (property) => {
   let attributeType;
   if (property.array) {
-    attributeType = STRING_TYPE;
+    attributeType = AttributeType.STRING_TYPE;
   } else {
     switch (property.componentType) {
       case "INT8":
@@ -1288,18 +1399,18 @@ var getAttributeTypeFromExtStructuralMetadata = (property) => {
       case "UINT16":
       case "INT32":
       case "UINT32":
-        attributeType = SHORT_INT_TYPE;
+        attributeType = AttributeType.SHORT_INT_TYPE;
         break;
       case "FLOAT32":
       case "FLOAT64":
-        attributeType = DOUBLE_TYPE;
+        attributeType = AttributeType.DOUBLE_TYPE;
         break;
       case "INT64":
       case "UINT64":
-        attributeType = STRING_TYPE;
+        attributeType = AttributeType.STRING_TYPE;
         break;
       default:
-        attributeType = STRING_TYPE;
+        attributeType = AttributeType.STRING_TYPE;
         break;
     }
   }
@@ -1325,10 +1436,10 @@ var DEFAULT_METALLIC_FACTOR = 1;
 var VALUES_PER_VERTEX2 = 3;
 var VALUES_PER_TEX_COORD = 2;
 var VALUES_PER_COLOR_ELEMENT = 4;
-var STRING_TYPE2 = "string";
-var SHORT_INT_TYPE2 = "Int32";
-var DOUBLE_TYPE2 = "Float64";
-var OBJECT_ID_TYPE2 = "Oid32";
+var STRING_TYPE = "string";
+var SHORT_INT_TYPE = "Int32";
+var DOUBLE_TYPE = "Float64";
+var OBJECT_ID_TYPE = "Oid32";
 var BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ["CUSTOM_ATTRIBUTE_2", "_BATCHID", "BATCHID"];
 var scratchVector = new import_core4.Vector3();
 async function convertB3dmToI3sGeometry(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, libraries, metadataClass) {
@@ -2083,14 +2194,14 @@ function convertPropertyTableToAttributeBuffers(featureIds, featureIdsMap, prope
 function generateAttributeBuffer(type, value) {
   let attributeBuffer;
   switch (type) {
-    case OBJECT_ID_TYPE2:
-    case SHORT_INT_TYPE2:
+    case OBJECT_ID_TYPE:
+    case SHORT_INT_TYPE:
       attributeBuffer = generateShortIntegerAttributeBuffer(value);
       break;
-    case DOUBLE_TYPE2:
+    case DOUBLE_TYPE:
       attributeBuffer = generateDoubleAttributeBuffer(value);
       break;
-    case STRING_TYPE2:
+    case STRING_TYPE:
       attributeBuffer = generateStringAttributeBuffer(value);
       break;
     default:
@@ -3675,6 +3786,16 @@ var I3SConverter = class {
       meshTopologyTypes: /* @__PURE__ */ new Set(),
       metadataClasses: /* @__PURE__ */ new Set()
     };
+    /** Total count of tiles in tileset */
+    this.tileCountTotal = 0;
+    /** Count of tiles already converted plus one (refers to the tile currently being converted) */
+    this.tileCountCurrentlyConverting = 0;
+    /**
+     * The number of digits to appear after decimal point in the string representation of the tile count.
+     * It's calculated based on the total count of tiles.
+     */
+    this.numberOfDigitsInPercentage = 0;
+    this.attributeMetadataInfo = new AttributeMetadataInfo();
     this.nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE, this);
     this.options = {};
     this.layers0Path = "";
@@ -3806,8 +3927,10 @@ var I3SConverter = class {
       this.options.maxDepth
     );
     const { meshTopologyTypes, metadataClasses } = this.preprocessData;
+    this.numberOfDigitsInPercentage = this.tileCountTotal > 100 ? Math.ceil(Math.log10(this.tileCountTotal)) - 2 : 0;
     console.log(`------------------------------------------------`);
     console.log(`Preprocess results:`);
+    console.log(`Tile count: ${this.tileCountTotal}`);
     console.log(`glTF mesh topology types: ${Array.from(meshTopologyTypes).join(", ")}`);
     if (metadataClasses.size) {
       console.log(
@@ -3839,6 +3962,7 @@ var I3SConverter = class {
       return null;
     }
     if (sourceTile.id) {
+      this.tileCountTotal++;
       console.log(`[analyze]: ${sourceTile.id}`);
     }
     let tileContent = null;
@@ -3931,6 +4055,12 @@ var I3SConverter = class {
       this.finalizeTile.bind(this),
       this.options.maxDepth
     );
+    this.layers0.attributeStorageInfo = this.attributeMetadataInfo.attributeStorageInfo;
+    this.layers0.fields = this.attributeMetadataInfo.fields;
+    this.layers0.popupInfo = this.attributeMetadataInfo.popupInfo;
+    if (this.attributeMetadataInfo.attributeStorageInfo.length) {
+      this.layers0.layerType = _3D_OBJECT_LAYER_TYPE;
+    }
     this.layers0.materialDefinitions = this.materialDefinitions;
     this.layers0.geometryDefinitions = (0, import_json_map_transform8.default)(
       this.geometryConfigs.map((config) => ({
@@ -4042,7 +4172,13 @@ var I3SConverter = class {
       return traversalProps;
     }
     if (sourceTile.id) {
-      console.log(`[convert]: ${sourceTile.id}`);
+      this.tileCountCurrentlyConverting++;
+      let percentString = "";
+      if (this.tileCountTotal) {
+        const percent = this.tileCountCurrentlyConverting / this.tileCountTotal * 100;
+        percentString = " " + percent.toFixed(this.numberOfDigitsInPercentage);
+      }
+      console.log(`[convert${percentString}%]: ${sourceTile.id}`);
     }
     const { parentNodes, transform: transform11 } = traversalProps;
     let transformationMatrix = transform11.clone();
@@ -4172,7 +4308,6 @@ var I3SConverter = class {
    * @returns - converted node resources
    */
   async _convertResources(sourceTile, transformationMatrix, boundingVolume, tileContent, parentId, propertyTable) {
-    var _a2;
     if (!this.isContentSupported(sourceTile) || !tileContent) {
       return null;
     }
@@ -4188,7 +4323,7 @@ var I3SConverter = class {
       async () => (await this.nodePages.push({ index: 0, obb: draftObb }, parentId)).index,
       propertyTable,
       this.featuresHashArray,
-      (_a2 = this.layers0) == null ? void 0 : _a2.attributeStorageInfo,
+      this.attributeMetadataInfo.attributeStorageInfo,
       this.options.draco,
       this.generateBoundingVolumes,
       this.options.mergeMaterials,
@@ -4439,11 +4574,10 @@ var I3SConverter = class {
    * @param slpkChildPath - the resource path inside *slpk file
    */
   async _writeAttributes(attributes = [], childPath, slpkChildPath) {
-    var _a2, _b;
-    if ((attributes == null ? void 0 : attributes.length) && ((_b = (_a2 = this.layers0) == null ? void 0 : _a2.attributeStorageInfo) == null ? void 0 : _b.length)) {
-      const minimumLength = attributes.length < this.layers0.attributeStorageInfo.length ? attributes.length : this.layers0.attributeStorageInfo.length;
+    if ((attributes == null ? void 0 : attributes.length) && this.attributeMetadataInfo.attributeStorageInfo.length) {
+      const minimumLength = attributes.length < this.attributeMetadataInfo.attributeStorageInfo.length ? attributes.length : this.attributeMetadataInfo.attributeStorageInfo.length;
       for (let index = 0; index < minimumLength; index++) {
-        const folderName = this.layers0.attributeStorageInfo[index].key;
+        const folderName = this.attributeMetadataInfo.attributeStorageInfo[index].key;
         const fileBuffer = new Uint8Array(attributes[index]);
         if (this.options.slpk) {
           const slpkAttributesPath = (0, import_path7.join)(childPath, "attributes", folderName);
@@ -4515,55 +4649,17 @@ var I3SConverter = class {
   createAttributeStorageInfo(tileContent, propertyTable) {
     let attributeTypesMap = null;
     if (this.options.metadataClass) {
-      if (!this.layers0.attributeStorageInfo.length && (tileContent == null ? void 0 : tileContent.gltf)) {
-        attributeTypesMap = getAttributeTypesFromSchema(
+      if (!this.attributeMetadataInfo.attributeStorageInfo.length && (tileContent == null ? void 0 : tileContent.gltf)) {
+        attributeTypesMap = getAttributeTypesMapFromSchema(
           tileContent.gltf,
           this.options.metadataClass
         );
       }
     } else if (propertyTable) {
-      attributeTypesMap = getAttributeTypesFromPropertyTable(propertyTable);
+      attributeTypesMap = getAttributeTypesMapFromPropertyTable(propertyTable);
     }
     if (attributeTypesMap) {
-      this.createStorageAttributes(attributeTypesMap);
-    }
-  }
-  /**
-   * Creates Attribute Storage Info objects based on attribute's types
-   * @param attributeTypesMap - set of attribute's types
-   */
-  createStorageAttributes(attributeTypesMap) {
-    if (!Object.keys(attributeTypesMap).length) {
-      return;
-    }
-    const attributeTypes = {
-      OBJECTID: "OBJECTID",
-      ...attributeTypesMap
-    };
-    let isUpdated = false;
-    let attributeIndex = this.layers0.attributeStorageInfo.length;
-    for (const key in attributeTypes) {
-      const elementFound = this.layers0.attributeStorageInfo.find(
-        (element) => element.name === key
-      );
-      if (!elementFound) {
-        const attributeType = attributeTypes[key];
-        const storageAttribute = createdStorageAttribute(attributeIndex, key, attributeType);
-        const fieldAttributeType = getFieldAttributeType(attributeType);
-        const fieldAttribute = createFieldAttribute(key, fieldAttributeType);
-        this.layers0.attributeStorageInfo.push(storageAttribute);
-        this.layers0.fields.push(fieldAttribute);
-        attributeIndex += 1;
-        isUpdated = true;
-      }
-    }
-    if (isUpdated) {
-      const attributeNames = [];
-      for (let info of this.layers0.attributeStorageInfo) {
-        attributeNames.push(info.name);
-      }
-      this.layers0.popupInfo = createPopupInfo(attributeNames);
-      this.layers0.layerType = _3D_OBJECT_LAYER_TYPE;
+      this.attributeMetadataInfo.addMetadataInfo(attributeTypesMap);
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -52,18 +52,18 @@
     "build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/i3s-server/bin/i3s-server.min.cjs --platform=node --target=esnext,node14 --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.0.0",
-    "@loaders.gl/crypto": "4.0.0",
-    "@loaders.gl/draco": "4.0.0",
-    "@loaders.gl/gltf": "4.0.0",
-    "@loaders.gl/i3s": "4.0.0",
-    "@loaders.gl/images": "4.0.0",
-    "@loaders.gl/loader-utils": "4.0.0",
-    "@loaders.gl/polyfills": "4.0.0",
-    "@loaders.gl/textures": "4.0.0",
-    "@loaders.gl/tiles": "4.0.0",
-    "@loaders.gl/worker-utils": "4.0.0",
-    "@loaders.gl/zip": "4.0.0",
+    "@loaders.gl/3d-tiles": "4.0.2",
+    "@loaders.gl/crypto": "4.0.2",
+    "@loaders.gl/draco": "4.0.2",
+    "@loaders.gl/gltf": "4.0.2",
+    "@loaders.gl/i3s": "4.0.2",
+    "@loaders.gl/images": "4.0.2",
+    "@loaders.gl/loader-utils": "4.0.2",
+    "@loaders.gl/polyfills": "4.0.2",
+    "@loaders.gl/textures": "4.0.2",
+    "@loaders.gl/tiles": "4.0.2",
+    "@loaders.gl/worker-utils": "4.0.2",
+    "@loaders.gl/zip": "4.0.2",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -81,13 +81,13 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-beta.6"
+    "@loaders.gl/core": "^4.0.0"
   },
   "quarantinedDependencies": {
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "9b4211dc0ecd4134a1638ac0a29c5ea9008fd971",
+  "gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806",
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.4.2"