@loaders.gl/tile-converter 4.0.0-beta.3 → 4.0.0-beta.5

package/dist/i3s-converter/helpers/feature-attributes.d.ts

@@ -1,5 +1,6 @@
 import type { FeatureTableJson } from '@loaders.gl/3d-tiles';
-import { Attribute, AttributeStorageInfo, ESRIField, Field, PopupInfo } from '@loaders.gl/i3s';
+import type { Attribute, AttributeStorageInfo, ESRIField, Field, PopupInfo } from '@loaders.gl/i3s';
+import type { GLTFPostprocessed } from '@loaders.gl/gltf';
 /**
  * Takes attributes from property table based on featureIdsMap.
  * If there is no property value for particular featureId (index) the property will be null.
@@ -24,10 +25,9 @@ export declare function flattenPropertyTableByFeatureIds(featureIdsMap: Record<s
 export declare function checkPropertiesLength(featureIds: number[], propertyTable: FeatureTableJson): boolean;
 /**
  * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
- * @param key - attribute's key
  * @param attribute - attribute taken from propertyTable
  */
-export declare function getAttributeType(key: string, attribute: unknown): string;
+export declare function getAttributeType(attribute: unknown): string;
 /**
  * Generate storage attribute for map segmentation.
  * @param attributeIndex - order index of attribute (f_0, f_1 ...).
@@ -49,8 +49,31 @@ export declare function getFieldAttributeType(attributeType: Attribute): ESRIFie
 export declare function createFieldAttribute(key: string, fieldAttributeType: ESRIField): Field;
 /**
  * Generate popup info to show metadata on the map.
- * @param propertyTable - table data with OBJECTID.
+ * @param propertyNames - array of property names including OBJECTID.
  * @return data for correct rendering of popup.
  */
-export declare function createPopupInfo(propertyTable: FeatureTableJson): PopupInfo;
+export declare function createPopupInfo(propertyNames: string[]): PopupInfo;
+/**
+ * Gets attribute's types based on the property table records.
+ * @param propertyTable - Table with layer meta data.
+ * @returns set of attribute types
+ * @example of returned object:
+ * {
+ *   "opt_uint8":  "Int32",
+ *   "opt_uint64": "string"
+ * }
+ */
+export declare function getAttributeTypesFromPropertyTable(propertyTable: FeatureTableJson): Record<string, Attribute>;
+/**
+ * Gets attribute's types from the extension schema selected by the class name 'metadataClass'.
+ * @param gltfJson - JSON part of GLB content
+ * @param metadataClass - name of the schema class
+ * @returns set of attribute's types
+ * @example of returned object:
+ * {
+ *   "opt_uint8":  "Int32",
+ *   "opt_uint64": "string"
+ * }
+ */
+export declare const getAttributeTypesFromSchema: (gltfJson: GLTFPostprocessed, metadataClass: string) => Record<string, Attribute> | null;
 //# sourceMappingURL=feature-attributes.d.ts.map

