@loaders.gl/tile-converter 3.2.6 → 3.3.0-alpha.2

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

@@ -7,6 +7,8 @@ import md5 from 'md5';
 import { generateAttributes } from './geometry-attributes';
 import { createBoundingVolumesFromGeometry } from './coordinate-converter';
 import { prepareDataForAttributesConversion } from './gltf-attributes';
+import { handleBatchIdsExtensions } from './batch-ids-extensions';
+import { checkPropertiesLength, flattenPropertyTableByFeatureIds } from './feature-attributes';
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
 const VALUES_PER_VERTEX = 3;
@@ -17,8 +19,10 @@ const SHORT_INT_TYPE = 'Int32';
 const DOUBLE_TYPE = 'Float64';
 const OBJECT_ID_TYPE = 'Oid32';
 const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', 'BATCHID'];
+const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
+const EXT_MESH_FEATURES = 'EXT_mesh_features';
 let scratchVector = new Vector3();
-export default async function convertB3dmToI3sGeometry(tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+export default async function convertB3dmToI3sGeometry(tileContent, nodeId, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
   var _tileContent$gltf;
 
   const useCartesianPositions = generateBoundingVolumes;
@@ -74,6 +78,7 @@ export default async function convertB3dmToI3sGeometry(tileContent, nodeId, feat
       tileContent,
       nodeId: nodesCounter,
       featuresHashArray,
+      propertyTable,
       attributeStorageInfo,
       draco,
       workerSource
@@ -111,6 +116,7 @@ async function _makeNodeResources({
   tileContent,
   nodeId,
   featuresHashArray,
+  propertyTable,
   attributeStorageInfo,
   draco,
   workerSource
@@ -145,7 +151,12 @@ async function _makeNodeResources({
     featureIds,
     faceRange
   }, workerSource.draco) : null;
-  const attributes = convertBatchTableToAttributeBuffers(tileContent.batchTableJson, featureIds, attributeStorageInfo);
+  let attributes = [];
+
+  if (attributeStorageInfo && propertyTable) {
+    attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
+  }
+
   return {
     geometry: fileBuffer,
     compressedGeometry,
@@ -244,15 +255,16 @@ function getCompositeTransformationMatrix(node, matrix) {
 function convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   const transformationMatrix = getCompositeTransformationMatrix(node, matrix);
   const mesh = node.mesh;
+  const images = node.images;
 
   if (mesh) {
-    convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
+    convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
   }
 
   convertNodes(node.children || [], cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
 }
 
-function convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions = false, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions = false, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   for (const primitive of mesh.primitives) {
     var _primitive$indices, _primitive$indices2, _primitive$indices3, _primitive$indices4, _primitive$indices5;
 
@@ -292,7 +304,7 @@ function convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesM
     outputAttributes.texCoords = concatenateTypedArrays(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, (_primitive$indices3 = primitive.indices) === null || _primitive$indices3 === void 0 ? void 0 : _primitive$indices3.value));
     outputAttributes.colors = concatenateTypedArrays(outputAttributes.colors, flattenColors(attributes.COLOR_0, (_primitive$indices4 = primitive.indices) === null || _primitive$indices4 === void 0 ? void 0 : _primitive$indices4.value));
     outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
-    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIdsByAttributeName(attributes), (_primitive$indices5 = primitive.indices) === null || _primitive$indices5 === void 0 ? void 0 : _primitive$indices5.value));
+    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), (_primitive$indices5 = primitive.indices) === null || _primitive$indices5 === void 0 ? void 0 : _primitive$indices5.value));
   }
 }
 
@@ -417,19 +429,22 @@ function flattenBatchIds(batchedIds, indices) {
   return newBatchIds;
 }
 
