@cesium/engine 25.0.0 → 26.0.0

package/Source/Scene/VectorGltf3DTileContent.js

@@ -10,7 +10,6 @@ import BufferPolyline from "./BufferPolyline.js";
 import BufferPolylineCollection from "./BufferPolylineCollection.js";
 import BufferPolylineMaterial from "./BufferPolylineMaterial.js";
 import Cesium3DTileStyle from "./Cesium3DTileStyle.js";
-import Color from "../Core/Color.js";
 import Matrix4 from "../Core/Matrix4.js";
 import Model from "./Model/Model.js";
 import ModelUtility from "./Model/ModelUtility.js";
@@ -28,6 +27,7 @@ import DeveloperError from "../Core/DeveloperError.js";
 /** @import Cesium3DTileBatchTable from "./Cesium3DTileBatchTable.js"; */
 /** @import Cesium3DTileVectorFeature from "./Cesium3DTileVectorFeature.js";*/
 /** @import Cesium3DTileset from "./Cesium3DTileset.js"; */
+/** @import Color from "../Core/Color.js"; */
 /** @import FrameState from "./FrameState.js"; */
 /** @import ImplicitMetadataView from "./ImplicitMetadataView.js"; */
 /** @import Ray from "../Core/Ray.js"; */
@@ -73,14 +73,30 @@ class VectorGltf3DTileContent {
     /** @type {Model} */
     this._model = undefined;
 
-    /** @type {Array<BufferPrimitiveCollection<BufferPrimitive>>} */
+    /**
+     * List of all vector primitive collections.
+     * @type {Array<BufferPrimitiveCollection<BufferPrimitive>>}
+     */
     this._collections = [];
 
-    /** @type {Array<Matrix4>} */
+    /**
+     * List of transform matrices for each collection; order matches 'collections'.
+     * @type {Array<Matrix4>}
+     */
     this._collectionLocalMatrices = [];
 
-    /** @type {Map<number, Cesium3DTileVectorFeature>} */
-    this._features = new Map();
+    /**
+     * Maps vector primitive collection -> propertyTableId.
+     * @type {Map<BufferPrimitiveCollection<BufferPrimitive>, number>}
+     */
+    this._collectionFeatureTableIds = new Map();
+
+    /**
+     * Maps propertyTableId -> featureId -> feature. Note that Feature IDs are
+     * unique within their assigned property table, but not globally unique.
+     * @type {Map<number, Map<number, Cesium3DTileVectorFeature>>}
+     */
+    this._featuresByTableId = new Map();
 
     /** @type {ImplicitMetadataView} */
     this._metadata = undefined;
@@ -98,8 +114,8 @@ class VectorGltf3DTileContent {
   }
 
   get featuresLength() {
-    return this._collections.reduce(
-      (acc, collection) => acc + collection.primitiveCount,
+    return this.batchTables.reduce(
+      (acc, batchTable) => acc + batchTable.featuresLength,
       0,
     );
   }
@@ -132,7 +148,11 @@ class VectorGltf3DTileContent {
   }
 
   get batchTableByteLength() {
-    return 0;
+    return this.batchTables.reduce(
+      // @ts-expect-error Missing types.
+      (acc, batchTable) => acc + batchTable.batchTableByteLength,
+      0,
+    );
   }
 
   /** @returns {undefined} */
@@ -189,19 +209,21 @@ class VectorGltf3DTileContent {
 
   /**
    * @param {number} featureId
+   * @param {number} [featureTableId]
    * @returns {Cesium3DTileVectorFeature}
    */
-  getFeature(featureId) {
-    return this._features.get(featureId);
+  getFeature(featureId, featureTableId) {
+    return this._featuresByTableId.get(featureTableId)?.get(featureId);
   }
 
   /**
    * @param {number} featureId
    * @param {string} name
+   * @param {number} [featureTableId]
    * @returns {boolean}
    */
-  hasProperty(featureId, name) {
-    const feature = this.getFeature(featureId);
+  hasProperty(featureId, name, featureTableId) {
+    const feature = this.getFeature(featureId, featureTableId);
     return feature ? feature.hasProperty(name) : false;
   }
 
@@ -210,8 +232,10 @@ class VectorGltf3DTileContent {
    * @param {Color} color
    */
   applyDebugSettings(enabled, color) {
-    color = enabled ? color : Color.WHITE;
-    this.applyStyle(new Cesium3DTileStyle({ color }));
+    const colorString = enabled
+      ? `color("${color.toCssHexString()}", 1.0)`
+      : 'color("white", 1.0)';
+    this.applyStyle(new Cesium3DTileStyle({ color: colorString }));
   }
 
   /**
@@ -226,40 +250,64 @@ class VectorGltf3DTileContent {
       c instanceof BufferPolygonCollection;
 
     for (const collection of this._collections.filter(isPointCollection)) {
+      const featureTableId = this._collectionFeatureTableIds.get(collection);
       for (let i = 0, il = collection.primitiveCount; i < il; i++) {
         collection.get(i, point);
-        const feature = this.getFeature(point.featureId);
-
-        point.show = style.show?.evaluate(feature) ?? true;
-        style.color?.evaluate(feature, pointMaterial.color);
-        pointMaterial.size = style.pointSize?.evaluate(feature);
-        pointMaterial.outlineWidth = style.pointOutlineWidth?.evaluate(feature);
-        style.pointOutlineColor?.evaluate(feature, pointMaterial.outlineColor);
+        const feature = this.getFeature(point.featureId, featureTableId);
+
+        if (defined(style.show)) {
+          point.show = style.show.evaluate(feature);
+        }
+        if (defined(style.color)) {
+          style.color.evaluate(feature, pointMaterial.color);
+        }
+        if (defined(style.pointSize)) {
+          pointMaterial.size = style.pointSize.evaluate(feature);
+        }
+        if (defined(style.pointOutlineWidth)) {
+          pointMaterial.outlineWidth =
+            style.pointOutlineWidth.evaluate(feature);
+        }
+        if (defined(style.pointOutlineColor)) {
+          style.pointOutlineColor.evaluate(feature, pointMaterial.outlineColor);
+        }
 
         point.setMaterial(pointMaterial);
       }
     }
 
     for (const collection of this._collections.filter(isPolylineCollection)) {
+      const featureTableId = this._collectionFeatureTableIds.get(collection);
       for (let i = 0, il = collection.primitiveCount; i < il; i++) {
         collection.get(i, polyline);
-        const feature = this.getFeature(polyline.featureId);
-
-        polyline.show = style.show?.evaluate(feature) ?? true;
-        style.color?.evaluate(feature, polylineMaterial.color);
-        polylineMaterial.width = style.lineWidth?.evaluate(feature) ?? 1;
+        const feature = this.getFeature(polyline.featureId, featureTableId);
+
+        if (defined(style.show)) {
+          polyline.show = style.show.evaluate(feature);
+        }
+        if (defined(style.color)) {
+          style.color.evaluate(feature, polylineMaterial.color);
+        }
+        if (defined(style.lineWidth)) {
+          polylineMaterial.width = style.lineWidth.evaluate(feature);
+        }
 
         polyline.setMaterial(polylineMaterial);
       }
     }
 
     for (const collection of this._collections.filter(isPolygonCollection)) {
+      const featureTableId = this._collectionFeatureTableIds.get(collection);
       for (let i = 0, il = collection.primitiveCount; i < il; i++) {
         collection.get(i, polygon);
-        const feature = this.getFeature(polygon.featureId);
+        const feature = this.getFeature(polygon.featureId, featureTableId);
 
-        polygon.show = style.show?.evaluate(feature) ?? true;
-        style.color?.evaluate(feature, polygonMaterial.color);
+        if (defined(style.show)) {
+          polygon.show = style.show.evaluate(feature);
+        }
+        if (defined(style.color)) {
+          style.color.evaluate(feature, polygonMaterial.color);
+        }
 
         polygon.setMaterial(polygonMaterial);
       }
@@ -325,12 +373,12 @@ class VectorGltf3DTileContent {
    * @param {Cesium3DTileset} tileset
    * @param {Cesium3DTile} tile
    * @param {Resource} resource
-   * @param {unknown} gltf
+   * @param {Uint8Array} glb GLB binary produced by buildVectorGltfFromMVT
    * @returns {Promise<VectorGltf3DTileContent>}
    */
-  static async fromGltf(tileset, tile, resource, gltf) {
+  static async fromGltf(tileset, tile, resource, glb) {
     const content = new VectorGltf3DTileContent(tileset, tile, resource);
-    const modelOptions = makeModelOptions(tileset, tile, content, gltf);
+    const modelOptions = makeModelOptions(tileset, tile, content, glb);
     const model = await Model.fromGltfAsync(modelOptions);
     // @ts-expect-error Requires Model conversion to ES6 class.
     model.show = false;
@@ -343,13 +391,13 @@ class VectorGltf3DTileContent {
  * @param {Cesium3DTileset} tileset
  * @param {Cesium3DTile} tile
  * @param {VectorGltf3DTileContent} content
- * @param {unknown} gltf
+ * @param {Uint8Array} glb
  * @returns {*}
  * @ignore
  */
-function makeModelOptions(tileset, tile, content, gltf) {
+function makeModelOptions(tileset, tile, content, glb) {
   return {
-    gltf: gltf,
+    gltf: glb,
     basePath: content._resource,
     cull: false,
     releaseGltfJson: true,
@@ -397,7 +445,8 @@ function initializeVectorPrimitives(content) {
 
   content._collections = result.collections;
   content._collectionLocalMatrices = result.collectionLocalMatrices;
-  content._features = result.features;
+  content._collectionFeatureTableIds = result.collectionFeatureTableIds;
+  content._featuresByTableId = result.featuresByTableId;
 }
 
 export default VectorGltf3DTileContent;