@cesium/engine 10.1.0 → 11.1.0

package/Source/Scene/I3SLayer.js

@@ -48,7 +48,7 @@ function I3SLayer(dataProvider, layerData, parent) {
 
   this._resource = new Resource({ url: tilesetUrl });
   this._resource.setQueryParameters(
-    this._dataProvider.resource.queryParameters
+    this._dataProvider.resource.queryParameters,
   );
   this._resource.appendForwardSlash();
   this._data = layerData;
@@ -179,7 +179,7 @@ Object.defineProperties(I3SLayer.prototype, {
 I3SLayer.prototype.load = async function (cesium3dTilesetOptions) {
   if (this._data.spatialReference.wkid !== 4326) {
     throw new RuntimeError(
-      `Unsupported spatial reference: ${this._data.spatialReference.wkid}`
+      `Unsupported spatial reference: ${this._data.spatialReference.wkid}`,
     );
   }
 
@@ -214,8 +214,8 @@ I3SLayer.prototype._computeGeometryDefinitions = function (useCompression) {
       defIndex++
     ) {
       const geometryBuffersInfo = [];
-      const geometryBuffers = this._data.geometryDefinitions[defIndex]
-        .geometryBuffers;
+      const geometryBuffers =
+        this._data.geometryDefinitions[defIndex].geometryBuffers;
 
       for (let bufIndex = 0; bufIndex < geometryBuffers.length; bufIndex++) {
         const geometryBuffer = geometryBuffers[bufIndex];
@@ -264,7 +264,7 @@ I3SLayer.prototype._computeGeometryDefinitions = function (useCompression) {
  */
 I3SLayer.prototype._findBestGeometryBuffers = function (
   definition,
-  attributes
+  attributes,
 ) {
   // find the most appropriate geometry definition
   // based on the required attributes, and by favouring
@@ -291,9 +291,15 @@ I3SLayer.prototype._findBestGeometryBuffers = function (
         };
       }
     }
+    // If no match found return first geometryBuffer
+    if (defined(geometryDefinition[0])) {
+      return {
+        bufferIndex: 0,
+        definition: geometryDefinition,
+        geometryBufferInfo: geometryDefinition[0],
+      };
+    }
   }
-
-  return 0;
 };
 
 /**
@@ -342,16 +348,16 @@ I3SLayer.prototype._loadNodePage = function (page) {
     const nodePageResource = this.resource.getDerivedResource({
       url: `nodepages/${page}/`,
     });
-    const fetchPromise = I3SLayer._fetchJson(nodePageResource).then(function (
-      data
-    ) {
-      if (defined(data.error) && data.error.code !== 200) {
-        return Promise.reject(data.error);
-      }
+    const fetchPromise = I3SLayer._fetchJson(nodePageResource).then(
+      function (data) {
+        if (defined(data.error) && data.error.code !== 200) {
+          return Promise.reject(data.error);
+        }
 
-      that._nodePages[page] = data.nodes;
-      return data;
-    });
+        that._nodePages[page] = data.nodes;
+        return data;
+      },
+    );
 
     this._nodePageFetches[page] = fetchPromise;
   }
@@ -368,14 +374,14 @@ I3SLayer.prototype._computeExtent = function () {
       this._data.fullExtent.xmin,
       this._data.fullExtent.ymin,
       this._data.fullExtent.xmax,
-      this._data.fullExtent.ymax
+      this._data.fullExtent.ymax,
     );
   } else if (defined(this._data.store.extent)) {
     this._extent = Rectangle.fromDegrees(
       this._data.store.extent[0],
       this._data.store.extent[1],
       this._data.store.extent[2],
-      this._data.store.extent[3]
+      this._data.store.extent[3],
     );
   }
 };
@@ -403,12 +409,12 @@ I3SLayer.prototype._create3DTileset = async function (cesium3dTilesetOptions) {
       ? clone(cesium3dTilesetOptions)
       : {};
     cesium3dTilesetOptions.outlineColor = Color.fromCartesian4(
-      Cartesian4.fromArray(outlineColor)
+      Cartesian4.fromArray(outlineColor),
     );
   }
   this._tileset = await Cesium3DTileset.fromUrl(
     tilesetUrl,
-    cesium3dTilesetOptions
+    cesium3dTilesetOptions,
   );
   this._tileset.show = this._parent.show;
   this._tileset._isI3STileSet = true;

package/Source/Scene/I3SNode.js

@@ -195,7 +195,7 @@ I3SNode.prototype.load = async function () {
         that._layer._tileset,
         that._dataProvider.resource,
         tileDefinition,
-        that._parent._tile
+        that._parent._tile,
       );
 
       that._tile._i3sNode = that;
@@ -219,7 +219,7 @@ I3SNode.prototype.load = async function () {
     const uriIndex = node.mesh.geometry.resource;
     uri = `../${uriIndex}/`;
   }
-  if (defined(uri)) {
+  if (defined(uri) && defined(that._parent.resource)) {
     that._resource = that._parent.resource.getDerivedResource({ url: uri });
   }
 
@@ -298,7 +298,7 @@ I3SNode.prototype.getFieldsForPickedPosition = function (pickedPosition) {
   const location = geometry.getClosestPointIndexOnTriangle(
     pickedPosition.x,
     pickedPosition.y,
-    pickedPosition.z
+    pickedPosition.z,
   );
 
   if (
@@ -351,7 +351,7 @@ I3SNode.prototype._loadChildren = function () {
       const newChild = new I3SNode(
         that,
         defaultValue(child.href, child),
-        false
+        false,
       );
       that._children.push(newChild);
       childPromises.push(newChild.load());
@@ -383,7 +383,7 @@ I3SNode.prototype._loadGeometryData = function () {
     ) {
       const curGeometryData = new I3SGeometry(
         this,
-        this._data.geometryData[geomIndex].href
+        this._data.geometryData[geomIndex].href,
       );
       this._geometryData.push(curGeometryData);
       geometryPromises.push(curGeometryData.load());
@@ -391,7 +391,7 @@ I3SNode.prototype._loadGeometryData = function () {
   } else if (defined(this._data.mesh)) {
     const geometryDefinition = this._layer._findBestGeometryBuffers(
       this._data.mesh.geometry.definition,
-      ["position", "uv0"]
+      ["position", "uv0"],
     );
 
     const geometryURI = `./geometries/${geometryDefinition.bufferIndex}/`;
@@ -421,7 +421,7 @@ I3SNode.prototype._loadFeatureData = function () {
     ) {
       const newFeatureData = new I3SFeature(
         this,
-        this._data.featureData[featureIndex].href
+        this._data.featureData[featureIndex].href,
       );
       this._featureData.push(newFeatureData);
       featurePromises.push(newFeatureData.load());
@@ -456,7 +456,7 @@ I3SNode.prototype._create3DTileDefinition = function () {
     geoPosition = Cartographic.fromDegrees(
       obb.center[0],
       obb.center[1],
-      obb.center[2]
+      obb.center[2],
     );
   } else {
     geoPosition = Cartographic.fromDegrees(mbs[0], mbs[1], mbs[2]);
@@ -501,7 +501,7 @@ I3SNode.prototype._create3DTileDefinition = function () {
     };
     span = Math.max(
       Math.max(this._data.obb.halfSize[0], this._data.obb.halfSize[1]),
-      this._data.obb.halfSize[2]
+      this._data.obb.halfSize[2],
     );
     position = Ellipsoid.WGS84.cartographicToCartesian(geoPosition);
   } else {
@@ -522,7 +522,7 @@ I3SNode.prototype._create3DTileDefinition = function () {
       "maxScreenThresholdSQ"
     ) {
       const maxScreenThreshold = Math.sqrt(
-        this._data.lodThreshold / (Math.PI * 0.25)
+        this._data.lodThreshold / (Math.PI * 0.25),
       );
       metersPerPixel = span / maxScreenThreshold;
     } else if (
@@ -565,7 +565,7 @@ I3SNode.prototype._create3DTileDefinition = function () {
       this._data.obb.quaternion[0],
       this._data.obb.quaternion[1],
       this._data.obb.quaternion[2],
-      this._data.obb.quaternion[3]
+      this._data.obb.quaternion[3],
     );
   }
 
@@ -588,12 +588,12 @@ I3SNode.prototype._create3DTileDefinition = function () {
     position.x,
     position.y,
     position.z,
-    1
+    1,
   );
 
   const inverseGlobalTransform = Matrix4.inverse(
     globalTransform,
-    new Matrix4()
+    new Matrix4(),
   );
 
   const localTransform = Matrix4.clone(globalTransform);
@@ -602,7 +602,7 @@ I3SNode.prototype._create3DTileDefinition = function () {
     Matrix4.multiply(
       globalTransform,
       this._parent._inverseGlobalTransform,
-      localTransform
+      localTransform,
     );
   }
 
@@ -614,7 +614,7 @@ I3SNode.prototype._create3DTileDefinition = function () {
   const childrenDefinition = [];
   for (let childIndex = 0; childIndex < this._children.length; childIndex++) {
     childrenDefinition.push(
-      this._children[childIndex]._create3DTileDefinition()
+      this._children[childIndex]._create3DTileDefinition(),
     );
   }
 
@@ -709,7 +709,7 @@ I3SNode.prototype._createContentURL = async function () {
       geometrySchema,
       geometryData,
       this._featureData[0],
-      this._symbologyData
+      this._symbologyData,
     );
     if (!defined(result)) {
       // Postponed
@@ -724,7 +724,7 @@ I3SNode.prototype._createContentURL = async function () {
       result.meshData.bufferViews,
       result.meshData.accessors,
       result.meshData.rootExtensions,
-      result.meshData.extensionsUsed
+      result.meshData.extensionsUsed,
     );
 
     this._geometryData[0]._customAttributes = result.meshData._customAttributes;

package/Source/Scene/I3SSublayer.js

@@ -129,7 +129,7 @@ I3SSublayer._fromData = async function (
   dataProvider,
   buildingLayerUrl,
   sublayerData,
-  parent
+  parent,
 ) {
   const sublayer = new I3SSublayer(dataProvider, parent, sublayerData);
   if (sublayer._data.layerType === "group") {
@@ -141,7 +141,7 @@ I3SSublayer._fromData = async function (
           dataProvider,
           buildingLayerUrl,
           sublayers[i],
-          sublayer
+          sublayer,
         );
         promises.push(promise);
       }
@@ -154,7 +154,7 @@ I3SSublayer._fromData = async function (
     }
   } else if (sublayer._data.layerType === "3DObject") {
     const sublayerUrl = buildingLayerUrl.concat(
-      `/sublayers/${sublayer._data.id}`
+      `/sublayers/${sublayer._data.id}`,
     );
     const resource = new Resource({ url: sublayerUrl });
     resource.setQueryParameters(dataProvider.resource.queryParameters);
@@ -167,7 +167,7 @@ I3SSublayer._fromData = async function (
   } else {
     // Filter other scene layer types out
     console.log(
-      `${sublayer._data.layerType} layer ${sublayer._data.name} is skipped as not supported.`
+      `${sublayer._data.layerType} layer ${sublayer._data.name} is skipped as not supported.`,
     );
   }
   return sublayer;

package/Source/Scene/I3SSymbology.js

@@ -73,7 +73,7 @@ function parseSymbol(symbol, isColorCaptured) {
           if (defined(edges.color)) {
             symbology.edges.color = convertColor(
               edges.color,
-              edges.transparency
+              edges.transparency,
             );
           }
         } else if (defined(outline)) {
@@ -81,7 +81,7 @@ function parseSymbol(symbol, isColorCaptured) {
           if (defined(outline.color)) {
             symbology.edges.color = convertColor(
               outline.color,
-              outline.transparency
+              outline.transparency,
             );
           }
         }
@@ -95,7 +95,7 @@ function parseSymbol(symbol, isColorCaptured) {
             if (defined(material.color)) {
               symbology.material.color = convertColor(
                 material.color,
-                material.transparency
+                material.transparency,
               );
             }
           }
@@ -120,7 +120,7 @@ function buildUniqueValueHash(renderer, isColorCaptured) {
         for (let classIndex = 0; classIndex < classes.length; classIndex++) {
           const classSymbology = parseSymbol(
             classes[classIndex].symbol,
-            isColorCaptured
+            isColorCaptured,
           );
           const values = classes[classIndex].values;
           for (let valueIndex = 0; valueIndex < values.length; valueIndex++) {
@@ -222,7 +222,7 @@ I3SSymbology.prototype._parseLayerSymbology = function () {
     } else if (renderer.type === "uniqueValue") {
       this._defaultSymbology = parseSymbol(
         renderer.defaultSymbol,
-        isColorCaptured
+        isColorCaptured,
       );
       this._valueFields.push(renderer.field1);
       if (defined(renderer.field2)) {
@@ -235,7 +235,7 @@ I3SSymbology.prototype._parseLayerSymbology = function () {
     } else if (renderer.type === "classBreaks") {
       this._defaultSymbology = parseSymbol(
         renderer.defaultSymbol,
-        isColorCaptured
+        isColorCaptured,
       );
       this._valueFields.push(renderer.field);
       this._classBreaksHash = buildClassBreaksHash(renderer, isColorCaptured);
@@ -305,14 +305,14 @@ I3SSymbology.prototype._getSymbology = async function (node) {
           this._uniqueValueHash,
           fieldsValues,
           0,
-          featureIndex
+          featureIndex,
         );
     } else if (defined(this._classBreaksHash)) {
       featureHashFn = (featureIndex) =>
         findHashForClassBreaks(
           this._classBreaksHash,
           fieldsValues[0],
-          featureIndex
+          featureIndex,
         );
     }
 

package/Source/Scene/I3dmParser.js

@@ -39,7 +39,7 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
   const version = view.getUint32(byteOffset, true);
   if (version !== 1) {
     throw new RuntimeError(
-      `Only Instanced 3D Model version 1 is supported. Version ${version} is not.`
+      `Only Instanced 3D Model version 1 is supported. Version ${version} is not.`,
     );
   }
   byteOffset += sizeOfUint32;
@@ -50,7 +50,7 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
   const featureTableJsonByteLength = view.getUint32(byteOffset, true);
   if (featureTableJsonByteLength === 0) {
     throw new RuntimeError(
-      "featureTableJsonByteLength is zero, the feature table must be defined."
+      "featureTableJsonByteLength is zero, the feature table must be defined.",
     );
   }
   byteOffset += sizeOfUint32;
@@ -67,7 +67,7 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
   const gltfFormat = view.getUint32(byteOffset, true);
   if (gltfFormat !== 1 && gltfFormat !== 0) {
     throw new RuntimeError(
-      `Only glTF format 0 (uri) or 1 (embedded) are supported. Format ${gltfFormat} is not.`
+      `Only glTF format 0 (uri) or 1 (embedded) are supported. Format ${gltfFormat} is not.`,
     );
   }
   byteOffset += sizeOfUint32;
@@ -75,14 +75,14 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
   const featureTableJson = getJsonFromTypedArray(
     uint8Array,
     byteOffset,
-    featureTableJsonByteLength
+    featureTableJsonByteLength,
   );
   byteOffset += featureTableJsonByteLength;
 
   const featureTableBinary = new Uint8Array(
     arrayBuffer,
     byteOffset,
-    featureTableBinaryByteLength
+    featureTableBinaryByteLength,
   );
   byteOffset += featureTableBinaryByteLength;
 
@@ -92,7 +92,7 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
     batchTableJson = getJsonFromTypedArray(
       uint8Array,
       byteOffset,
-      batchTableJsonByteLength
+      batchTableJsonByteLength,
     );
     byteOffset += batchTableJsonByteLength;
 
@@ -101,7 +101,7 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
       batchTableBinary = new Uint8Array(
         arrayBuffer,
         byteOffset,
-        batchTableBinaryByteLength
+        batchTableBinaryByteLength,
       );
       // Copy the batchTableBinary section and let the underlying ArrayBuffer be freed
       batchTableBinary = new Uint8Array(batchTableBinary);
@@ -121,10 +121,10 @@ I3dmParser.parse = function (arrayBuffer, byteOffset) {
     // Create a copy of the glb so that it is 4-byte aligned
     I3dmParser._deprecationWarning(
       "i3dm-glb-unaligned",
-      "The embedded glb is not aligned to a 4-byte boundary."
+      "The embedded glb is not aligned to a 4-byte boundary.",
     );
     gltfView = new Uint8Array(
-      uint8Array.subarray(byteOffset, byteOffset + gltfByteLength)
+      uint8Array.subarray(byteOffset, byteOffset + gltfByteLength),
     );
   }