-function getBatchIdsByAttributeName(attributes) {
-  let batchIds = [];
+function getBatchIds(attributes, primitive, images) {
+  const batchIds = handleBatchIdsExtensions(attributes, primitive, images);
+
+  if (batchIds.length) {
+    return batchIds;
+  }
 
   for (let index = 0; index < BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES.length; index++) {
     const possibleBatchIdAttributeName = BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES[index];
 
     if (attributes[possibleBatchIdAttributeName] && attributes[possibleBatchIdAttributeName].value) {
-      batchIds = attributes[possibleBatchIdAttributeName].value;
-      break;
+      return attributes[possibleBatchIdAttributeName].value;
     }
   }
 
-  return batchIds;
+  return [];
 }
 
 function convertMaterials(sourceMaterials = []) {
@@ -657,44 +672,47 @@ function replaceIndicesByUnique(indicesArray, featureMap) {
   }
 }
 
-function convertBatchTableToAttributeBuffers(batchTable, featureIds, attributeStorageInfo) {
+function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
   const attributeBuffers = [];
+  const needFlattenPropertyTable = checkPropertiesLength(featureIds, propertyTable);
+  const properties = needFlattenPropertyTable ? flattenPropertyTableByFeatureIds(featureIds, propertyTable) : propertyTable;
+  const propertyTableWithObjectIds = {
+    OBJECTID: featureIds,
+    ...properties
+  };
 
-  if (batchTable) {
-    const batchTableWithFeatureIds = {
-      OBJECTID: featureIds,
-      ...batchTable
-    };
+  for (const propertyName in propertyTableWithObjectIds) {
+    const type = getAttributeType(propertyName, attributeStorageInfo);
+    const value = propertyTableWithObjectIds[propertyName];
+    const attributeBuffer = generateAttributeBuffer(type, value);
+    attributeBuffers.push(attributeBuffer);
+  }
 
-    for (const key in batchTableWithFeatureIds) {
-      const type = getAttributeType(key, attributeStorageInfo);
-      let attributeBuffer = null;
+  return attributeBuffers;
+}
 
-      switch (type) {
-        case OBJECT_ID_TYPE:
-        case SHORT_INT_TYPE:
-          attributeBuffer = generateShortIntegerAttributeBuffer(batchTableWithFeatureIds[key]);
-          break;
+function generateAttributeBuffer(type, value) {
+  let attributeBuffer;
 
-        case DOUBLE_TYPE:
-          attributeBuffer = generateDoubleAttributeBuffer(batchTableWithFeatureIds[key]);
-          break;
+  switch (type) {
+    case OBJECT_ID_TYPE:
+    case SHORT_INT_TYPE:
+      attributeBuffer = generateShortIntegerAttributeBuffer(value);
+      break;
 
-        case STRING_TYPE:
-          attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
-          break;
+    case DOUBLE_TYPE:
+      attributeBuffer = generateDoubleAttributeBuffer(value);
+      break;
 
-        default:
-          attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
-      }
+    case STRING_TYPE:
+      attributeBuffer = generateStringAttributeBuffer(value);
+      break;
 
-      if (attributeBuffer) {
-        attributeBuffers.push(attributeBuffer);
-      }
-    }
+    default:
+      attributeBuffer = generateStringAttributeBuffer(value);
   }
 
-  return attributeBuffers;
+  return attributeBuffer;
 }
 
 function getAttributeType(key, attributeStorageInfo) {
@@ -806,4 +824,93 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
 
   return orderedFeatureIndices;
 }
+
+export function getPropertyTable(sourceTile) {
+  var _sourceTile$content;
+
+  const batchTableJson = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content = sourceTile.content) === null || _sourceTile$content === void 0 ? void 0 : _sourceTile$content.batchTableJson;
+
+  if (batchTableJson) {
+    return batchTableJson;
+  }
+
+  const {
+    extensionName,
+    extension
+  } = getPropertyTableExtension(sourceTile);
+
+  switch (extensionName) {
+    case EXT_MESH_FEATURES:
+      {
+        console.warn('The I3S converter does not yet support the EXT_mesh_features extension');
+        return null;
+      }
+
+    case EXT_FEATURE_METADATA:
+      {
+        return getPropertyTableFromExtFeatureMetadata(extension);
+      }
+
+    default:
+      return null;
+  }
+}
+
+function getPropertyTableExtension(sourceTile) {
+  var _sourceTile$content2, _sourceTile$content2$, _sourceTile$content4, _sourceTile$content4$, _sourceTile$content4$2;
+
+  const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
+  const extensionsUsed = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content2 = sourceTile.content) === null || _sourceTile$content2 === void 0 ? void 0 : (_sourceTile$content2$ = _sourceTile$content2.gltf) === null || _sourceTile$content2$ === void 0 ? void 0 : _sourceTile$content2$.extensionsUsed;
+
+  if (!extensionsUsed) {
+    return {
+      extensionName: null,
+      extension: null
+    };
+  }
+
+  let extensionName = '';
+
+  for (const extensionItem of sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content3 = sourceTile.content) === null || _sourceTile$content3 === void 0 ? void 0 : (_sourceTile$content3$ = _sourceTile$content3.gltf) === null || _sourceTile$content3$ === void 0 ? void 0 : _sourceTile$content3$.extensionsUsed) {
+    var _sourceTile$content3, _sourceTile$content3$;
+
+    if (extensionsWithPropertyTables.includes(extensionItem)) {
+      extensionName = extensionItem;
+      break;
+    }
+  }
+
+  const extension = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content4 = sourceTile.content) === null || _sourceTile$content4 === void 0 ? void 0 : (_sourceTile$content4$ = _sourceTile$content4.gltf) === null || _sourceTile$content4$ === void 0 ? void 0 : (_sourceTile$content4$2 = _sourceTile$content4$.extensions) === null || _sourceTile$content4$2 === void 0 ? void 0 : _sourceTile$content4$2[extensionName];
+  return {
+    extensionName,
+    extension
+  };
+}
+
+function getPropertyTableFromExtFeatureMetadata(extension) {
+  if (extension !== null && extension !== void 0 && extension.featureTextures) {
+    console.warn('The I3S converter does not yet support the EXT_feature_metadata feature textures');
+    return null;
+  }
+
+  if (extension !== null && extension !== void 0 && extension.featureTables) {
+    var _Object$keys;
+
+    const firstFeatureTableName = (_Object$keys = Object.keys(extension.featureTables)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
+
+    if (firstFeatureTableName) {
+      const featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTables[firstFeatureTableName];
+      const propertyTable = {};
+
+      for (const propertyName in featureTable.properties) {
+        propertyTable[propertyName] = featureTable.properties[propertyName].data;
+      }
+
+      return propertyTable;
+    }
+  }
+
+  console.warn("The I3S converter couldn't handle EXT_feature_metadata extension");
+  return null;
+}
 //# sourceMappingURL=geometry-converter.js.map