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

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = convertB3dmToI3sGeometry;
 exports.convertAttributes = convertAttributes;
+exports.getPropertyTable = getPropertyTable;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -34,6 +35,8 @@ var _gltfAttributes = require("./gltf-attributes");
 
 var _batchIdsExtensions = require("./batch-ids-extensions");
 
+var _featureAttributes = require("./feature-attributes");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -54,14 +57,16 @@ var SHORT_INT_TYPE = 'Int32';
 var DOUBLE_TYPE = 'Float64';
 var OBJECT_ID_TYPE = 'Oid32';
 var BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', 'BATCHID'];
+var EXT_FEATURE_METADATA = 'EXT_feature_metadata';
+var EXT_MESH_FEATURES = 'EXT_mesh_features';
 var scratchVector = new _core.Vector3();
 
-function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
+function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9) {
   return _convertB3dmToI3sGeometry.apply(this, arguments);
 }
 
 function _convertB3dmToI3sGeometry() {
-  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, nodeId, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
     var _tileContent$gltf;
 
     var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, nodesCounter, _ref3, _ref3$materials, materials, i, sourceMaterial, convertedAttributes, _materialAndTextureLi, material, texture;
@@ -139,6 +144,7 @@ function _convertB3dmToI3sGeometry() {
               tileContent: tileContent,
               nodeId: nodesCounter,
               featuresHashArray: featuresHashArray,
+              propertyTable: propertyTable,
               attributeStorageInfo: attributeStorageInfo,
               draco: draco,
               workerSource: workerSource
@@ -205,7 +211,7 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
   }
 }
 
