@cesium/engine 25.0.0 → 26.1.0

package/Source/Core/ScreenSpaceEventHandler.js

@@ -22,21 +22,31 @@ function getPosition(screenSpaceEventHandler, event, result) {
   return result;
 }
 
-function getInputEventKey(type, modifier) {
-  let key = type;
-  if (defined(modifier)) {
-    key += `+${modifier}`;
+function getInputEventKey(type, modifiers) {
+  if (!defined(modifiers)) {
+    return `${type}`;
   }
-  return key;
+
+  const modifierList = Array.isArray(modifiers)
+    ? modifiers.toSorted()
+    : [modifiers];
+  return `${type}+${modifierList.join("+")}`;
 }
 
-function getModifier(event) {
+function getModifiers(event) {
+  const modifiers = [];
   if (event.shiftKey) {
-    return KeyboardEventModifier.SHIFT;
-  } else if (event.ctrlKey) {
-    return KeyboardEventModifier.CTRL;
-  } else if (event.altKey) {
-    return KeyboardEventModifier.ALT;
+    modifiers.push(KeyboardEventModifier.SHIFT);
+  }
+  if (event.ctrlKey) {
+    modifiers.push(KeyboardEventModifier.CTRL);
+  }
+  if (event.altKey) {
+    modifiers.push(KeyboardEventModifier.ALT);
+  }
+
+  if (modifiers.length) {
+    return modifiers;
   }
 
   return undefined;
@@ -223,11 +233,11 @@ function handleMouseDown(screenSpaceEventHandler, event) {
   Cartesian2.clone(position, screenSpaceEventHandler._primaryStartPosition);
   Cartesian2.clone(position, screenSpaceEventHandler._primaryPreviousPosition);
 
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
 
   const action = screenSpaceEventHandler.getInputAction(
     screenSpaceEventType,
-    modifier,
+    modifiers,
   );
 
   if (defined(action)) {
@@ -252,15 +262,15 @@ function cancelMouseEvent(
   clickScreenSpaceEventType,
   event,
 ) {
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
 
   const action = screenSpaceEventHandler.getInputAction(
     screenSpaceEventType,
-    modifier,
+    modifiers,
   );
   const clickAction = screenSpaceEventHandler.getInputAction(
     clickScreenSpaceEventType,
-    modifier,
+    modifiers,
   );
 
   if (defined(action) || defined(clickAction)) {
@@ -347,7 +357,7 @@ function handleMouseMove(screenSpaceEventHandler, event) {
     return;
   }
 
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
 
   const position = getPosition(
     screenSpaceEventHandler,
@@ -358,7 +368,7 @@ function handleMouseMove(screenSpaceEventHandler, event) {
 
   const action = screenSpaceEventHandler.getInputAction(
     ScreenSpaceEventType.MOUSE_MOVE,
-    modifier,
+    modifiers,
   );
 
   if (defined(action)) {
@@ -393,11 +403,11 @@ function handleDblClick(screenSpaceEventHandler, event) {
     return;
   }
 
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
 
   const action = screenSpaceEventHandler.getInputAction(
     screenSpaceEventType,
-    modifier,
+    modifiers,
   );
 
   if (defined(action)) {
@@ -437,10 +447,10 @@ function handleWheel(screenSpaceEventHandler, event) {
     return;
   }
 
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
   const action = screenSpaceEventHandler.getInputAction(
     ScreenSpaceEventType.WHEEL,
-    modifier,
+    modifiers,
   );
 
   if (defined(action)) {
@@ -530,7 +540,7 @@ const touchHoldEvent = {
 };
 
 function fireTouchEvents(screenSpaceEventHandler, event) {
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
   const positions = screenSpaceEventHandler._positions;
   const numberOfTouches = positions.length;
   let action;
@@ -551,7 +561,7 @@ function fireTouchEvents(screenSpaceEventHandler, event) {
 
     action = screenSpaceEventHandler.getInputAction(
       ScreenSpaceEventType.LEFT_UP,
-      modifier,
+      modifiers,
     );
 
     if (defined(action)) {
@@ -567,7 +577,7 @@ function fireTouchEvents(screenSpaceEventHandler, event) {
       // releasing single touch, check for CLICK
       clickAction = screenSpaceEventHandler.getInputAction(
         ScreenSpaceEventType.LEFT_CLICK,
-        modifier,
+        modifiers,
       );
 
       if (defined(clickAction)) {
@@ -602,7 +612,7 @@ function fireTouchEvents(screenSpaceEventHandler, event) {
 
     action = screenSpaceEventHandler.getInputAction(
       ScreenSpaceEventType.PINCH_END,
-      modifier,
+      modifiers,
     );
 
     if (defined(action)) {
@@ -624,7 +634,7 @@ function fireTouchEvents(screenSpaceEventHandler, event) {
 
     action = screenSpaceEventHandler.getInputAction(
       ScreenSpaceEventType.LEFT_DOWN,
-      modifier,
+      modifiers,
     );
 
     if (defined(action)) {
@@ -640,7 +650,7 @@ function fireTouchEvents(screenSpaceEventHandler, event) {
 
         clickAction = screenSpaceEventHandler.getInputAction(
           ScreenSpaceEventType.RIGHT_CLICK,
-          modifier,
+          modifiers,
         );
 
         if (defined(clickAction)) {
@@ -674,7 +684,7 @@ function fireTouchEvents(screenSpaceEventHandler, event) {
 
     action = screenSpaceEventHandler.getInputAction(
       ScreenSpaceEventType.PINCH_START,
-      modifier,
+      modifiers,
     );
 
     if (defined(action)) {
@@ -740,7 +750,7 @@ const touchPinchMovementEvent = {
 };
 
 function fireTouchMoveEvents(screenSpaceEventHandler, event) {
-  const modifier = getModifier(event);
+  const modifiers = getModifiers(event);
   const positions = screenSpaceEventHandler._positions;
   const previousPositions = screenSpaceEventHandler._previousPositions;
   const numberOfTouches = positions.length;
@@ -758,7 +768,7 @@ function fireTouchMoveEvents(screenSpaceEventHandler, event) {
 
     action = screenSpaceEventHandler.getInputAction(
       ScreenSpaceEventType.MOUSE_MOVE,
-      modifier,
+      modifiers,
     );
 
     if (defined(action)) {
@@ -776,7 +786,7 @@ function fireTouchMoveEvents(screenSpaceEventHandler, event) {
 
     action = screenSpaceEventHandler.getInputAction(
       ScreenSpaceEventType.PINCH_MOVE,
-      modifier,
+      modifiers,
     );
     if (defined(action)) {
       const position1 = positions.values[0];
@@ -1012,7 +1022,7 @@ function ScreenSpaceEventHandler(element) {
  *
  * @param {ScreenSpaceEventHandler.PositionedEventCallback|ScreenSpaceEventHandler.MotionEventCallback|ScreenSpaceEventHandler.WheelEventCallback|ScreenSpaceEventHandler.TwoPointEventCallback|ScreenSpaceEventHandler.TwoPointMotionEventCallback} action Function to be executed when the input event occurs.
  * @param {ScreenSpaceEventType} type The ScreenSpaceEventType of input event.
- * @param {KeyboardEventModifier} [modifier] A KeyboardEventModifier key that is held when a <code>type</code>
+ * @param {KeyboardEventModifier[] | KeyboardEventModifier} [modifiers] The KeyboardEventModifier keys that are held when a <code>type</code>
  * event occurs.
  *
  * @see ScreenSpaceEventHandler#getInputAction
@@ -1021,7 +1031,7 @@ function ScreenSpaceEventHandler(element) {
 ScreenSpaceEventHandler.prototype.setInputAction = function (
   action,
   type,
-  modifier,
+  modifiers,
 ) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(action)) {
@@ -1032,7 +1042,7 @@ ScreenSpaceEventHandler.prototype.setInputAction = function (
   }
   //>>includeEnd('debug');
 
-  const key = getInputEventKey(type, modifier);
+  const key = getInputEventKey(type, modifiers);
   this._inputEvents[key] = action;
 };
 
@@ -1040,7 +1050,7 @@ ScreenSpaceEventHandler.prototype.setInputAction = function (
  * Returns the function to be executed on an input event.
  *
  * @param {ScreenSpaceEventType} type The ScreenSpaceEventType of input event.
- * @param {KeyboardEventModifier} [modifier] A KeyboardEventModifier key that is held when a <code>type</code>
+ * @param {KeyboardEventModifier[] | KeyboardEventModifier} [modifiers] The KeyboardEventModifier keys that are held when a <code>type</code>
  * event occurs.
  *
  * @returns {ScreenSpaceEventHandler.PositionedEventCallback|ScreenSpaceEventHandler.MotionEventCallback|ScreenSpaceEventHandler.WheelEventCallback|ScreenSpaceEventHandler.TwoPointEventCallback|ScreenSpaceEventHandler.TwoPointMotionEventCallback} The function to be executed on an input event.
@@ -1048,14 +1058,14 @@ ScreenSpaceEventHandler.prototype.setInputAction = function (
  * @see ScreenSpaceEventHandler#setInputAction
  * @see ScreenSpaceEventHandler#removeInputAction
  */
-ScreenSpaceEventHandler.prototype.getInputAction = function (type, modifier) {
+ScreenSpaceEventHandler.prototype.getInputAction = function (type, modifiers) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(type)) {
     throw new DeveloperError("type is required.");
   }
   //>>includeEnd('debug');
 
-  const key = getInputEventKey(type, modifier);
+  const key = getInputEventKey(type, modifiers);
   return this._inputEvents[key];
 };
 
@@ -1063,7 +1073,7 @@ ScreenSpaceEventHandler.prototype.getInputAction = function (type, modifier) {
  * Removes the function to be executed on an input event.
  *
  * @param {ScreenSpaceEventType} type The ScreenSpaceEventType of input event.
- * @param {KeyboardEventModifier} [modifier] A KeyboardEventModifier key that is held when a <code>type</code>
+ * @param {KeyboardEventModifier[] | KeyboardEventModifier} [modifiers] The KeyboardEventModifier keys that are held when a <code>type</code>
  * event occurs.
  *
  * @see ScreenSpaceEventHandler#getInputAction
@@ -1071,7 +1081,7 @@ ScreenSpaceEventHandler.prototype.getInputAction = function (type, modifier) {
  */
 ScreenSpaceEventHandler.prototype.removeInputAction = function (
   type,
-  modifier,
+  modifiers,
 ) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(type)) {
@@ -1079,7 +1089,7 @@ ScreenSpaceEventHandler.prototype.removeInputAction = function (
   }
   //>>includeEnd('debug');
 
-  const key = getInputEventKey(type, modifier);
+  const key = getInputEventKey(type, modifiers);
   delete this._inputEvents[key];
 };
 

package/Source/Core/TerrainMesh.js

@@ -328,7 +328,7 @@ function computeTransform2D(mesh, projection, result) {
  * @param {SceneMode} mode The scene mode (3D, 2D, or Columbus View).
  * @param {MapProjection} projection The map projection.
  * @returns {Cartesian3} The point on the mesh where the ray intersects, or undefined if there is no intersection.
- * @private
+ * @ignore
  */
 TerrainMesh.prototype.pick = function (ray, cullBackFaces, mode, projection) {
   const intersection = this._terrainPicker.rayIntersect(
@@ -347,7 +347,7 @@ TerrainMesh.prototype.pick = function (ray, cullBackFaces, mode, projection) {
  * Updates the terrain mesh to account for changes in vertical exaggeration.
  * @param {Number} exaggeration A scalar used to exaggerate terrain.
  * @param {Number} exaggerationRelativeHeight The relative height from which terrain is exaggerated.
- * @private
+ * @ignore
  */
 TerrainMesh.prototype.updateExaggeration = function (
   exaggeration,
@@ -363,7 +363,7 @@ TerrainMesh.prototype.updateExaggeration = function (
 /**
  * Updates the terrain mesh to account for changes in scene mode.
  * @param {SceneMode} mode The scene mode (3D, 2D, or Columbus View).
- * @private
+ * @ignore
  */
 TerrainMesh.prototype.updateSceneMode = function (mode) {
   this._terrainPicker.needsRebuild = true;

package/Source/Core/TerrainPicker.js

@@ -246,6 +246,7 @@ const scratchAABBMax = new Cartesian3();
  * @param {number} y The y coordinate of the node.
  * @param {number} level The level of the node.
  * @returns {AxisAlignedBoundingBox} The axis-aligned bounding box for the node.
+ * @ignore
  */
 function createAABBForNode(x, y, level) {
   const sizeAtLevel = 1.0 / Math.pow(2, level);

package/Source/Core/createColorRamp.js

@@ -0,0 +1,37 @@
+// @ts-check
+
+/** @import Color from "./Color.js"; */
+
+/**
+ * Creates a color ramp that linearly interpolates between the given colors.
+ *
+ * @param {Color[]} colors The array of colors to use for the color ramp.
+ * @param {number} rampLength The length (in number of samples) of the color ramp to create.
+ * @returns {Uint8Array} A typed array representing the color ramp.
+ *
+ * @private
+ */
+function createColorRamp(colors, rampLength) {
+  const ramp = document.createElement("canvas");
+  ramp.width = rampLength;
+  ramp.height = 1;
+  const ctx = ramp.getContext("2d");
+  const grd = ctx.createLinearGradient(0, 0, ramp.width, 0);
+
+  const stepSize = 1 / (colors.length - 1);
+  for (let i = 0; i < colors.length; i++) {
+    const color = colors[i];
+    const stop = i * stepSize;
+    const cssColor = color.toCssColorString();
+    grd.addColorStop(stop, cssColor);
+  }
+
+  ctx.fillStyle = grd;
+  ctx.fillRect(0, 0, ramp.width, ramp.height);
+
+  const imageData = ctx.getImageData(0, 0, ramp.width, ramp.height);
+  const array = new Uint8Array(imageData.data.buffer);
+  return array;
+}
+
+export default createColorRamp;

package/Source/Core/globalTypes.js

@@ -12,6 +12,31 @@
  * @typedef {{destroy: Function}} Destroyable
  */
 
+/**
+ * A GeoJSON position expressed as [longitude, latitude] or [longitude, latitude, altitude].
+ * @typedef {Array.<number>} GeoJsonPosition
+ */
+
+/**
+ * A GeoJSON geometry object.
+ * @typedef {{type: string, coordinates: (unknown|undefined), geometries: (Array.<GeoJsonGeometry>|undefined)}} GeoJsonGeometry
+ */
+
+/**
+ * A GeoJSON feature object.
+ * @typedef {{type: string, geometry: (GeoJsonGeometry|null), properties: (Object.<string, *>|null), id: (string|number|undefined)}} GeoJsonFeature
+ */
+
+/**
+ * A GeoJSON feature collection object.
+ * @typedef {{type: string, features: Array.<GeoJsonFeature>}} GeoJsonFeatureCollection
+ */
+
+/**
+ * A top-level GeoJSON object (Geometry, Feature, or FeatureCollection).
+ * @typedef {GeoJsonGeometry|GeoJsonFeature|GeoJsonFeatureCollection} GeoJson
+ */
+
 /**
  * This file is omitted from 'workspaceSourceFiles' in 'scripts/build.js', and
  * must provide type-only exports exclusively, without runtime values.

package/Source/Core/writeTextToCanvas.js

@@ -9,6 +9,7 @@ import DeveloperError from "./DeveloperError.js";
  * Rounds metrics, excluding width, to whole pixels. This is purely to minimize
  * rendering differences with migration to in-browser measureText(), and may be
  * revised in the future. See: github.com/CesiumGS/cesium/pull/13081
+ * @ignore
  */
 function measureText(context2D, textString) {
   const metrics = context2D.measureText(textString);

package/Source/DataSources/CzmlDataSource.js

@@ -65,6 +65,7 @@ import LabelGraphics from "./LabelGraphics.js";
 import ModelGraphics from "./ModelGraphics.js";
 import NodeTransformationProperty from "./NodeTransformationProperty.js";
 import PathGraphics from "./PathGraphics.js";
+import PathMode from "./PathMode.js";
 import PointGraphics from "./PointGraphics.js";
 import PolygonGraphics from "./PolygonGraphics.js";
 import PolylineArrowMaterialProperty from "./PolylineArrowMaterialProperty.js";
@@ -562,6 +563,8 @@ function unwrapInterval(type, czmlInterval, sourceUri) {
       return czmlInterval.distanceDisplayCondition;
     case Object:
       return czmlInterval.object ?? czmlInterval.value ?? czmlInterval;
+    case PathMode:
+      return PathMode[czmlInterval.pathMode ?? czmlInterval];
     case Quaternion:
       return unwrapQuaternionInterval(czmlInterval);
     case Rotation:
@@ -3654,6 +3657,15 @@ function processPath(entity, packet, entityCollection, sourceUri) {
     sourceUri,
     entityCollection,
   );
+  processPacketData(
+    PathMode,
+    path,
+    "materialMode",
+    pathData.materialMode,
+    interval,
+    sourceUri,
+    entityCollection,
+  );
 }
 
 function processPoint(entity, packet, entityCollection, sourceUri) {