package/dist/i3s-converter/helpers/feature-attributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,KAAK,EAEL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAuBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT;AAUD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,CAUxE;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,SAAS,GACvB,oBAAoB,CA0BtB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,GAAG,SAAS,CAazE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,GAAG,KAAK,CAMtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,gBAAgB,GAAG,SAAS,CA8B1E"}
+{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EACV,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,KAAK,EAEL,SAAS,EACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAI1B;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAuBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT;AAUD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,CAO3D;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,SAAS,GACvB,oBAAoB,CA0BtB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,GAAG,SAAS,CAazE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,GAAG,KAAK,CAMtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,SAAS,CA8BlE;AA2CD;;;;;;;;;GASG;AACH,wBAAgB,kCAAkC,CAChD,aAAa,EAAE,gBAAgB,GAC9B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAS3B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,2BAA2B,aAC5B,iBAAiB,iBACZ,MAAM,KACpB,OAAO,MAAM,EAAE,SAAS,CAAC,GAAG,IA2B9B,CAAC"}

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

@@ -1,3 +1,4 @@
+import { EXT_FEATURE_METADATA, EXT_STRUCTURAL_METADATA } from '@loaders.gl/gltf';
 export function flattenPropertyTableByFeatureIds(featureIdsMap, propertyTable) {
   const resultPropertyTable = {};
   for (const propertyName in propertyTable) {
@@ -29,10 +30,7 @@ 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;
-  }
+export function getAttributeType(attribute) {
   if (typeof attribute === STRING_TYPE || typeof attribute === 'bigint') {
     return STRING_TYPE;
   } else if (typeof attribute === 'number') {
@@ -92,18 +90,18 @@ export function createFieldAttribute(key, fieldAttributeType) {
     alias: key
   };
 }
-export function createPopupInfo(propertyTable) {
+export function createPopupInfo(propertyNames) {
   const title = '{OBJECTID}';
   const mediaInfos = [];
   const fieldInfos = [];
   const popupElements = [];
   const expressionInfos = [];
-  for (const key in propertyTable) {
+  for (const propertyName of propertyNames) {
     fieldInfos.push({
-      fieldName: key,
+      fieldName: propertyName,
       visible: true,
       isEditable: false,
-      label: key
+      label: propertyName
     });
   }
   popupElements.push({
@@ -146,4 +144,94 @@ function setupDoubleAttribute(storageAttribute) {
     valuesPerElement: 1
   };
 }
+export function getAttributeTypesFromPropertyTable(propertyTable) {
+  const attributeTypesMap = {};
+  for (const key in propertyTable) {
+    const firstAttribute = propertyTable[key][0];
+    const attributeType = getAttributeType(firstAttribute);
+    attributeTypesMap[key] = attributeType;
+  }
+  return attributeTypesMap;
+}
+export const getAttributeTypesFromSchema = (gltfJson, metadataClass) => {
+  var _gltfJson$extensions, _gltfJson$extensions$, _gltfJson$extensions$2, _gltfJson$extensions$3, _gltfJson$extensions2, _gltfJson$extensions3, _gltfJson$extensions4, _gltfJson$extensions5;
+  const attributeTypesMap = {};
+  const extFeatureMetadataSchemaClass = (_gltfJson$extensions = gltfJson.extensions) === null || _gltfJson$extensions === void 0 ? void 0 : (_gltfJson$extensions$ = _gltfJson$extensions[EXT_FEATURE_METADATA]) === null || _gltfJson$extensions$ === void 0 ? void 0 : (_gltfJson$extensions$2 = _gltfJson$extensions$.schema) === null || _gltfJson$extensions$2 === void 0 ? void 0 : (_gltfJson$extensions$3 = _gltfJson$extensions$2.classes) === null || _gltfJson$extensions$3 === void 0 ? void 0 : _gltfJson$extensions$3[metadataClass];
+  if (extFeatureMetadataSchemaClass) {
+    for (let propertyName in extFeatureMetadataSchemaClass.properties) {
+      const property = extFeatureMetadataSchemaClass.properties[propertyName];
+      const attributeProperty = getAttributeTypeFromExtFeatureMetadata(property);
+      attributeTypesMap[propertyName] = attributeProperty;
+    }
+    return attributeTypesMap;
+  }
+  const extStructuralMetadataSchemaClass = (_gltfJson$extensions2 = gltfJson.extensions) === null || _gltfJson$extensions2 === void 0 ? void 0 : (_gltfJson$extensions3 = _gltfJson$extensions2[EXT_STRUCTURAL_METADATA]) === null || _gltfJson$extensions3 === void 0 ? void 0 : (_gltfJson$extensions4 = _gltfJson$extensions3.schema) === null || _gltfJson$extensions4 === void 0 ? void 0 : (_gltfJson$extensions5 = _gltfJson$extensions4.classes) === null || _gltfJson$extensions5 === void 0 ? void 0 : _gltfJson$extensions5[metadataClass];
+  if (extStructuralMetadataSchemaClass) {
+    for (let propertyName in extStructuralMetadataSchemaClass.properties) {
+      const property = extStructuralMetadataSchemaClass.properties[propertyName];
+      const attributeProperty = getAttributeTypeFromExtStructuralMetadata(property);
+      attributeTypesMap[propertyName] = attributeProperty;
+    }
+    return attributeTypesMap;
+  }
+  return null;
+};
+const getAttributeTypeFromExtFeatureMetadata = property => {
+  let attributeType;
+  switch (property.type) {
+    case 'INT8':
+    case 'UINT8':
+    case 'INT16':
+    case 'UINT16':
+    case 'INT32':
+    case 'UINT32':
+      attributeType = SHORT_INT_TYPE;
+      break;
+    case 'FLOAT32':
+    case 'FLOAT64':
+      attributeType = DOUBLE_TYPE;
+      break;
+    case 'INT64':
+    case 'UINT64':
+    case 'BOOLEAN':
+    case 'ENUM':
+    case 'STRING':
+    case 'ARRAY':
+      attributeType = STRING_TYPE;
+      break;
+    default:
+      attributeType = STRING_TYPE;
+      break;
+  }
+  return attributeType;
+};
+const getAttributeTypeFromExtStructuralMetadata = property => {
+  let attributeType;
+  if (property.array) {
+    attributeType = STRING_TYPE;
+  } else {
+    switch (property.componentType) {
+      case 'INT8':
+      case 'UINT8':
+      case 'INT16':
+      case 'UINT16':
+      case 'INT32':
+      case 'UINT32':
+        attributeType = SHORT_INT_TYPE;
+        break;
+      case 'FLOAT32':
+      case 'FLOAT64':
+        attributeType = DOUBLE_TYPE;
+        break;
+      case 'INT64':
+      case 'UINT64':
+        attributeType = STRING_TYPE;
+        break;
+      default:
+        attributeType = STRING_TYPE;
+        break;
+    }
+  }
+  return attributeType;
+};
 //# sourceMappingURL=feature-attributes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"feature-attributes.js","names":["flattenPropertyTableByFeatureIds","featureIdsMap","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureIdKey","property","push","checkPropertiesLength","featureIds","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"],"sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"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 featureIdsMap.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n *   OBJECTID: {0: 0, 3: 33, 4: 333}\n *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n *   OBJECTID: [0, 33, 333]\n *   component: ['Windows', 'Roof', 'Skylight']\n * @param featureIdsMap\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n  featureIdsMap: Record<string, 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, featureIdsMap);\n  }\n\n  return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIdsMap\n */\nfunction getPropertiesByFeatureIds(\n  properties: unknown[],\n  featureIdsMap: Record<string, number>\n): unknown[] {\n  const resultProperties: unknown[] = [];\n\n  if (properties) {\n    for (const featureIdKey in featureIdsMap) {\n      const property = properties[featureIdKey] || null;\n      resultProperties.push(property);\n    }\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 || !attribute || 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 taken from propertyTable\n */\nexport function getAttributeType(key: string, attribute: unknown): string {\n  if (key === OBJECT_ID_TYPE) {\n    return OBJECT_ID_TYPE;\n  }\n  if (typeof attribute === STRING_TYPE || typeof attribute === 'bigint') {\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"],"mappings":"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"}
+{"version":3,"file":"feature-attributes.js","names":["EXT_FEATURE_METADATA","EXT_STRUCTURAL_METADATA","flattenPropertyTableByFeatureIds","featureIdsMap","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureIdKey","property","push","checkPropertiesLength","featureIds","needFlatten","attribute","Object","values","length","STRING_TYPE","SHORT_INT_TYPE","DOUBLE_TYPE","OBJECT_ID_TYPE","getAttributeType","Number","isInteger","createdStorageAttribute","attributeIndex","key","attributeType","storageAttribute","name","ordering","header","valueType","attributeValues","valuesPerElement","setupIdAttribute","setupStringAttribute","setupDoubleAttribute","getFieldAttributeType","createFieldAttribute","fieldAttributeType","type","alias","createPopupInfo","propertyNames","title","mediaInfos","fieldInfos","popupElements","expressionInfos","fieldName","visible","isEditable","label","unshift","encoding","attributeByteCounts","getAttributeTypesFromPropertyTable","attributeTypesMap","firstAttribute","getAttributeTypesFromSchema","gltfJson","metadataClass","_gltfJson$extensions","_gltfJson$extensions$","_gltfJson$extensions$2","_gltfJson$extensions$3","_gltfJson$extensions2","_gltfJson$extensions3","_gltfJson$extensions4","_gltfJson$extensions5","extFeatureMetadataSchemaClass","extensions","schema","classes","attributeProperty","getAttributeTypeFromExtFeatureMetadata","extStructuralMetadataSchemaClass","getAttributeTypeFromExtStructuralMetadata","array","componentType"],"sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"sourcesContent":["import type {FeatureTableJson} from '@loaders.gl/3d-tiles';\nimport type {\n  Attribute,\n  AttributeStorageInfo,\n  ESRIField,\n  Field,\n  FieldInfo,\n  PopupInfo\n} from '@loaders.gl/i3s';\nimport type {\n  GLTFPostprocessed,\n  GLTF_EXT_feature_metadata_GLTF,\n  GLTF_EXT_feature_metadata_ClassProperty,\n  GLTF_EXT_structural_metadata_GLTF,\n  GLTF_EXT_structural_metadata_ClassProperty\n} from '@loaders.gl/gltf';\n\nimport {EXT_FEATURE_METADATA, EXT_STRUCTURAL_METADATA} from '@loaders.gl/gltf';\n\n/**\n * Takes attributes from property table based on featureIdsMap.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n *   OBJECTID: {0: 0, 3: 33, 4: 333}\n *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n *   OBJECTID: [0, 33, 333]\n *   component: ['Windows', 'Roof', 'Skylight']\n * @param featureIdsMap\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n  featureIdsMap: Record<string, 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, featureIdsMap);\n  }\n\n  return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIdsMap\n */\nfunction getPropertiesByFeatureIds(\n  properties: unknown[],\n  featureIdsMap: Record<string, number>\n): unknown[] {\n  const resultProperties: unknown[] = [];\n\n  if (properties) {\n    for (const featureIdKey in featureIdsMap) {\n      const property = properties[featureIdKey] || null;\n      resultProperties.push(property);\n    }\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 || !attribute || 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 attribute - attribute taken from propertyTable\n */\nexport function getAttributeType(attribute: unknown): string {\n  if (typeof attribute === STRING_TYPE || typeof attribute === 'bigint') {\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 propertyNames - array of property names including OBJECTID.\n * @return data for correct rendering of popup.\n */\nexport function createPopupInfo(propertyNames: string[]): 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 propertyName of propertyNames) {\n    fieldInfos.push({\n      fieldName: propertyName,\n      visible: true,\n      isEditable: false,\n      label: propertyName\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\n/**\n * Gets attribute's types based on the property table records.\n * @param propertyTable - Table with layer meta data.\n * @returns set of attribute types\n * @example of returned object:\n * {\n *   \"opt_uint8\":  \"Int32\",\n *   \"opt_uint64\": \"string\"\n * }\n */\nexport function getAttributeTypesFromPropertyTable(\n  propertyTable: FeatureTableJson\n): Record<string, Attribute> {\n  const attributeTypesMap: Record<string, Attribute> = {};\n  for (const key in propertyTable) {\n    // Get attribute type based on the first element of each property.\n    const firstAttribute = propertyTable[key][0];\n    const attributeType = getAttributeType(firstAttribute);\n    attributeTypesMap[key] = attributeType;\n  }\n  return attributeTypesMap;\n}\n\n/**\n * Gets attribute's types from the extension schema selected by the class name 'metadataClass'.\n * @param gltfJson - JSON part of GLB content\n * @param metadataClass - name of the schema class\n * @returns set of attribute's types\n * @example of returned object:\n * {\n *   \"opt_uint8\":  \"Int32\",\n *   \"opt_uint64\": \"string\"\n * }\n */\nexport const getAttributeTypesFromSchema = (\n  gltfJson: GLTFPostprocessed,\n  metadataClass: string\n): Record<string, Attribute> | null => {\n  const attributeTypesMap: Record<string, Attribute> = {};\n  const extFeatureMetadataSchemaClass = (\n    gltfJson.extensions?.[EXT_FEATURE_METADATA] as GLTF_EXT_feature_metadata_GLTF\n  )?.schema?.classes?.[metadataClass];\n  if (extFeatureMetadataSchemaClass) {\n    for (let propertyName in extFeatureMetadataSchemaClass.properties) {\n      const property = extFeatureMetadataSchemaClass.properties[propertyName];\n      const attributeProperty = getAttributeTypeFromExtFeatureMetadata(property);\n      attributeTypesMap[propertyName] = attributeProperty;\n    }\n    return attributeTypesMap;\n  }\n\n  const extStructuralMetadataSchemaClass = (\n    gltfJson.extensions?.[EXT_STRUCTURAL_METADATA] as GLTF_EXT_structural_metadata_GLTF\n  )?.schema?.classes?.[metadataClass];\n  if (extStructuralMetadataSchemaClass) {\n    for (let propertyName in extStructuralMetadataSchemaClass.properties) {\n      const property = extStructuralMetadataSchemaClass.properties[propertyName];\n      const attributeProperty = getAttributeTypeFromExtStructuralMetadata(property);\n      attributeTypesMap[propertyName] = attributeProperty;\n    }\n    return attributeTypesMap;\n  }\n\n  return null;\n};\n\n/**\n * Gets the attribute type according to the Ext_feature_metadata extension class schema\n * @see https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md\n * @param property - schema of the class property for Ext_feature_metadata\n * @returns attribute's type\n */\nconst getAttributeTypeFromExtFeatureMetadata = (\n  property: GLTF_EXT_feature_metadata_ClassProperty\n): Attribute => {\n  let attributeType: Attribute;\n  switch (property.type) {\n    case 'INT8':\n    case 'UINT8':\n    case 'INT16':\n    case 'UINT16':\n    case 'INT32':\n    case 'UINT32':\n      attributeType = SHORT_INT_TYPE;\n      break;\n\n    case 'FLOAT32':\n    case 'FLOAT64':\n      attributeType = DOUBLE_TYPE;\n      break;\n\n    case 'INT64':\n    case 'UINT64':\n    case 'BOOLEAN':\n    case 'ENUM':\n    case 'STRING':\n    case 'ARRAY':\n      attributeType = STRING_TYPE;\n      break;\n\n    default:\n      attributeType = STRING_TYPE;\n      break;\n  }\n  return attributeType;\n};\n\n/**\n * Gets the attribute type according to the Ext_structural_metadata extension class schema\n * @see https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md\n * @param property - schema of the class property for Ext_structural_metadata\n * @returns attribute's type\n */\nconst getAttributeTypeFromExtStructuralMetadata = (\n  property: GLTF_EXT_structural_metadata_ClassProperty\n): Attribute => {\n  let attributeType: Attribute;\n  if (property.array) {\n    attributeType = STRING_TYPE;\n  } else {\n    switch (property.componentType) {\n      case 'INT8':\n      case 'UINT8':\n      case 'INT16':\n      case 'UINT16':\n      case 'INT32':\n      case 'UINT32':\n        attributeType = SHORT_INT_TYPE;\n        break;\n\n      case 'FLOAT32':\n      case 'FLOAT64':\n        attributeType = DOUBLE_TYPE;\n        break;\n\n      case 'INT64':\n      case 'UINT64':\n        attributeType = STRING_TYPE;\n        break;\n\n      default:\n        attributeType = STRING_TYPE;\n        break;\n    }\n  }\n  return attributeType;\n};\n"],"mappings":"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"}

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;AAWrC,OAAO,KAAK,EAAC,kBAAkB,EAAgD,MAAM,UAAU,CAAC;AAEhG,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AA8BrE;;;;;;;;;;;;;;;;;;GAkBG;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,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAgEzC;AAoJD;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,EAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAkD3C;AAmsCD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,kBAAkB,GAAG,IAAI,EACtC,aAAa,CAAC,EAAE,MAAM,GACrB,gBAAgB,GAAG,IAAI,CA+BzB"}
+{"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;AAgB/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;AAWrC,OAAO,KAAK,EAAC,kBAAkB,EAAgD,MAAM,UAAU,CAAC;AAEhG,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAyBrE;;;;;;;;;;;;;;;;;;GAkBG;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,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAgEzC;AAoJD;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,EAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAkD3C;AAmsCD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,kBAAkB,GAAG,IAAI,EACtC,aAAa,CAAC,EAAE,MAAM,GACrB,gBAAgB,GAAG,IAAI,CA+BzB"}

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

@@ -12,7 +12,7 @@ import { getTextureByMetadataClass, handleBatchIdsExtensions } from "./batch-ids
 import { checkPropertiesLength, flattenPropertyTableByFeatureIds } from "./feature-attributes.js";
 import { GL } from '@loaders.gl/math';
 import { generateSyntheticIndices } from "../../lib/utils/geometry-utils.js";
-import { EXT_FEATURE_METADATA, EXT_STRUCTURAL_METADATA, getPropertyTableFromExtFeatureMetadata, getPropertyTableFromExtStructuralMetadata } from '@loaders.gl/gltf';
+import { EXT_FEATURE_METADATA, EXT_STRUCTURAL_METADATA } from '@loaders.gl/gltf';
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
 const VALUES_PER_VERTEX = 3;
@@ -872,6 +872,49 @@ export function getPropertyTable(tileContent, metadataClass) {
       return null;
   }
 }
+function getPropertyTableFromExtStructuralMetadata(extension, metadataClass) {
+  if (extension.propertyTables) {
+    for (const propertyTable of extension.propertyTables) {
+      if (propertyTable.class === metadataClass || !metadataClass) {
+        return getPropertyData(propertyTable);
+      }
+    }
+  }
+  if (extension.propertyTextures) {
+    for (const propertyTexture of extension.propertyTextures) {
+      if (propertyTexture.class === metadataClass || !metadataClass) {
+        return getPropertyData(propertyTexture);
+      }
+    }
+  }
+  return null;
+}
+function getPropertyTableFromExtFeatureMetadata(extension, metadataClass) {
+  if (extension.featureTables) {
+    for (const featureTableName in extension.featureTables) {
+      const featureTable = extension.featureTables[featureTableName];
+      if (featureTable.class === metadataClass || !metadataClass) {
+        return getPropertyData(featureTable);
+      }
+    }
+  }
+  if (extension.featureTextures) {
+    for (const featureTextureName in extension.featureTextures) {
+      const featureTexture = extension.featureTextures[featureTextureName];
+      if (featureTexture.class === metadataClass || !metadataClass) {
+        return getPropertyData(featureTexture);
+      }
+    }
+  }
+  return null;
+}
+function getPropertyData(featureObject) {
+  const propertyTableWithData = {};
+  for (const propertyName in featureObject.properties) {
+    propertyTableWithData[propertyName] = featureObject.properties[propertyName].data;
+  }
+  return propertyTableWithData;
+}
 function getPropertyTableExtension(tileContent) {
   var _tileContent$gltf3, _tileContent$gltf5, _tileContent$gltf5$ex;
   const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_STRUCTURAL_METADATA];