@loaders.gl/tile-converter 4.0.0-alpha.12 → 4.0.0-alpha.13

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

@@ -1 +1 @@
-{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAY/E,OAAO,EAAU,OAAO,EAAU,MAAM,eAAe,CAAC;AAUxD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,+DAA+D;AAC/D,OAAO,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AAarC,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AA0BrE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,mBAAmB,GAAG,cAAc,EACxD,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA8DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AA4pCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI,GAAG,gBAAgB,GAAG,IAAI,CAwBhG"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAW/E,OAAO,EAAU,OAAO,EAAU,MAAM,eAAe,CAAC;AAUxD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,+DAA+D;AAC/D,OAAO,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AAarC,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AA0BrE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,mBAAmB,GAAG,cAAc,EACxD,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA8DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AA4pCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI,GAAG,gBAAgB,GAAG,IAAI,CAwBhG"}

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

@@ -1178,6 +1178,9 @@ function getPropertyTableExtension(tileContent) {
             break;
         }
     }
+    if (!extensionName) {
+        return { extensionName: null, extension: null };
+    }
     const extension = tileContent?.gltf?.extensions?.[extensionName];
     return { extensionName, extension };
 }

package/dist/i3s-converter/types.js

@@ -14,4 +14,4 @@ var GltfPrimitiveModeString;
     GltfPrimitiveModeString["TRIANGLES"] = "TRIANGLES";
     GltfPrimitiveModeString["TRIANGLE_STRIP"] = "TRIANGLE_STRIP";
     GltfPrimitiveModeString["TRIANGLE_FAN"] = "TRIANGLE_FAN";
