@loaders.gl/i3s 3.4.0-alpha.2 → 3.4.0-alpha.3

package/dist/es5/lib/parsers/parse-i3s-tile-content.js

@@ -21,7 +21,7 @@ var _constants = require("./constants");
 var _customizeColors = require("../utils/customizeColors");
 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; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var scratchVector = new _core2.Vector3([0, 0, 0]);
@@ -46,100 +46,98 @@ function _parseI3STileContent() {
   _parseI3STileContent = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, tileOptions, tilesetOptions, options, context) {
     var content, _options$i3s, url, loader, response, _arrayBuffer, _options, texture;
     return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            content = {
-              attributes: {},
-              indices: null,
-              featureIds: [],
-              vertexCount: 0,
-              modelMatrix: new _core2.Matrix4(),
-              coordinateSystem: 0,
-              byteLength: 0,
-              texture: null
-            };
-            if (!tileOptions.textureUrl) {
-              _context.next = 35;
-              break;
-            }
-            url = (0, _urlUtils.getUrlWithToken)(tileOptions.textureUrl, options === null || options === void 0 ? void 0 : (_options$i3s = options.i3s) === null || _options$i3s === void 0 ? void 0 : _options$i3s.token);
-            loader = getLoaderForTextureFormat(tileOptions.textureFormat);
-            _context.next = 6;
-            return fetch(url, options === null || options === void 0 ? void 0 : options.fetch);
-          case 6:
-            response = _context.sent;
-            _context.next = 9;
-            return response.arrayBuffer();
-          case 9:
-            _arrayBuffer = _context.sent;
-            if (!(options !== null && options !== void 0 && options.i3s.decodeTextures)) {
-              _context.next = 34;
-              break;
-            }
-            if (!(loader === _images.ImageLoader)) {
-              _context.next = 26;
-              break;
-            }
-            _options = _objectSpread(_objectSpread({}, tileOptions.textureLoaderOptions), {}, {
-              image: {
-                type: 'data'
-              }
-            });
-            _context.prev = 13;
-            _context.next = 16;
-            return context.parse(_arrayBuffer, _options);
-          case 16:
-            content.texture = _context.sent;
-            _context.next = 24;
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          content = {
+            attributes: {},
+            indices: null,
+            featureIds: [],
+            vertexCount: 0,
+            modelMatrix: new _core2.Matrix4(),
+            coordinateSystem: 0,
+            byteLength: 0,
+            texture: null
+          };
+          if (!tileOptions.textureUrl) {
+            _context.next = 35;
             break;
-          case 19:
-            _context.prev = 19;
-            _context.t0 = _context["catch"](13);
-            _context.next = 23;
-            return (0, _core.parse)(_arrayBuffer, loader, _options);
-          case 23:
-            content.texture = _context.sent;
-          case 24:
-            _context.next = 32;
+          }
+          url = (0, _urlUtils.getUrlWithToken)(tileOptions.textureUrl, options === null || options === void 0 ? void 0 : (_options$i3s = options.i3s) === null || _options$i3s === void 0 ? void 0 : _options$i3s.token);
+          loader = getLoaderForTextureFormat(tileOptions.textureFormat);
+          _context.next = 6;
+          return fetch(url, options === null || options === void 0 ? void 0 : options.fetch);
+        case 6:
+          response = _context.sent;
+          _context.next = 9;
+          return response.arrayBuffer();
+        case 9:
+          _arrayBuffer = _context.sent;
+          if (!(options !== null && options !== void 0 && options.i3s.decodeTextures)) {
+            _context.next = 34;
             break;
-          case 26:
-            if (!(loader === _textures.CompressedTextureLoader || loader === _textures.BasisLoader)) {
-              _context.next = 32;
-              break;
-            }
-            _context.next = 29;
-            return (0, _core.load)(_arrayBuffer, loader, tileOptions.textureLoaderOptions);
-          case 29:
-            texture = _context.sent;
-            if (loader === _textures.BasisLoader) {
-              texture = texture[0];
-            }
-            content.texture = {
-              compressed: true,
-              mipmaps: false,
-              width: texture[0].width,
-              height: texture[0].height,
-              data: texture
-            };
-          case 32:
-            _context.next = 35;
+          }
+          if (!(loader === _images.ImageLoader)) {
+            _context.next = 26;
             break;
-          case 34:
-            content.texture = _arrayBuffer;
-          case 35:
-            content.material = makePbrMaterial(tileOptions.materialDefinition, content.texture);
-            if (content.material) {
-              content.texture = null;
+          }
+          _options = _objectSpread(_objectSpread({}, tileOptions.textureLoaderOptions), {}, {
+            image: {
+              type: 'data'
             }
-            _context.next = 39;
-            return parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
-          case 39:
-            return _context.abrupt("return", _context.sent);
-          case 40:
-          case "end":
-            return _context.stop();
-        }
+          });
+          _context.prev = 13;
+          _context.next = 16;
+          return context.parse(_arrayBuffer, _options);
+        case 16:
+          content.texture = _context.sent;
+          _context.next = 24;
+          break;
+        case 19:
+          _context.prev = 19;
+          _context.t0 = _context["catch"](13);
+          _context.next = 23;
+          return (0, _core.parse)(_arrayBuffer, loader, _options);
+        case 23:
+          content.texture = _context.sent;
+        case 24:
+          _context.next = 32;
+          break;
+        case 26:
+          if (!(loader === _textures.CompressedTextureLoader || loader === _textures.BasisLoader)) {
+            _context.next = 32;
+            break;
+          }
+          _context.next = 29;
+          return (0, _core.load)(_arrayBuffer, loader, tileOptions.textureLoaderOptions);
+        case 29:
+          texture = _context.sent;
+          if (loader === _textures.BasisLoader) {
+            texture = texture[0];
+          }
+          content.texture = {
+            compressed: true,
+            mipmaps: false,
+            width: texture[0].width,
+            height: texture[0].height,
+            data: texture
+          };
+        case 32:
+          _context.next = 35;
+          break;
+        case 34:
+          content.texture = _arrayBuffer;
+        case 35:
+          content.material = makePbrMaterial(tileOptions.materialDefinition, content.texture);
+          if (content.material) {
+            content.texture = null;
+          }
+          _context.next = 39;
+          return parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
+        case 39:
+          return _context.abrupt("return", _context.sent);
+        case 40:
+        case "end":
+          return _context.stop();
       }
     }, _callee, null, [[13, 19]]);
   }));