-function _makeNodeResources(_x9) {
+function _makeNodeResources(_x10) {
   return _makeNodeResources2.apply(this, arguments);
 }
 
@@ -213,13 +219,13 @@ function _makeNodeResources2() {
   _makeNodeResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref) {
     var _tileContent$gltf2;
 
-    var convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, workerSource, boundingVolumes, vertexCount, _generateAttributes, faceRange, featureIds, positions, normals, colors, texCoords, featureCount, header, typedFeatureIds, fileBuffer, compressedGeometry, attributes;
+    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;
 
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            convertedAttributes = _ref.convertedAttributes, material = _ref.material, texture = _ref.texture, tileContent = _ref.tileContent, nodeId = _ref.nodeId, featuresHashArray = _ref.featuresHashArray, attributeStorageInfo = _ref.attributeStorageInfo, draco = _ref.draco, workerSource = _ref.workerSource;
+            convertedAttributes = _ref.convertedAttributes, material = _ref.material, texture = _ref.texture, tileContent = _ref.tileContent, nodeId = _ref.nodeId, featuresHashArray = _ref.featuresHashArray, propertyTable = _ref.propertyTable, attributeStorageInfo = _ref.attributeStorageInfo, draco = _ref.draco, workerSource = _ref.workerSource;
             boundingVolumes = convertedAttributes.boundingVolumes;
             vertexCount = convertedAttributes.positions.length / VALUES_PER_VERTEX;
             _generateAttributes = (0, _geometryAttributes.generateAttributes)(convertedAttributes), faceRange = _generateAttributes.faceRange, featureIds = _generateAttributes.featureIds, positions = _generateAttributes.positions, normals = _generateAttributes.normals, colors = _generateAttributes.colors, texCoords = _generateAttributes.texCoords, featureCount = _generateAttributes.featureCount;
@@ -240,7 +246,12 @@ function _makeNodeResources2() {
               featureIds: featureIds,
               faceRange: faceRange
             }, workerSource.draco) : null;
-            attributes = convertBatchTableToAttributeBuffers(tileContent.batchTableJson, featureIds, attributeStorageInfo);
+            attributes = [];
+
+            if (attributeStorageInfo && propertyTable) {
+              attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
+            }
+
             return _context2.abrupt("return", {
               geometry: fileBuffer,
               compressedGeometry: compressedGeometry,
@@ -253,7 +264,7 @@ function _makeNodeResources2() {
               boundingVolumes: boundingVolumes
             });
 
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }
@@ -263,13 +274,13 @@ function _makeNodeResources2() {
   return _makeNodeResources2.apply(this, arguments);
 }
 
-function convertAttributes(_x10, _x11) {
+function convertAttributes(_x11, _x12) {
   return _convertAttributes.apply(this, arguments);
 }
 
 function _convertAttributes() {
   _convertAttributes = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(attributesData, useCartesianPositions) {
-    var gltfMaterials, nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator6, _step6, material, _iterator7, _step7, attrKey, attributes;
+    var gltfMaterials, nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator7, _step7, material, _iterator8, _step8, attrKey, attributes;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -277,13 +288,13 @@ function _convertAttributes() {
           case 0:
             gltfMaterials = attributesData.gltfMaterials, nodes = attributesData.nodes, cartographicOrigin = attributesData.cartographicOrigin, cartesianModelMatrix = attributesData.cartesianModelMatrix;
             attributesMap = new Map();
-            _iterator6 = _createForOfIteratorHelper(gltfMaterials || [{
+            _iterator7 = _createForOfIteratorHelper(gltfMaterials || [{
               id: 'default'
             }]);
 
             try {
-              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                material = _step6.value;
+              for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                material = _step7.value;
                 attributesMap.set(material.id, {
                   positions: new Float32Array(0),
                   normals: new Float32Array(0),
@@ -295,24 +306,24 @@ function _convertAttributes() {
                 });
               }
             } catch (err) {
-              _iterator6.e(err);
+              _iterator7.e(err);
             } finally {
-              _iterator6.f();
+              _iterator7.f();
             }
 
             convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
-            _iterator7 = _createForOfIteratorHelper(attributesMap.keys());
+            _iterator8 = _createForOfIteratorHelper(attributesMap.keys());
             _context3.prev = 6;
 
-            _iterator7.s();
+            _iterator8.s();
 
           case 8:
-            if ((_step7 = _iterator7.n()).done) {
+            if ((_step8 = _iterator8.n()).done) {
               _context3.next = 19;
               break;
             }
 
-            attrKey = _step7.value;
+            attrKey = _step8.value;
             attributes = attributesMap.get(attrKey);
 
             if (attributes) {
@@ -351,12 +362,12 @@ function _convertAttributes() {
             _context3.prev = 21;
             _context3.t0 = _context3["catch"](6);
 
-            _iterator7.e(_context3.t0);
+            _iterator8.e(_context3.t0);
 
           case 24:
             _context3.prev = 24;
 
-            _iterator7.f();
+            _iterator8.f();
 
             return _context3.finish(24);
 
@@ -875,43 +886,47 @@ function replaceIndicesByUnique(indicesArray, featureMap) {
   }
 }
 
-function convertBatchTableToAttributeBuffers(batchTable, featureIds, attributeStorageInfo) {
+function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
   var attributeBuffers = [];
+  var needFlattenPropertyTable = (0, _featureAttributes.checkPropertiesLength)(featureIds, propertyTable);
+  var properties = needFlattenPropertyTable ? (0, _featureAttributes.flattenPropertyTableByFeatureIds)(featureIds, propertyTable) : propertyTable;
+
+  var propertyTableWithObjectIds = _objectSpread({
+    OBJECTID: featureIds
+  }, properties);
+
+  for (var propertyName in propertyTableWithObjectIds) {
+    var type = getAttributeType(propertyName, attributeStorageInfo);
+    var value = propertyTableWithObjectIds[propertyName];
+    var attributeBuffer = generateAttributeBuffer(type, value);
+    attributeBuffers.push(attributeBuffer);
+  }
 
-  if (batchTable) {
-    var batchTableWithFeatureIds = _objectSpread({
-      OBJECTID: featureIds
-    }, batchTable);
-
-    for (var _key2 in batchTableWithFeatureIds) {
-      var type = getAttributeType(_key2, attributeStorageInfo);
-      var attributeBuffer = null;
+  return attributeBuffers;
+}
 
-      switch (type) {
-        case OBJECT_ID_TYPE:
-        case SHORT_INT_TYPE:
-          attributeBuffer = generateShortIntegerAttributeBuffer(batchTableWithFeatureIds[_key2]);
-          break;
+function generateAttributeBuffer(type, value) {
+  var attributeBuffer;
 
-        case DOUBLE_TYPE:
-          attributeBuffer = generateDoubleAttributeBuffer(batchTableWithFeatureIds[_key2]);
-          break;
+  switch (type) {
+    case OBJECT_ID_TYPE:
+    case SHORT_INT_TYPE:
+      attributeBuffer = generateShortIntegerAttributeBuffer(value);
+      break;
 
-        case STRING_TYPE:
-          attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[_key2]);
-          break;
+    case DOUBLE_TYPE:
+      attributeBuffer = generateDoubleAttributeBuffer(value);
+      break;
 
-        default:
-          attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[_key2]);
-      }
+    case STRING_TYPE:
+      attributeBuffer = generateStringAttributeBuffer(value);
+      break;
 
-      if (attributeBuffer) {
-        attributeBuffers.push(attributeBuffer);
-      }
-    }
+    default:
+      attributeBuffer = generateStringAttributeBuffer(value);
   }
 
-  return attributeBuffers;
+  return attributeBuffer;
 }
 
 function getAttributeType(key, attributeStorageInfo) {
@@ -963,7 +978,7 @@ function generateBigUint64Array(featureIds) {
   return typedFeatureIds;
 }
 
-function generateCompressedGeometry(_x12, _x13, _x14, _x15) {
+function generateCompressedGeometry(_x13, _x14, _x15, _x16) {
   return _generateCompressedGeometry.apply(this, arguments);
 }
 
@@ -1037,4 +1052,101 @@ 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;
+
+  if (batchTableJson) {
+    return batchTableJson;
+  }
+
+  var _getPropertyTableExte = getPropertyTableExtension(sourceTile),
+      extensionName = _getPropertyTableExte.extensionName,
+      extension = _getPropertyTableExte.extension;
+
+  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$content3, _sourceTile$content3$, _sourceTile$content3$2, _sourceTile$content4, _sourceTile$content4$;
+
+  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;
+
+  if (!extensionsUsed) {
+    return {
+      extensionName: null,
+      extension: null
+    };
+  }
+
+  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),
+      _step6;
+
+  try {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var extensionItem = _step6.value;
+
+      if (extensionsWithPropertyTables.includes(extensionItem)) {
+        extensionName = extensionItem;
+        break;
+      }
+    }
+  } catch (err) {
+    _iterator6.e(err);
+  } finally {
+    _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];
+  return {
+    extensionName: extensionName,
+    extension: 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;
+
+    var firstFeatureTableName = (_Object$keys = Object.keys(extension.featureTables)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
+
+    if (firstFeatureTableName) {
+      var featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTables[firstFeatureTableName];
+      var propertyTable = {};
+
+      for (var 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