-})(GltfPrimitiveModeString = exports.GltfPrimitiveModeString || (exports.GltfPrimitiveModeString = {}));
+})(GltfPrimitiveModeString || (exports.GltfPrimitiveModeString = GltfPrimitiveModeString = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.0.0-alpha.12",
+  "version": "4.0.0-alpha.13",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -46,18 +46,18 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.0.0-alpha.12",
-    "@loaders.gl/crypto": "4.0.0-alpha.12",
-    "@loaders.gl/draco": "4.0.0-alpha.12",
-    "@loaders.gl/gltf": "4.0.0-alpha.12",
-    "@loaders.gl/i3s": "4.0.0-alpha.12",
-    "@loaders.gl/images": "4.0.0-alpha.12",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.12",
-    "@loaders.gl/polyfills": "4.0.0-alpha.12",
-    "@loaders.gl/textures": "4.0.0-alpha.12",
-    "@loaders.gl/tiles": "4.0.0-alpha.12",
-    "@loaders.gl/worker-utils": "4.0.0-alpha.12",
-    "@loaders.gl/zip": "4.0.0-alpha.12",
+    "@loaders.gl/3d-tiles": "4.0.0-alpha.13",
+    "@loaders.gl/crypto": "4.0.0-alpha.13",
+    "@loaders.gl/draco": "4.0.0-alpha.13",
+    "@loaders.gl/gltf": "4.0.0-alpha.13",
+    "@loaders.gl/i3s": "4.0.0-alpha.13",
+    "@loaders.gl/images": "4.0.0-alpha.13",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.13",
+    "@loaders.gl/polyfills": "4.0.0-alpha.13",
+    "@loaders.gl/textures": "4.0.0-alpha.13",
+    "@loaders.gl/tiles": "4.0.0-alpha.13",
+    "@loaders.gl/worker-utils": "4.0.0-alpha.13",
+    "@loaders.gl/zip": "4.0.0-alpha.13",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geoid": "^3.5.1",
@@ -80,5 +80,5 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "42dfc47a41e3e6089eec22a1e1d4f3387e0cb6e9"
+  "gitHead": "32421ea66db35040f1026be734a7ec9f905ecab7"
 }

package/src/i3s-converter/helpers/batch-ids-extensions.ts

@@ -1,8 +1,8 @@
 import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';
 import type {NumericArray} from '@loaders.gl/loader-utils';
 import type {
-  GLTF_EXT_feature_metadata_attribute,
-  GLTF_EXT_feature_metadata_primitive
+  GLTF_EXT_feature_metadata_FeatureIdTexture,
+  GLTF_EXT_feature_metadata_Primitive
 } from '@loaders.gl/gltf';
 import {TypedArray} from '@math.gl/core';
 import {TextureImageProperties} from '../../i3s-attributes-worker';
@@ -34,7 +34,7 @@ export function handleBatchIdsExtensions(
       case EXT_FEATURE_METADATA:
         return handleExtFeatureMetadataExtension(
           attributes,
-          extensionData as GLTF_EXT_feature_metadata_primitive,
+          extensionData as GLTF_EXT_feature_metadata_Primitive,
           images
         );
       case EXT_MESH_FEATURES:
@@ -59,7 +59,7 @@ function handleExtFeatureMetadataExtension(
   attributes: {
     [key: string]: GLTFAccessorPostprocessed;
   },
-  extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,
+  extFeatureMetadata: GLTF_EXT_feature_metadata_Primitive,
   images: (TextureImageProperties | null)[]
 ): NumericArray {
   // Take only first extension object to get batchIds attribute name.
@@ -146,7 +146,7 @@ function generateImplicitFeatureIds(
  * @param featureIdTextures
  */
 function generateBatchIdsFromTexture(
-  featureIdTexture: GLTF_EXT_feature_metadata_attribute,
+  featureIdTexture: GLTF_EXT_feature_metadata_FeatureIdTexture,
   textureCoordinates: TypedArray,
   images: (TextureImageProperties | null)[]
 ) {

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

@@ -1,13 +1,12 @@
 import type {FeatureTableJson, Tiles3DTileContent} from '@loaders.gl/3d-tiles';
 import type {
-  GLTF_EXT_feature_metadata,
-  GLTF_EXT_mesh_features,
   GLTFAccessorPostprocessed,
   GLTFMaterialPostprocessed,
   GLTFNodePostprocessed,
   GLTFMeshPrimitivePostprocessed,
   GLTFMeshPostprocessed,
-  GLTFTexturePostprocessed
+  GLTFTexturePostprocessed,
+  GLTF_EXT_feature_metadata_GLTF
 } from '@loaders.gl/gltf';
 
 import {Vector3, Matrix4, Vector4} from '@math.gl/core';
@@ -1577,7 +1576,7 @@ export function getPropertyTable(tileContent: Tiles3DTileContent | null): Featur
       return null;
     }
     case EXT_FEATURE_METADATA: {
-      return getPropertyTableFromExtFeatureMetadata(extension as GLTF_EXT_feature_metadata);
+      return getPropertyTableFromExtFeatureMetadata(extension as GLTF_EXT_feature_metadata_GLTF);
     }
     default:
       return null;
@@ -1588,9 +1587,10 @@ export function getPropertyTable(tileContent: Tiles3DTileContent | null): Featur
  * Check extensions which can be with property table inside.
  * @param tileContent - 3DTiles tile content
  */
-function getPropertyTableExtension(
-  tileContent: Tiles3DTileContent
-): GLTF_EXT_feature_metadata | GLTF_EXT_mesh_features {
+function getPropertyTableExtension(tileContent: Tiles3DTileContent): {
+  extensionName: null | string;
+  extension: string | GLTF_EXT_feature_metadata_GLTF | null;
+} {
   const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
   const extensionsUsed = tileContent?.gltf?.extensionsUsed;
 
@@ -1599,7 +1599,6 @@ function getPropertyTableExtension(
   }
 
   let extensionName: string = '';
-
   for (const extensionItem of tileContent?.gltf?.extensionsUsed || []) {
     if (extensionsWithPropertyTables.includes(extensionItem)) {
       extensionName = extensionItem;
@@ -1607,7 +1606,13 @@ function getPropertyTableExtension(
     }
   }
 
-  const extension = tileContent?.gltf?.extensions?.[extensionName];
+  if (!extensionName) {
+    return {extensionName: null, extension: null};
+  }
+
+  const extension = tileContent?.gltf?.extensions?.[extensionName] as
+    | string // EXT_mesh_features doesn't have global metadata
+    | GLTF_EXT_feature_metadata_GLTF;
 
   return {extensionName, extension};
 }
@@ -1617,7 +1622,7 @@ function getPropertyTableExtension(
  * @param extension
  */
 function getPropertyTableFromExtFeatureMetadata(
-  extension: GLTF_EXT_feature_metadata
+  extension: GLTF_EXT_feature_metadata_GLTF
 ): FeatureTableJson | null {
   if (extension?.featureTables) {
     /**