@@ -153,90 +151,86 @@ function _parseI3SNodeGeometry() {
     var _options$i3s2;
     var contentByteLength, attributes, vertexCount, byteOffset, featureCount, indices, _decompressedGeometry, decompressedGeometry, _decompressedGeometry2, POSITION, NORMAL, COLOR_0, TEXCOORD_0, featureIndex, uvRegion, featureIds, _tilesetOptions$store, vertexAttributes, attributesOrder, featureAttributes, featureAttributeOrder, headers, _normalizeAttributes, normalizedVertexAttributes, offset, _normalizeAttributes2, normalizedFeatureAttributes, enuMatrix, attributeIndex;
     return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            contentByteLength = arrayBuffer.byteLength;
-            byteOffset = 0;
-            featureCount = 0;
-            if (!tileOptions.isDracoGeometry) {
-              _context2.next = 16;
-              break;
-            }
-            _context2.next = 6;
-            return (0, _core.parse)(arrayBuffer, _draco.DracoLoader, {
-              draco: {
-                attributeNameEntry: I3S_ATTRIBUTE_TYPE
-              }
-            });
-          case 6:
-            decompressedGeometry = _context2.sent;
-            vertexCount = decompressedGeometry.header.vertexCount;
-            indices = (_decompressedGeometry = decompressedGeometry.indices) === null || _decompressedGeometry === void 0 ? void 0 : _decompressedGeometry.value;
-            _decompressedGeometry2 = decompressedGeometry.attributes, POSITION = _decompressedGeometry2.POSITION, NORMAL = _decompressedGeometry2.NORMAL, COLOR_0 = _decompressedGeometry2.COLOR_0, TEXCOORD_0 = _decompressedGeometry2.TEXCOORD_0, featureIndex = _decompressedGeometry2['feature-index'], uvRegion = _decompressedGeometry2['uv-region'];
-            attributes = {
-              position: POSITION,
-              normal: NORMAL,
-              color: COLOR_0,
-              uv0: TEXCOORD_0,
-              uvRegion: uvRegion,
-              id: featureIndex
-            };
-            updateAttributesMetadata(attributes, decompressedGeometry);
-            featureIds = getFeatureIdsFromFeatureIndexMetadata(featureIndex);
-            if (featureIds) {
-              flattenFeatureIdsByFeatureIndices(attributes, featureIds);
-            }
-            _context2.next = 25;
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          contentByteLength = arrayBuffer.byteLength;
+          byteOffset = 0;
+          featureCount = 0;
+          if (!tileOptions.isDracoGeometry) {
+            _context2.next = 16;
             break;
-          case 16:
-            _tilesetOptions$store = tilesetOptions.store.defaultGeometrySchema, vertexAttributes = _tilesetOptions$store.vertexAttributes, attributesOrder = _tilesetOptions$store.ordering, featureAttributes = _tilesetOptions$store.featureAttributes, featureAttributeOrder = _tilesetOptions$store.featureAttributeOrder;
-            headers = parseHeaders(arrayBuffer, tilesetOptions);
-            byteOffset = headers.byteOffset;
-            vertexCount = headers.vertexCount;
-            featureCount = headers.featureCount;
-            _normalizeAttributes = normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, vertexCount, attributesOrder), normalizedVertexAttributes = _normalizeAttributes.attributes, offset = _normalizeAttributes.byteOffset;
-            _normalizeAttributes2 = normalizeAttributes(arrayBuffer, offset, featureAttributes, featureCount, featureAttributeOrder), normalizedFeatureAttributes = _normalizeAttributes2.attributes;
-            flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes);
-            attributes = concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes);
-          case 25:
-            if (!(options !== null && options !== void 0 && (_options$i3s2 = options.i3s) !== null && _options$i3s2 !== void 0 && _options$i3s2.coordinateSystem) || options.i3s.coordinateSystem === _constants.COORDINATE_SYSTEM.METER_OFFSETS) {
-              enuMatrix = parsePositions(attributes.position, tileOptions);
-              content.modelMatrix = enuMatrix.invert();
-              content.coordinateSystem = _constants.COORDINATE_SYSTEM.METER_OFFSETS;
-            } else {
-              content.modelMatrix = getModelMatrix(attributes.position);
-              content.coordinateSystem = _constants.COORDINATE_SYSTEM.LNGLAT_OFFSETS;
-            }
-            _context2.next = 28;
-            return (0, _customizeColors.customizeColors)(attributes.color, attributes.id, tileOptions, tilesetOptions, options);
-          case 28:
-            attributes.color = _context2.sent;
-            content.attributes = {
-              positions: attributes.position,
-              normals: attributes.normal,
-              colors: normalizeAttribute(attributes.color),
-              texCoords: attributes.uv0,
-              uvRegions: normalizeAttribute(attributes.uvRegion || attributes.region)
-            };
-
-            content.indices = indices || null;
-            if (attributes.id && attributes.id.value) {
-              content.featureIds = attributes.id.value;
+          }
+          _context2.next = 6;
+          return (0, _core.parse)(arrayBuffer, _draco.DracoLoader, {
+            draco: {
+              attributeNameEntry: I3S_ATTRIBUTE_TYPE
             }
-
-            for (attributeIndex in content.attributes) {
-              if (!content.attributes[attributeIndex]) {
-                delete content.attributes[attributeIndex];
-              }
+          });
+        case 6:
+          decompressedGeometry = _context2.sent;
+          vertexCount = decompressedGeometry.header.vertexCount;
+          indices = (_decompressedGeometry = decompressedGeometry.indices) === null || _decompressedGeometry === void 0 ? void 0 : _decompressedGeometry.value;
+          _decompressedGeometry2 = decompressedGeometry.attributes, POSITION = _decompressedGeometry2.POSITION, NORMAL = _decompressedGeometry2.NORMAL, COLOR_0 = _decompressedGeometry2.COLOR_0, TEXCOORD_0 = _decompressedGeometry2.TEXCOORD_0, featureIndex = _decompressedGeometry2['feature-index'], uvRegion = _decompressedGeometry2['uv-region'];
+          attributes = {
+            position: POSITION,
+            normal: NORMAL,
+            color: COLOR_0,
+            uv0: TEXCOORD_0,
+            uvRegion: uvRegion,
+            id: featureIndex
+          };
+          updateAttributesMetadata(attributes, decompressedGeometry);
+          featureIds = getFeatureIdsFromFeatureIndexMetadata(featureIndex);
+          if (featureIds) {
+            flattenFeatureIdsByFeatureIndices(attributes, featureIds);
+          }
+          _context2.next = 25;
+          break;
+        case 16:
+          _tilesetOptions$store = tilesetOptions.store.defaultGeometrySchema, vertexAttributes = _tilesetOptions$store.vertexAttributes, attributesOrder = _tilesetOptions$store.ordering, featureAttributes = _tilesetOptions$store.featureAttributes, featureAttributeOrder = _tilesetOptions$store.featureAttributeOrder;
+          headers = parseHeaders(arrayBuffer, tilesetOptions);
+          byteOffset = headers.byteOffset;
+          vertexCount = headers.vertexCount;
+          featureCount = headers.featureCount;
+          _normalizeAttributes = normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, vertexCount, attributesOrder), normalizedVertexAttributes = _normalizeAttributes.attributes, offset = _normalizeAttributes.byteOffset;
+          _normalizeAttributes2 = normalizeAttributes(arrayBuffer, offset, featureAttributes, featureCount, featureAttributeOrder), normalizedFeatureAttributes = _normalizeAttributes2.attributes;
+          flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes);
+          attributes = concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes);
+        case 25:
+          if (!(options !== null && options !== void 0 && (_options$i3s2 = options.i3s) !== null && _options$i3s2 !== void 0 && _options$i3s2.coordinateSystem) || options.i3s.coordinateSystem === _constants.COORDINATE_SYSTEM.METER_OFFSETS) {
+            enuMatrix = parsePositions(attributes.position, tileOptions);
+            content.modelMatrix = enuMatrix.invert();
+            content.coordinateSystem = _constants.COORDINATE_SYSTEM.METER_OFFSETS;
+          } else {
+            content.modelMatrix = getModelMatrix(attributes.position);
+            content.coordinateSystem = _constants.COORDINATE_SYSTEM.LNGLAT_OFFSETS;
+          }
+          _context2.next = 28;
+          return (0, _customizeColors.customizeColors)(attributes.color, attributes.id, tileOptions, tilesetOptions, options);
+        case 28:
+          attributes.color = _context2.sent;
+          content.attributes = {
+            positions: attributes.position,
+            normals: attributes.normal,
+            colors: normalizeAttribute(attributes.color),
+            texCoords: attributes.uv0,
+            uvRegions: normalizeAttribute(attributes.uvRegion || attributes.region)
+          };
+          content.indices = indices || null;
+          if (attributes.id && attributes.id.value) {
+            content.featureIds = attributes.id.value;
+          }
+          for (attributeIndex in content.attributes) {
+            if (!content.attributes[attributeIndex]) {
+              delete content.attributes[attributeIndex];
             }
-            content.vertexCount = vertexCount;
-            content.byteLength = contentByteLength;
-            return _context2.abrupt("return", content);
-          case 36:
-          case "end":
-            return _context2.stop();
-        }
+          }
+          content.vertexCount = vertexCount;
+          content.byteLength = contentByteLength;
+          return _context2.abrupt("return", content);
+        case 36:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
   }));
