@loaders.gl/tile-converter 3.3.0-alpha.3 → 3.3.0-alpha.5

package/dist/esm/i3s-converter/helpers/feature-attributes.js

@@ -31,4 +31,142 @@ export function checkPropertiesLength(featureIds, propertyTable) {
 
   return needFlatten;
 }
+const STRING_TYPE = 'string';
+const SHORT_INT_TYPE = 'Int32';
+const DOUBLE_TYPE = 'double';
+const OBJECT_ID_TYPE = 'OBJECTID';
+export function getAttributeType(key, attribute) {
+  if (key === OBJECT_ID_TYPE) {
+    return OBJECT_ID_TYPE;
+  }
+
+  if (typeof attribute === STRING_TYPE) {
+    return STRING_TYPE;
+  } else if (typeof attribute === 'number') {
+    return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;
+  }
+
+  return STRING_TYPE;
+}
+export function createdStorageAttribute(attributeIndex, key, attributeType) {
+  const storageAttribute = {
+    key: "f_".concat(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;
+}
+export 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';
+  }
+}
+export function createFieldAttribute(key, fieldAttributeType) {
+  return {
+    name: key,
+    type: fieldAttributeType,
+    alias: key
+  };
+}
+export function createPopupInfo(propertyTable) {
+  const title = '{OBJECTID}';
+  const mediaInfos = [];
+  const fieldInfos = [];
+  const popupElements = [];
+  const expressionInfos = [];
+
+  for (const key in propertyTable) {
+    fieldInfos.push({
+      fieldName: key,
+      visible: true,
+      isEditable: false,
+      label: key
+    });
+  }
+
+  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
+  };
+}
 //# sourceMappingURL=feature-attributes.js.map

