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

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

@@ -1,10 +1,19 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.flattenPropertyTableByFeatureIds = flattenPropertyTableByFeatureIds;
 exports.checkPropertiesLength = checkPropertiesLength;
+exports.getAttributeType = getAttributeType;
+exports.createdStorageAttribute = createdStorageAttribute;
+exports.getFieldAttributeType = getFieldAttributeType;
+exports.createFieldAttribute = createFieldAttribute;
+exports.createPopupInfo = createPopupInfo;
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -57,4 +66,148 @@ 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(key, attribute) {
+  if (key === OBJECT_ID_TYPE) {
+    return OBJECT_ID_TYPE;
+  }
+
+  if ((0, _typeof2.default)(attribute) === STRING_TYPE) {
+    return STRING_TYPE;
+  } else if (typeof attribute === 'number') {
+    return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;
+  }
+
+  return STRING_TYPE;
+}
+
+function createdStorageAttribute(attributeIndex, key, attributeType) {
+  var 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;
+}
+
+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(propertyTable) {
+  var title = '{OBJECTID}';
+  var mediaInfos = [];
+  var fieldInfos = [];
+  var popupElements = [];
+  var expressionInfos = [];
+
+  for (var key in propertyTable) {
+    fieldInfos.push({
+      fieldName: key,
+      visible: true,
+      isEditable: false,
+      label: key
+    });
+  }
+
+  popupElements.push({
+    fieldInfos: fieldInfos,
+    type: 'fields'
+  });
+  return {
+    title: title,
+    mediaInfos: mediaInfos,
+    popupElements: popupElements,
+    fieldInfos: fieldInfos,
+    expressionInfos: 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/es5/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","Object","values","attribute","length"],"mappings":";;;;;;;;;;;;;;AAeO,SAASA,gCAAT,CACLC,UADK,EAELC,aAFK,EAGa;AAClB,MAAMC,mBAAqC,GAAG,EAA9C;;AACA,OAAK,IAAMC,YAAX,IAA2BF,aAA3B,EAA0C;AACxC,QAAMG,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,MAAMM,gBAAqB,GAAG,EAA9B;;AADiF,6CAGzDN,UAHyD;AAAA;;AAAA;AAGjF,wDAAoC;AAAA,UAAzBO,SAAyB;AAClC,UAAMC,QAAQ,GAAGJ,UAAU,CAACG,SAAD,CAAV,IAAyB,IAA1C;AACAD,MAAAA,gBAAgB,CAACG,IAAjB,CAAsBD,QAAtB;AACD;AANgF;AAAA;AAAA;AAAA;AAAA;;AAQjF,SAAOF,gBAAP;AACD;;AASM,SAASI,qBAAT,CACLV,UADK,EAELC,aAFK,EAGI;AACT,MAAIU,WAAW,GAAG,KAAlB;;AAEA,oCAAwBC,MAAM,CAACC,MAAP,CAAcZ,aAAd,CAAxB,oCAAsD;AAAjD,QAAMa,SAAS,qBAAf;;AACH,QAAId,UAAU,CAACe,MAAX,KAAsBD,SAAS,CAACC,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","Object","values","attribute","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/es5/i3s-converter/helpers/geometry-converter.js

@@ -66,17 +66,17 @@ function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9) {
 }
 
 function _convertB3dmToI3sGeometry() {
-  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, nodeId, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
-    var _tileContent$gltf;
+  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+    var _tileContent$gltf4;
 
-    var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, nodesCounter, _ref3, _ref3$materials, materials, i, sourceMaterial, convertedAttributes, _materialAndTextureLi, material, texture;
+    var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, _ref3, _ref3$materials, materials, i, sourceMaterial, convertedAttributes, _materialAndTextureLi, material, texture, nodeId;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             useCartesianPositions = generateBoundingVolumes;
-            materialAndTextureList = convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials);
+            materialAndTextureList = convertMaterials((_tileContent$gltf4 = tileContent.gltf) === null || _tileContent$gltf4 === void 0 ? void 0 : _tileContent$gltf4.materials);
             dataForAttributesConversion = (0, _gltfAttributes.prepareDataForAttributesConversion)(tileContent);
             _context.next = 5;
             return convertAttributes(dataForAttributesConversion, useCartesianPositions);
@@ -95,7 +95,6 @@ function _convertB3dmToI3sGeometry() {
             }
 
             result = [];
-            nodesCounter = nodeId;
             _ref3 = tileContent.gltf || {
               materials: []
             }, _ref3$materials = _ref3.materials, materials = _ref3$materials === void 0 ? [] : _ref3$materials;
@@ -108,33 +107,34 @@ function _convertB3dmToI3sGeometry() {
 
             i = 0;
 
-          case 13:
+          case 12:
             if (!(i < materials.length)) {
-              _context.next = 30;
+              _context.next = 29;
               break;
             }
 
             sourceMaterial = materials[i];
 
             if (convertedAttributesMap.has(sourceMaterial.id)) {
-              _context.next = 17;
+              _context.next = 16;
               break;
             }
 
-            return _context.abrupt("continue", 27);
+            return _context.abrupt("continue", 26);
 
-          case 17:
+          case 16:
             convertedAttributes = convertedAttributesMap.get(sourceMaterial.id);
 
             if (convertedAttributes) {
-              _context.next = 20;
+              _context.next = 19;
               break;
             }
 
-            return _context.abrupt("continue", 27);
+            return _context.abrupt("continue", 26);
 
-          case 20:
+          case 19:
             _materialAndTextureLi = materialAndTextureList[i], material = _materialAndTextureLi.material, texture = _materialAndTextureLi.texture;
+            nodeId = addNodeToNodePage();
             _context.t0 = result;
             _context.next = 24;
             return _makeNodeResources({
@@ -142,7 +142,7 @@ function _convertB3dmToI3sGeometry() {
               material: material,
               texture: texture,
               tileContent: tileContent,
-              nodeId: nodesCounter,
+              nodeId: nodeId,
               featuresHashArray: featuresHashArray,
               propertyTable: propertyTable,
               attributeStorageInfo: attributeStorageInfo,
@@ -155,25 +155,23 @@ function _convertB3dmToI3sGeometry() {
 
             _context.t0.push.call(_context.t0, _context.t1);
 
-            nodesCounter++;
-
-          case 27:
+          case 26:
             i++;
-            _context.next = 13;
+            _context.next = 12;
             break;
 
-          case 30:
+          case 29:
             if (result.length) {
-              _context.next = 32;
+              _context.next = 31;
               break;
             }
 
             return _context.abrupt("return", null);
 
-          case 32:
+          case 31:
             return _context.abrupt("return", result);
 
-          case 33:
+          case 32:
           case "end":
             return _context.stop();
         }
@@ -217,7 +215,7 @@ function _makeNodeResources(_x10) {
 
 function _makeNodeResources2() {
   _makeNodeResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref) {
-    var _tileContent$gltf2;
+    var _tileContent$gltf5;
 
     var convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, propertyTable, attributeStorageInfo, draco, workerSource, boundingVolumes, vertexCount, _generateAttributes, faceRange, featureIds, positions, normals, colors, texCoords, featureCount, header, typedFeatureIds, fileBuffer, compressedGeometry, attributes;
 
@@ -253,10 +251,11 @@ function _makeNodeResources2() {
             }
 
             return _context2.abrupt("return", {
+              nodeId: nodeId,
               geometry: fileBuffer,
               compressedGeometry: compressedGeometry,
               texture: texture,
-              sharedResources: getSharedResources(((_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : _tileContent$gltf2.materials) || [], nodeId),
+              sharedResources: getSharedResources(((_tileContent$gltf5 = tileContent.gltf) === null || _tileContent$gltf5 === void 0 ? void 0 : _tileContent$gltf5.materials) || [], nodeId),
               meshMaterial: material,
               vertexCount: vertexCount,
               attributes: attributes,
@@ -280,13 +279,13 @@ function convertAttributes(_x11, _x12) {
 
 function _convertAttributes() {
   _convertAttributes = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(attributesData, useCartesianPositions) {
-    var gltfMaterials, nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator7, _step7, material, _iterator8, _step8, attrKey, attributes;
+    var gltfMaterials, nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator7, _step7, material, _iterator8, _step8, attrKey, attributes;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            gltfMaterials = attributesData.gltfMaterials, nodes = attributesData.nodes, cartographicOrigin = attributesData.cartographicOrigin, cartesianModelMatrix = attributesData.cartesianModelMatrix;
+            gltfMaterials = attributesData.gltfMaterials, nodes = attributesData.nodes, images = attributesData.images, cartographicOrigin = attributesData.cartographicOrigin, cartesianModelMatrix = attributesData.cartesianModelMatrix;
             attributesMap = new Map();
             _iterator7 = _createForOfIteratorHelper(gltfMaterials || [{
               id: 'default'
@@ -311,7 +310,7 @@ function _convertAttributes() {
               _iterator7.f();
             }
 
-            convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
+            convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
             _iterator8 = _createForOfIteratorHelper(attributesMap.keys());
             _context3.prev = 6;
 
@@ -384,8 +383,8 @@ function _convertAttributes() {
   return _convertAttributes.apply(this, arguments);
 }
 
-function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
-  var matrix = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new _core.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) {
+  var matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
 
   if (nodes) {
     var _iterator2 = _createForOfIteratorHelper(nodes),
@@ -394,7 +393,7 @@ function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attribute
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var node = _step2.value;
-        convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+        convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
       }
     } catch (err) {
       _iterator2.e(err);
@@ -430,17 +429,16 @@ function getCompositeTransformationMatrix(node, matrix) {
   return transformationMatrix;
 }
 
-function convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
-  var matrix = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new _core.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) {
+  var matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
   var transformationMatrix = getCompositeTransformationMatrix(node, matrix);
   var mesh = node.mesh;
-  var 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) {
@@ -1053,16 +1051,14 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
   return orderedFeatureIndices;
 }
 
-function getPropertyTable(sourceTile) {
-  var _sourceTile$content;
-
-  var batchTableJson = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content = sourceTile.content) === null || _sourceTile$content === void 0 ? void 0 : _sourceTile$content.batchTableJson;
+function getPropertyTable(tileContent) {
+  var batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
 
   if (batchTableJson) {
     return batchTableJson;
   }
 
-  var _getPropertyTableExte = getPropertyTableExtension(sourceTile),
+  var _getPropertyTableExte = getPropertyTableExtension(tileContent),
       extensionName = _getPropertyTableExte.extensionName,
       extension = _getPropertyTableExte.extension;
 
@@ -1083,11 +1079,11 @@ function getPropertyTable(sourceTile) {
   }
 }
 
-function getPropertyTableExtension(sourceTile) {
-  var _sourceTile$content2, _sourceTile$content2$, _sourceTile$content3, _sourceTile$content3$, _sourceTile$content3$2, _sourceTile$content4, _sourceTile$content4$;
+function getPropertyTableExtension(tileContent) {
+  var _tileContent$gltf, _tileContent$gltf2, _tileContent$gltf2$ex, _tileContent$gltf3;
 
   var extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
-  var 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;
+  var extensionsUsed = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.extensionsUsed;
 
   if (!extensionsUsed) {
     return {
@@ -1098,7 +1094,7 @@ function getPropertyTableExtension(sourceTile) {
 
   var extensionName = '';
 
-  var _iterator6 = _createForOfIteratorHelper(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$.extensionsUsed),
+  var _iterator6 = _createForOfIteratorHelper((tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf3 = tileContent.gltf) === null || _tileContent$gltf3 === void 0 ? void 0 : _tileContent$gltf3.extensionsUsed) || []),
       _step6;
 
   try {
@@ -1116,7 +1112,7 @@ function getPropertyTableExtension(sourceTile) {
     _iterator6.f();
   }
 
-  var extension = 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$2 = _sourceTile$content3$.extensions) === null || _sourceTile$content3$2 === void 0 ? void 0 : _sourceTile$content3$2[extensionName];
+  var extension = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : (_tileContent$gltf2$ex = _tileContent$gltf2.extensions) === null || _tileContent$gltf2$ex === void 0 ? void 0 : _tileContent$gltf2$ex[extensionName];
   return {
     extensionName: extensionName,
     extension: extension