@@ -257,11 +251,9 @@ function updateAttributesMetadata(attributes, decompressedGeometry) {
     }
   }
 }
-
 function concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes) {
   return _objectSpread(_objectSpread({}, normalizedVertexAttributes), normalizedFeatureAttributes);
 }
-
 function normalizeAttribute(attribute) {
   if (!attribute) {
     return attribute;
@@ -305,10 +297,8 @@ function parseHeaders(arrayBuffer, options) {
     byteOffset: byteOffset
   };
 }
-
 function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, attributeCount, attributesOrder) {
   var attributes = {};
-
   var _iterator2 = _createForOfIteratorHelper(attributesOrder),
     _step2;
   try {
@@ -357,7 +347,6 @@ function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, attribut
     byteOffset: byteOffset
   };
 }
-
 function parseUint64Values(buffer, elementsCount, attributeSize) {
   var values = [];
   var dataView = new DataView(buffer);
@@ -383,7 +372,6 @@ function parsePositions(attribute, options) {
   attribute.value = offsetsToCartesians(value, metadata, cartographicOrigin);
   return enuMatrix;
 }
-
 function offsetsToCartesians(vertices) {
   var metadata = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var cartographicOrigin = arguments.length > 2 ? arguments[2] : undefined;
@@ -403,7 +391,6 @@ function offsetsToCartesians(vertices) {
   }
   return positions;
 }
-
 function getModelMatrix(positions) {
   var _metadata$i3sScale_x, _metadata$i3sScale_y;
   var metadata = positions.metadata;
@@ -414,7 +401,6 @@ function getModelMatrix(positions) {
   modelMatrix[5] = scaleY;
   return modelMatrix;
 }
-
 function makePbrMaterial(materialDefinition, texture) {
   var pbrMaterial;
   if (materialDefinition) {
@@ -435,12 +421,10 @@ function makePbrMaterial(materialDefinition, texture) {
       pbrMaterial.pbrMetallicRoughness.baseColorFactor = [255, 255, 255, 255];
     }
   }
-
   pbrMaterial.alphaCutoff = pbrMaterial.alphaCutoff || 0.25;
   if (pbrMaterial.alphaMode) {
     pbrMaterial.alphaMode = pbrMaterial.alphaMode.toUpperCase();
   }
-
   if (pbrMaterial.emissiveFactor) {
     pbrMaterial.emissiveFactor = convertColorFormat(pbrMaterial.emissiveFactor);
   }
@@ -452,7 +436,6 @@ function makePbrMaterial(materialDefinition, texture) {
   }
   return pbrMaterial;
 }
-
 function convertColorFormat(colorFactor) {
   var normalizedColor = (0, _toConsumableArray2.default)(colorFactor);
   for (var index = 0; index < colorFactor.length; index++) {
@@ -460,7 +443,6 @@ function convertColorFormat(colorFactor) {
   }
   return normalizedColor;
 }
-
 function setMaterialTexture(material, image) {
   var texture = {
     source: {
@@ -489,7 +471,6 @@ function setMaterialTexture(material, image) {
     });
   }
 }
-
 function flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes) {
   var id = normalizedFeatureAttributes.id,
     faceRange = normalizedFeatureAttributes.faceRange;
@@ -514,7 +495,6 @@ function flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes) {
   }
   normalizedFeatureAttributes.id.value = orderedFeatureIndices;
 }
-
 function flattenFeatureIdsByFeatureIndices(attributes, featureIds) {
   var featureIndices = attributes.id.value;
   var result = new Float32Array(featureIndices.length);
@@ -523,7 +503,6 @@ function flattenFeatureIdsByFeatureIndices(attributes, featureIds) {
   }
   attributes.id.value = result;
 }
-
 function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
   var _featureIndex$metadat, _featureIndex$metadat2;
   return featureIndex === null || featureIndex === void 0 ? void 0 : (_featureIndex$metadat = featureIndex.metadata) === null || _featureIndex$metadat === void 0 ? void 0 : (_featureIndex$metadat2 = _featureIndex$metadat['i3s-feature-ids']) === null || _featureIndex$metadat2 === void 0 ? void 0 : _featureIndex$metadat2.intArray;