package/dist/esm/i3s-converter/helpers/feature-attributes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":["flattenPropertyTableByFeatureIds","featureIds","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureId","property","push","checkPropertiesLength","needFlatten","attribute","Object","values","length"],"mappings":"AAeA,OAAO,SAASA,gCAAT,CACLC,UADK,EAELC,aAFK,EAGa;AAClB,QAAMC,mBAAqC,GAAG,EAA9C;;AACA,OAAK,MAAMC,YAAX,IAA2BF,aAA3B,EAA0C;AACxC,UAAMG,UAAU,GAAGH,aAAa,CAACE,YAAD,CAAhC;AACAD,IAAAA,mBAAmB,CAACC,YAAD,CAAnB,GAAoCE,yBAAyB,CAACD,UAAD,EAAaJ,UAAb,CAA7D;AACD;;AAED,SAAOE,mBAAP;AACD;;AAOD,SAASG,yBAAT,CAAmCD,UAAnC,EAAsDJ,UAAtD,EAAmF;AACjF,QAAMM,gBAAqB,GAAG,EAA9B;;AAEA,OAAK,MAAMC,SAAX,IAAwBP,UAAxB,EAAoC;AAClC,UAAMQ,QAAQ,GAAGJ,UAAU,CAACG,SAAD,CAAV,IAAyB,IAA1C;AACAD,IAAAA,gBAAgB,CAACG,IAAjB,CAAsBD,QAAtB;AACD;;AAED,SAAOF,gBAAP;AACD;;AASD,OAAO,SAASI,qBAAT,CACLV,UADK,EAELC,aAFK,EAGI;AACT,MAAIU,WAAW,GAAG,KAAlB;;AAEA,OAAK,MAAMC,SAAX,IAAwBC,MAAM,CAACC,MAAP,CAAcb,aAAd,CAAxB,EAAsD;AACpD,QAAID,UAAU,CAACe,MAAX,KAAsBH,SAAS,CAACG,MAApC,EAA4C;AAC1CJ,MAAAA,WAAW,GAAG,IAAd;AACD;AACF;;AAED,SAAOA,WAAP;AACD","sourcesContent":["import type {FeatureTableJson} from '@loaders.gl/3d-tiles';\n\n/**\n * Takes attributes from property table based on featureIds.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n *   OBJECTID: [0, 1, 5]\n *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n *   OBJECTID: [0, 1, 5]\n *   component: ['Windows', 'Frames', 'null']\n * @param featureIds\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): FeatureTableJson {\n  const resultPropertyTable: FeatureTableJson = {};\n  for (const propertyName in propertyTable) {\n    const properties = propertyTable[propertyName];\n    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);\n  }\n\n  return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIds\n */\nfunction getPropertiesByFeatureIds(properties: any[], featureIds: number[]): any[] {\n  const resultProperties: any = [];\n\n  for (const featureId of featureIds) {\n    const property = properties[featureId] || null;\n    resultProperties.push(property);\n  }\n\n  return resultProperties;\n}\n\n/**\n * Check that all attributes in propertyTable have the same length as FeatureIds.\n * If there are differencies between lengths we should flatten property table based on exiesting featureIds.\n * @param featureIds\n * @param propertyTable\n * @returns\n */\nexport function checkPropertiesLength(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): boolean {\n  let needFlatten = false;\n\n  for (const attribute of Object.values(propertyTable)) {\n    if (featureIds.length !== attribute.length) {\n      needFlatten = true;\n    }\n  }\n\n  return needFlatten;\n}\n"],"file":"feature-attributes.js"}
+{"version":3,"sources":["../../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":["flattenPropertyTableByFeatureIds","featureIds","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureId","property","push","checkPropertiesLength","needFlatten","attribute","Object","values","length","STRING_TYPE","SHORT_INT_TYPE","DOUBLE_TYPE","OBJECT_ID_TYPE","getAttributeType","key","Number","isInteger","createdStorageAttribute","attributeIndex","attributeType","storageAttribute","name","ordering","header","valueType","attributeValues","valuesPerElement","setupIdAttribute","setupStringAttribute","setupDoubleAttribute","getFieldAttributeType","createFieldAttribute","fieldAttributeType","type","alias","createPopupInfo","title","mediaInfos","fieldInfos","popupElements","expressionInfos","fieldName","visible","isEditable","label","unshift","encoding","attributeByteCounts"],"mappings":"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","sourcesContent":["import type {FeatureTableJson} from '@loaders.gl/3d-tiles';\nimport {\n  Attribute,\n  AttributeStorageInfo,\n  ESRIField,\n  Field,\n  FieldInfo,\n  PopupInfo\n} from '@loaders.gl/i3s';\n\n/**\n * Takes attributes from property table based on featureIds.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n *   OBJECTID: [0, 1, 5]\n *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n *   OBJECTID: [0, 1, 5]\n *   component: ['Windows', 'Frames', 'null']\n * @param featureIds\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): FeatureTableJson {\n  const resultPropertyTable: FeatureTableJson = {};\n  for (const propertyName in propertyTable) {\n    const properties = propertyTable[propertyName];\n    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);\n  }\n\n  return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIds\n */\nfunction getPropertiesByFeatureIds(properties: any[], featureIds: number[]): any[] {\n  const resultProperties: any = [];\n\n  for (const featureId of featureIds) {\n    const property = properties[featureId] || null;\n    resultProperties.push(property);\n  }\n\n  return resultProperties;\n}\n\n/**\n * Check that all attributes in propertyTable have the same length as FeatureIds.\n * If there are differencies between lengths we should flatten property table based on exiesting featureIds.\n * @param featureIds\n * @param propertyTable\n * @returns\n */\nexport function checkPropertiesLength(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): boolean {\n  let needFlatten = false;\n\n  for (const attribute of Object.values(propertyTable)) {\n    if (featureIds.length !== attribute.length) {\n      needFlatten = true;\n    }\n  }\n\n  return needFlatten;\n}\n\n/** String data type name for feature attributes */\nconst STRING_TYPE = 'string';\n/** Integer data type name for feature attributes */\nconst SHORT_INT_TYPE = 'Int32';\n/** Double data type name for feature attributes */\nconst DOUBLE_TYPE = 'double';\n/** Type of attribute that is linked with feature ids */\nconst OBJECT_ID_TYPE = 'OBJECTID';\n/**\n * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md\n * @param key - attribute's key\n * @param attribute - attribute's type in propertyTable\n */\nexport function getAttributeType(key: string, attribute: string): string {\n  if (key === OBJECT_ID_TYPE) {\n    return OBJECT_ID_TYPE;\n  }\n  if (typeof attribute === STRING_TYPE) {\n    return STRING_TYPE;\n  } else if (typeof attribute === 'number') {\n    return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;\n  }\n  return STRING_TYPE;\n}\n\n/**\n * Generate storage attribute for map segmentation.\n * @param attributeIndex - order index of attribute (f_0, f_1 ...).\n * @param key - attribute key from propertyTable.\n * @param attributeType - attribute type.\n * @return Updated storageAttribute.\n */\nexport function createdStorageAttribute(\n  attributeIndex: number,\n  key: string,\n  attributeType: Attribute\n): AttributeStorageInfo {\n  const storageAttribute = {\n    key: `f_${attributeIndex}`,\n    name: key,\n    ordering: ['attributeValues'],\n    header: [{property: 'count', valueType: 'UInt32'}],\n    attributeValues: {valueType: 'Int32', valuesPerElement: 1}\n  };\n\n  switch (attributeType) {\n    case OBJECT_ID_TYPE:\n      setupIdAttribute(storageAttribute);\n      break;\n    case STRING_TYPE:\n      setupStringAttribute(storageAttribute);\n      break;\n    case DOUBLE_TYPE:\n      setupDoubleAttribute(storageAttribute);\n      break;\n    case SHORT_INT_TYPE:\n      break;\n    default:\n      setupStringAttribute(storageAttribute);\n  }\n\n  return storageAttribute;\n}\n\n/**\n * Find and return attribute type based on key form propertyTable.\n * @param attributeType\n */\nexport function getFieldAttributeType(attributeType: Attribute): ESRIField {\n  switch (attributeType) {\n    case OBJECT_ID_TYPE:\n      return 'esriFieldTypeOID';\n    case STRING_TYPE:\n      return 'esriFieldTypeString';\n    case SHORT_INT_TYPE:\n      return 'esriFieldTypeInteger';\n    case DOUBLE_TYPE:\n      return 'esriFieldTypeDouble';\n    default:\n      return 'esriFieldTypeString';\n  }\n}\n\n/**\n * Setup field attribute for map segmentation.\n * @param key - attribute for map segmentation.\n * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').\n */\nexport function createFieldAttribute(key: string, fieldAttributeType: ESRIField): Field {\n  return {\n    name: key,\n    type: fieldAttributeType,\n    alias: key\n  };\n}\n\n/**\n * Generate popup info to show metadata on the map.\n * @param propertyTable - table data with OBJECTID.\n * @return data for correct rendering of popup.\n */\nexport function createPopupInfo(propertyTable: FeatureTableJson): PopupInfo {\n  const title = '{OBJECTID}';\n  const mediaInfos = [];\n  const fieldInfos: FieldInfo[] = [];\n  const popupElements: {\n    fieldInfos: FieldInfo[];\n    type: string;\n  }[] = [];\n  const expressionInfos = [];\n\n  for (const key in propertyTable) {\n    fieldInfos.push({\n      fieldName: key,\n      visible: true,\n      isEditable: false,\n      label: key\n    });\n  }\n  popupElements.push({\n    fieldInfos,\n    type: 'fields'\n  });\n\n  return {\n    title,\n    mediaInfos,\n    popupElements,\n    fieldInfos,\n    expressionInfos\n  };\n}\n\n/**\n * Setup storage attribute as string.\n * @param storageAttribute - attribute for map segmentation.\n */\nfunction setupStringAttribute(storageAttribute: AttributeStorageInfo): void {\n  // @ts-expect-error\n  storageAttribute.ordering.unshift('attributeByteCounts');\n  storageAttribute.header.push({property: 'attributeValuesByteCount', valueType: 'UInt32'});\n  storageAttribute.attributeValues = {\n    valueType: 'String',\n    encoding: 'UTF-8',\n    valuesPerElement: 1\n  };\n  storageAttribute.attributeByteCounts = {\n    valueType: 'UInt32',\n    valuesPerElement: 1\n  };\n}\n\n/**\n * Setup Id attribute for map segmentation.\n * @param storageAttribute - attribute for map segmentation .\n */\nfunction setupIdAttribute(storageAttribute: AttributeStorageInfo): void {\n  storageAttribute.attributeValues = {\n    valueType: 'Oid32',\n    valuesPerElement: 1\n  };\n}\n\n/**\n * Setup double attribute for map segmentation.\n * @param storageAttribute - attribute for map segmentation .\n */\nfunction setupDoubleAttribute(storageAttribute: AttributeStorageInfo): void {\n  storageAttribute.attributeValues = {\n    valueType: 'Float64',\n    valuesPerElement: 1\n  };\n}\n"],"file":"feature-attributes.js"}

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

@@ -22,7 +22,7 @@ const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_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, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+export default async function convertB3dmToI3sGeometry(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
   var _tileContent$gltf;
 
   const useCartesianPositions = generateBoundingVolumes;
@@ -41,7 +41,6 @@ export default async function convertB3dmToI3sGeometry(tileContent, nodeId, prop
   }
 
   const result = [];
-  let nodesCounter = nodeId;
   let {
     materials = []
   } = tileContent.gltf || {
@@ -71,19 +70,19 @@ export default async function convertB3dmToI3sGeometry(tileContent, nodeId, prop
       material,
       texture
     } = materialAndTextureList[i];
+    const nodeId = addNodeToNodePage();
     result.push(await _makeNodeResources({
       convertedAttributes,
       material,
       texture,
       tileContent,
-      nodeId: nodesCounter,
+      nodeId,
       featuresHashArray,
       propertyTable,
       attributeStorageInfo,
       draco,
       workerSource
     }));
-    nodesCounter++;
   }
 
   if (!result.length) {
@@ -158,6 +157,7 @@ async function _makeNodeResources({
   }
 
   return {
+    nodeId,
     geometry: fileBuffer,
     compressedGeometry,
     texture,
@@ -174,6 +174,7 @@ export async function convertAttributes(attributesData, useCartesianPositions) {
   const {
     gltfMaterials,
     nodes,
+    images,
     cartographicOrigin,
     cartesianModelMatrix
   } = attributesData;
@@ -193,7 +194,7 @@ export async function convertAttributes(attributesData, useCartesianPositions) {
     });
   }
 
-  convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
+  convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
 
   for (const attrKey of attributesMap.keys()) {
     const attributes = attributesMap.get(attrKey);
@@ -216,10 +217,10 @@ export async function convertAttributes(attributesData, useCartesianPositions) {
   return attributesMap;
 }
 
-function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   if (nodes) {
     for (const node of nodes) {
-      convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+      convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
     }
   }
 }
@@ -252,16 +253,15 @@ function getCompositeTransformationMatrix(node, matrix) {
   return transformationMatrix;
 }
 
-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])) {
+function convertNode(node, images, 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, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
   }
 
-  convertNodes(node.children || [], cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
+  convertNodes(node.children || [], images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
 }
 
 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])) {
@@ -825,10 +825,8 @@ 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;
+export function getPropertyTable(tileContent) {
+  const batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
 
   if (batchTableJson) {
     return batchTableJson;
@@ -837,7 +835,7 @@ export function getPropertyTable(sourceTile) {
   const {
     extensionName,
     extension
-  } = getPropertyTableExtension(sourceTile);
+  } = getPropertyTableExtension(tileContent);
 
   switch (extensionName) {
     case EXT_MESH_FEATURES:
@@ -856,11 +854,11 @@ export function getPropertyTable(sourceTile) {
   }
 }
 
-function getPropertyTableExtension(sourceTile) {
-  var _sourceTile$content2, _sourceTile$content2$, _sourceTile$content4, _sourceTile$content4$, _sourceTile$content4$2;
+function getPropertyTableExtension(tileContent) {
+  var _tileContent$gltf3, _tileContent$gltf5, _tileContent$gltf5$ex;
 
   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;
+  const extensionsUsed = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf3 = tileContent.gltf) === null || _tileContent$gltf3 === void 0 ? void 0 : _tileContent$gltf3.extensionsUsed;
 
   if (!extensionsUsed) {
     return {
@@ -871,8 +869,8 @@ function getPropertyTableExtension(sourceTile) {
 
   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$;
+  for (const extensionItem of (tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf4 = tileContent.gltf) === null || _tileContent$gltf4 === void 0 ? void 0 : _tileContent$gltf4.extensionsUsed) || []) {
+    var _tileContent$gltf4;
 
     if (extensionsWithPropertyTables.includes(extensionItem)) {
       extensionName = extensionItem;
@@ -880,7 +878,7 @@ function getPropertyTableExtension(sourceTile) {
     }
   }
 
-  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];
+  const extension = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf5 = tileContent.gltf) === null || _tileContent$gltf5 === void 0 ? void 0 : (_tileContent$gltf5$ex = _tileContent$gltf5.extensions) === null || _tileContent$gltf5$ex === void 0 ? void 0 : _tileContent$gltf5$ex[extensionName];
   return {
     extensionName,
     extension