@cesium/engine 14.0.0 → 16.0.0

package/Source/DataSources/CorridorGraphics.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -82,7 +82,7 @@ function CorridorGraphics(options) {
   this._zIndex = undefined;
   this._zIndexSubscription = undefined;
 
-  this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
+  this.merge(options ?? Frozen.EMPTY_OBJECT);
 }
 
 Object.defineProperties(CorridorGraphics.prototype, {
@@ -291,38 +291,26 @@ CorridorGraphics.prototype.merge = function (source) {
   }
   //>>includeEnd('debug');
 
-  this.show = defaultValue(this.show, source.show);
-  this.positions = defaultValue(this.positions, source.positions);
-  this.width = defaultValue(this.width, source.width);
-  this.height = defaultValue(this.height, source.height);
-  this.heightReference = defaultValue(
-    this.heightReference,
-    source.heightReference,
-  );
-  this.extrudedHeight = defaultValue(
-    this.extrudedHeight,
-    source.extrudedHeight,
-  );
-  this.extrudedHeightReference = defaultValue(
-    this.extrudedHeightReference,
-    source.extrudedHeightReference,
-  );
-  this.cornerType = defaultValue(this.cornerType, source.cornerType);
-  this.granularity = defaultValue(this.granularity, source.granularity);
-  this.fill = defaultValue(this.fill, source.fill);
-  this.material = defaultValue(this.material, source.material);
-  this.outline = defaultValue(this.outline, source.outline);
-  this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
-  this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
-  this.shadows = defaultValue(this.shadows, source.shadows);
-  this.distanceDisplayCondition = defaultValue(
-    this.distanceDisplayCondition,
-    source.distanceDisplayCondition,
-  );
-  this.classificationType = defaultValue(
-    this.classificationType,
-    source.classificationType,
-  );
-  this.zIndex = defaultValue(this.zIndex, source.zIndex);
+  this.show = this.show ?? source.show;
+  this.positions = this.positions ?? source.positions;
+  this.width = this.width ?? source.width;
+  this.height = this.height ?? source.height;
+  this.heightReference = this.heightReference ?? source.heightReference;
+  this.extrudedHeight = this.extrudedHeight ?? source.extrudedHeight;
+  this.extrudedHeightReference =
+    this.extrudedHeightReference ?? source.extrudedHeightReference;
+  this.cornerType = this.cornerType ?? source.cornerType;
+  this.granularity = this.granularity ?? source.granularity;
+  this.fill = this.fill ?? source.fill;
+  this.material = this.material ?? source.material;
+  this.outline = this.outline ?? source.outline;
+  this.outlineColor = this.outlineColor ?? source.outlineColor;
+  this.outlineWidth = this.outlineWidth ?? source.outlineWidth;
+  this.shadows = this.shadows ?? source.shadows;
+  this.distanceDisplayCondition =
+    this.distanceDisplayCondition ?? source.distanceDisplayCondition;
+  this.classificationType =
+    this.classificationType ?? source.classificationType;
+  this.zIndex = this.zIndex ?? source.zIndex;
 };
 export default CorridorGraphics;

package/Source/DataSources/CylinderGraphics.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -66,7 +66,7 @@ function CylinderGraphics(options) {
   this._distanceDisplayCondition = undefined;
   this._distanceDisplayConditionSubscription = undefined;
 
-  this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
+  this.merge(options ?? Frozen.EMPTY_OBJECT);
 }
 
 Object.defineProperties(CylinderGraphics.prototype, {
@@ -238,28 +238,21 @@ CylinderGraphics.prototype.merge = function (source) {
   }
   //>>includeEnd('debug');
 
-  this.show = defaultValue(this.show, source.show);
-  this.length = defaultValue(this.length, source.length);
-  this.topRadius = defaultValue(this.topRadius, source.topRadius);
-  this.bottomRadius = defaultValue(this.bottomRadius, source.bottomRadius);
-  this.heightReference = defaultValue(
-    this.heightReference,
-    source.heightReference,
-  );
-  this.fill = defaultValue(this.fill, source.fill);
-  this.material = defaultValue(this.material, source.material);
-  this.outline = defaultValue(this.outline, source.outline);
-  this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
-  this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
-  this.numberOfVerticalLines = defaultValue(
-    this.numberOfVerticalLines,
-    source.numberOfVerticalLines,
-  );
-  this.slices = defaultValue(this.slices, source.slices);
-  this.shadows = defaultValue(this.shadows, source.shadows);
-  this.distanceDisplayCondition = defaultValue(
-    this.distanceDisplayCondition,
-    source.distanceDisplayCondition,
-  );
+  this.show = this.show ?? source.show;
+  this.length = this.length ?? source.length;
+  this.topRadius = this.topRadius ?? source.topRadius;
+  this.bottomRadius = this.bottomRadius ?? source.bottomRadius;
+  this.heightReference = this.heightReference ?? source.heightReference;
+  this.fill = this.fill ?? source.fill;
+  this.material = this.material ?? source.material;
+  this.outline = this.outline ?? source.outline;
+  this.outlineColor = this.outlineColor ?? source.outlineColor;
+  this.outlineWidth = this.outlineWidth ?? source.outlineWidth;
+  this.numberOfVerticalLines =
+    this.numberOfVerticalLines ?? source.numberOfVerticalLines;
+  this.slices = this.slices ?? source.slices;
+  this.shadows = this.shadows ?? source.shadows;
+  this.distanceDisplayCondition =
+    this.distanceDisplayCondition ?? source.distanceDisplayCondition;
 };
 export default CylinderGraphics;

package/Source/DataSources/CzmlDataSource.js

@@ -9,7 +9,7 @@ import Color from "../Core/Color.js";
 import CornerType from "../Core/CornerType.js";
 import Credit from "../Core/Credit.js";
 import createGuid from "../Core/createGuid.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js";
@@ -180,7 +180,7 @@ function unwrapColorInterval(czmlInterval) {
 }
 
 function unwrapUriInterval(czmlInterval, sourceUri) {
-  const uri = defaultValue(czmlInterval.uri, czmlInterval);
+  const uri = czmlInterval.uri ?? czmlInterval;
   if (defined(sourceUri)) {
     return sourceUri.getDerivedResource({
       url: uri,
@@ -521,11 +521,11 @@ function unwrapInterval(type, czmlInterval, sourceUri) {
   // associations in getPropertyType
   switch (type) {
     case ArcType:
-      return ArcType[defaultValue(czmlInterval.arcType, czmlInterval)];
+      return ArcType[czmlInterval.arcType ?? czmlInterval];
     case Array:
       return czmlInterval.array;
     case Boolean:
-      return defaultValue(czmlInterval["boolean"], czmlInterval);
+      return czmlInterval["boolean"] ?? czmlInterval;
     case BoundingRectangle:
       return czmlInterval.boundingRectangle;
     case Cartesian2:
@@ -538,70 +538,52 @@ function unwrapInterval(type, czmlInterval, sourceUri) {
       return unwrapColorInterval(czmlInterval);
     case ClassificationType:
       return ClassificationType[
-        defaultValue(czmlInterval.classificationType, czmlInterval)
+        czmlInterval.classificationType ?? czmlInterval
       ];
     case ColorBlendMode:
-      return ColorBlendMode[
-        defaultValue(czmlInterval.colorBlendMode, czmlInterval)
-      ];
+      return ColorBlendMode[czmlInterval.colorBlendMode ?? czmlInterval];
     case CornerType:
-      return CornerType[defaultValue(czmlInterval.cornerType, czmlInterval)];
+      return CornerType[czmlInterval.cornerType ?? czmlInterval];
     case HeightReference:
-      return HeightReference[
-        defaultValue(czmlInterval.heightReference, czmlInterval)
-      ];
+      return HeightReference[czmlInterval.heightReference ?? czmlInterval];
     case HorizontalOrigin:
-      return HorizontalOrigin[
-        defaultValue(czmlInterval.horizontalOrigin, czmlInterval)
-      ];
+      return HorizontalOrigin[czmlInterval.horizontalOrigin ?? czmlInterval];
     case Image:
       return unwrapUriInterval(czmlInterval, sourceUri);
     case JulianDate:
-      return JulianDate.fromIso8601(
-        defaultValue(czmlInterval.date, czmlInterval),
-      );
+      return JulianDate.fromIso8601(czmlInterval.date ?? czmlInterval);
     case LabelStyle:
-      return LabelStyle[defaultValue(czmlInterval.labelStyle, czmlInterval)];
+      return LabelStyle[czmlInterval.labelStyle ?? czmlInterval];
     case Number:
-      return defaultValue(czmlInterval.number, czmlInterval);
+      return czmlInterval.number ?? czmlInterval;
     case NearFarScalar:
       return czmlInterval.nearFarScalar;
     case DistanceDisplayCondition:
       return czmlInterval.distanceDisplayCondition;
     case Object:
-      return defaultValue(
-        defaultValue(czmlInterval.object, czmlInterval.value),
-        czmlInterval,
-      );
+      return czmlInterval.object ?? czmlInterval.value ?? czmlInterval;
     case Quaternion:
       return unwrapQuaternionInterval(czmlInterval);
     case Rotation:
-      return defaultValue(czmlInterval.number, czmlInterval);
+      return czmlInterval.number ?? czmlInterval;
     case SensorVolumePortionToDisplay:
       return SensorVolumePortionToDisplay[
-        defaultValue(czmlInterval.portionToDisplay, czmlInterval)
+        czmlInterval.portionToDisplay ?? czmlInterval
       ];
     case ShadowMode:
       return ShadowMode[
-        defaultValue(
-          defaultValue(czmlInterval.shadowMode, czmlInterval.shadows),
-          czmlInterval,
-        )
+        czmlInterval.shadowMode ?? czmlInterval.shadows ?? czmlInterval
       ];
     case String:
-      return defaultValue(czmlInterval.string, czmlInterval);
+      return czmlInterval.string ?? czmlInterval;
     case StripeOrientation:
-      return StripeOrientation[
-        defaultValue(czmlInterval.stripeOrientation, czmlInterval)
-      ];
+      return StripeOrientation[czmlInterval.stripeOrientation ?? czmlInterval];
     case Rectangle:
       return unwrapRectangleInterval(czmlInterval);
     case Uri:
       return unwrapUriInterval(czmlInterval, sourceUri);
     case VerticalOrigin:
-      return VerticalOrigin[
-        defaultValue(czmlInterval.verticalOrigin, czmlInterval)
-      ];
+      return VerticalOrigin[czmlInterval.verticalOrigin ?? czmlInterval];
     default:
       throw new RuntimeError(`Unknown CzmlDataSource interval type: ${type}`);
   }
@@ -736,8 +718,8 @@ function processProperty(
       // not a known value type, bail
       return;
     }
-    packedLength = defaultValue(type.packedLength, 1);
-    unwrappedIntervalLength = defaultValue(unwrappedInterval.length, 1);
+    packedLength = type.packedLength ?? 1;
+    unwrappedIntervalLength = unwrappedInterval.length ?? 1;
     isSampled =
       !defined(packetData.array) &&
       typeof unwrappedInterval !== "string" &&
@@ -969,9 +951,9 @@ function processPositionProperty(
     if (defined(packetData.referenceFrame)) {
       referenceFrame = ReferenceFrame[packetData.referenceFrame];
     }
-    referenceFrame = defaultValue(referenceFrame, ReferenceFrame.FIXED);
+    referenceFrame = referenceFrame ?? ReferenceFrame.FIXED;
     unwrappedInterval = unwrapCartesianInterval(packetData);
-    unwrappedIntervalLength = defaultValue(unwrappedInterval.length, 1);
+    unwrappedIntervalLength = unwrappedInterval.length ?? 1;
     isSampled = unwrappedIntervalLength > packedLength;
   }
 
@@ -2674,14 +2656,11 @@ function processDocument(packet, dataSource) {
         multiplier: clockPacket.multiplier,
       };
     } else {
-      clock.interval = defaultValue(clockPacket.interval, clock.interval);
-      clock.currentTime = defaultValue(
-        clockPacket.currentTime,
-        clock.currentTime,
-      );
-      clock.range = defaultValue(clockPacket.range, clock.range);
-      clock.step = defaultValue(clockPacket.step, clock.step);
-      clock.multiplier = defaultValue(clockPacket.multiplier, clock.multiplier);
+      clock.interval = clockPacket.interval ?? clock.interval;
+      clock.currentTime = clockPacket.currentTime ?? clock.currentTime;
+      clock.range = clockPacket.range ?? clock.range;
+      clock.step = clockPacket.step ?? clock.step;
+      clock.multiplier = clockPacket.multiplier ?? clock.multiplier;
     }
   }
 }
@@ -4707,16 +4686,11 @@ function updateClock(dataSource) {
     clock.currentTime = JulianDate.fromIso8601(clockPacket.currentTime);
   }
   if (defined(clockPacket.range)) {
-    clock.clockRange = defaultValue(
-      ClockRange[clockPacket.range],
-      ClockRange.LOOP_STOP,
-    );
+    clock.clockRange = ClockRange[clockPacket.range] ?? ClockRange.LOOP_STOP;
   }
   if (defined(clockPacket.step)) {
-    clock.clockStep = defaultValue(
-      ClockStep[clockPacket.step],
-      ClockStep.SYSTEM_CLOCK_MULTIPLIER,
-    );
+    clock.clockStep =
+      ClockStep[clockPacket.step] ?? ClockStep.SYSTEM_CLOCK_MULTIPLIER;
   }
   if (defined(clockPacket.multiplier)) {
     clock.multiplier = clockPacket.multiplier;
@@ -4737,7 +4711,7 @@ function load(dataSource, czml, options, clear) {
   }
   //>>includeEnd('debug');
 
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   let promise = czml;
   let sourceUri = options.sourceUri;
@@ -4753,7 +4727,7 @@ function load(dataSource, czml, options, clear) {
   if (typeof czml === "string" || czml instanceof Resource) {
     czml = Resource.createIfNeeded(czml);
     promise = czml.fetchJson();
-    sourceUri = defaultValue(sourceUri, czml.clone());
+    sourceUri = sourceUri ?? czml.clone();
 
     // Add resource credits to our list of credits to display
     const resourceCredits = dataSource._resourceCredits;
@@ -5143,7 +5117,7 @@ CzmlDataSource._processCzml = function (
   updaterFunctions,
   dataSource,
 ) {
-  updaterFunctions = defaultValue(updaterFunctions, CzmlDataSource.updaters);
+  updaterFunctions = updaterFunctions ?? CzmlDataSource.updaters;
 
   if (Array.isArray(czml)) {
     for (let i = 0, len = czml.length; i < len; ++i) {

package/Source/DataSources/DataSourceClock.js

@@ -1,5 +1,4 @@
 import Clock from "../Core/Clock.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -137,12 +136,12 @@ DataSourceClock.prototype.merge = function (source) {
   }
   //>>includeEnd('debug');
 
-  this.startTime = defaultValue(this.startTime, source.startTime);
-  this.stopTime = defaultValue(this.stopTime, source.stopTime);
-  this.currentTime = defaultValue(this.currentTime, source.currentTime);
-  this.clockRange = defaultValue(this.clockRange, source.clockRange);
-  this.clockStep = defaultValue(this.clockStep, source.clockStep);
-  this.multiplier = defaultValue(this.multiplier, source.multiplier);
+  this.startTime = this.startTime ?? source.startTime;
+  this.stopTime = this.stopTime ?? source.stopTime;
+  this.currentTime = this.currentTime ?? source.currentTime;
+  this.clockRange = this.clockRange ?? source.clockRange;
+  this.clockStep = this.clockStep ?? source.clockStep;
+  this.multiplier = this.multiplier ?? source.multiplier;
 };
 
 /**
@@ -154,12 +153,12 @@ DataSourceClock.prototype.getValue = function (result) {
   if (!defined(result)) {
     result = new Clock();
   }
-  result.startTime = defaultValue(this.startTime, result.startTime);
-  result.stopTime = defaultValue(this.stopTime, result.stopTime);
-  result.currentTime = defaultValue(this.currentTime, result.currentTime);
-  result.clockRange = defaultValue(this.clockRange, result.clockRange);
-  result.multiplier = defaultValue(this.multiplier, result.multiplier);
-  result.clockStep = defaultValue(this.clockStep, result.clockStep);
+  result.startTime = this.startTime ?? result.startTime;
+  result.stopTime = this.stopTime ?? result.stopTime;
+  result.currentTime = this.currentTime ?? result.currentTime;
+  result.clockRange = this.clockRange ?? result.clockRange;
+  result.multiplier = this.multiplier ?? result.multiplier;
+  result.clockStep = this.clockStep ?? result.clockStep;
   return result;
 };
 export default DataSourceClock;

package/Source/DataSources/DataSourceCollection.js

@@ -1,4 +1,3 @@
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
@@ -107,7 +106,7 @@ DataSourceCollection.prototype.add = function (dataSource) {
  *                    false if the data source was not in the collection.
  */
 DataSourceCollection.prototype.remove = function (dataSource, destroy) {
-  destroy = defaultValue(destroy, false);
+  destroy = destroy ?? false;
 
   const index = this._dataSources.indexOf(dataSource);
   if (index !== -1) {
@@ -130,7 +129,7 @@ DataSourceCollection.prototype.remove = function (dataSource, destroy) {
  * @param {boolean} [destroy=false] whether to destroy the data sources in addition to removing them.
  */
 DataSourceCollection.prototype.removeAll = function (destroy) {
-  destroy = defaultValue(destroy, false);
+  destroy = destroy ?? false;
 
   const dataSources = this._dataSources;
   for (let i = 0, len = dataSources.length; i < len; ++i) {

package/Source/DataSources/DataSourceDisplay.js

@@ -1,7 +1,6 @@
 import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js";
 import BoundingSphere from "../Core/BoundingSphere.js";
 import Check from "../Core/Check.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import EventHelper from "../Core/EventHelper.js";
@@ -68,10 +67,8 @@ function DataSourceDisplay(options) {
 
   this._dataSourceCollection = dataSourceCollection;
   this._scene = scene;
-  this._visualizersCallback = defaultValue(
-    options.visualizersCallback,
-    DataSourceDisplay.defaultVisualizersCallback,
-  );
+  this._visualizersCallback =
+    options.visualizersCallback ?? DataSourceDisplay.defaultVisualizersCallback;
 
   let primitivesAdded = false;
   const primitives = new PrimitiveCollection();

package/Source/DataSources/EllipseGraphics.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -88,7 +88,7 @@ function EllipseGraphics(options) {
   this._zIndex = undefined;
   this._zIndexSubscription = undefined;
 
-  this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
+  this.merge(options ?? Frozen.EMPTY_OBJECT);
 }
 
 Object.defineProperties(EllipseGraphics.prototype, {
@@ -315,43 +315,29 @@ EllipseGraphics.prototype.merge = function (source) {
   }
   //>>includeEnd('debug');
 
-  this.show = defaultValue(this.show, source.show);
-  this.semiMajorAxis = defaultValue(this.semiMajorAxis, source.semiMajorAxis);
-  this.semiMinorAxis = defaultValue(this.semiMinorAxis, source.semiMinorAxis);
-  this.height = defaultValue(this.height, source.height);
-  this.heightReference = defaultValue(
-    this.heightReference,
-    source.heightReference,
-  );
-  this.extrudedHeight = defaultValue(
-    this.extrudedHeight,
-    source.extrudedHeight,
-  );
-  this.extrudedHeightReference = defaultValue(
-    this.extrudedHeightReference,
-    source.extrudedHeightReference,
-  );
-  this.rotation = defaultValue(this.rotation, source.rotation);
-  this.stRotation = defaultValue(this.stRotation, source.stRotation);
-  this.granularity = defaultValue(this.granularity, source.granularity);
-  this.fill = defaultValue(this.fill, source.fill);
-  this.material = defaultValue(this.material, source.material);
-  this.outline = defaultValue(this.outline, source.outline);
-  this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
-  this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
-  this.numberOfVerticalLines = defaultValue(
-    this.numberOfVerticalLines,
-    source.numberOfVerticalLines,
-  );
-  this.shadows = defaultValue(this.shadows, source.shadows);
-  this.distanceDisplayCondition = defaultValue(
-    this.distanceDisplayCondition,
-    source.distanceDisplayCondition,
-  );
-  this.classificationType = defaultValue(
-    this.classificationType,
-    source.classificationType,
-  );
-  this.zIndex = defaultValue(this.zIndex, source.zIndex);
+  this.show = this.show ?? source.show;
+  this.semiMajorAxis = this.semiMajorAxis ?? source.semiMajorAxis;
+  this.semiMinorAxis = this.semiMinorAxis ?? source.semiMinorAxis;
+  this.height = this.height ?? source.height;
+  this.heightReference = this.heightReference ?? source.heightReference;
+  this.extrudedHeight = this.extrudedHeight ?? source.extrudedHeight;
+  this.extrudedHeightReference =
+    this.extrudedHeightReference ?? source.extrudedHeightReference;
+  this.rotation = this.rotation ?? source.rotation;
+  this.stRotation = this.stRotation ?? source.stRotation;
+  this.granularity = this.granularity ?? source.granularity;
+  this.fill = this.fill ?? source.fill;
+  this.material = this.material ?? source.material;
+  this.outline = this.outline ?? source.outline;
+  this.outlineColor = this.outlineColor ?? source.outlineColor;
+  this.outlineWidth = this.outlineWidth ?? source.outlineWidth;
+  this.numberOfVerticalLines =
+    this.numberOfVerticalLines ?? source.numberOfVerticalLines;
+  this.shadows = this.shadows ?? source.shadows;
+  this.distanceDisplayCondition =
+    this.distanceDisplayCondition ?? source.distanceDisplayCondition;
+  this.classificationType =
+    this.classificationType ?? source.classificationType;
+  this.zIndex = this.zIndex ?? source.zIndex;
 };
 export default EllipseGraphics;

package/Source/DataSources/EllipsoidGeometryUpdater.js

@@ -2,7 +2,6 @@ import Cartesian3 from "../Core/Cartesian3.js";
 import Check from "../Core/Check.js";
 import Color from "../Core/Color.js";
 import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js";
 import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js";
@@ -446,7 +445,7 @@ DynamicEllipsoidGeometryUpdater.prototype.update = function (time) {
   );
   const material = MaterialProperty.getValue(
     time,
-    defaultValue(ellipsoid.material, defaultMaterial),
+    ellipsoid.material ?? defaultMaterial,
     this._material,
   );
 

package/Source/DataSources/EllipsoidGraphics.js

@@ -1,4 +1,4 @@
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -79,7 +79,7 @@ function EllipsoidGraphics(options) {
   this._distanceDisplayCondition = undefined;
   this._distanceDisplayConditionSubscription = undefined;
 
-  this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
+  this.merge(options ?? Frozen.EMPTY_OBJECT);
 }
 
 Object.defineProperties(EllipsoidGraphics.prototype, {
@@ -289,35 +289,24 @@ EllipsoidGraphics.prototype.merge = function (source) {
   }
   //>>includeEnd('debug');
 
-  this.show = defaultValue(this.show, source.show);
-  this.radii = defaultValue(this.radii, source.radii);
-  this.innerRadii = defaultValue(this.innerRadii, source.innerRadii);
-  this.minimumClock = defaultValue(this.minimumClock, source.minimumClock);
-  this.maximumClock = defaultValue(this.maximumClock, source.maximumClock);
-  this.minimumCone = defaultValue(this.minimumCone, source.minimumCone);
-  this.maximumCone = defaultValue(this.maximumCone, source.maximumCone);
-  this.heightReference = defaultValue(
-    this.heightReference,
-    source.heightReference,
-  );
-  this.fill = defaultValue(this.fill, source.fill);
-  this.material = defaultValue(this.material, source.material);
-  this.outline = defaultValue(this.outline, source.outline);
-  this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
-  this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
-  this.stackPartitions = defaultValue(
-    this.stackPartitions,
-    source.stackPartitions,
-  );
-  this.slicePartitions = defaultValue(
-    this.slicePartitions,
-    source.slicePartitions,
-  );
-  this.subdivisions = defaultValue(this.subdivisions, source.subdivisions);
-  this.shadows = defaultValue(this.shadows, source.shadows);
-  this.distanceDisplayCondition = defaultValue(
-    this.distanceDisplayCondition,
-    source.distanceDisplayCondition,
-  );
+  this.show = this.show ?? source.show;
+  this.radii = this.radii ?? source.radii;
+  this.innerRadii = this.innerRadii ?? source.innerRadii;
+  this.minimumClock = this.minimumClock ?? source.minimumClock;
+  this.maximumClock = this.maximumClock ?? source.maximumClock;
+  this.minimumCone = this.minimumCone ?? source.minimumCone;
+  this.maximumCone = this.maximumCone ?? source.maximumCone;
+  this.heightReference = this.heightReference ?? source.heightReference;
+  this.fill = this.fill ?? source.fill;
+  this.material = this.material ?? source.material;
+  this.outline = this.outline ?? source.outline;
+  this.outlineColor = this.outlineColor ?? source.outlineColor;
+  this.outlineWidth = this.outlineWidth ?? source.outlineWidth;
+  this.stackPartitions = this.stackPartitions ?? source.stackPartitions;
+  this.slicePartitions = this.slicePartitions ?? source.slicePartitions;
+  this.subdivisions = this.subdivisions ?? source.subdivisions;
+  this.shadows = this.shadows ?? source.shadows;
+  this.distanceDisplayCondition =
+    this.distanceDisplayCondition ?? source.distanceDisplayCondition;
 };
 export default EllipsoidGraphics;

package/Source/DataSources/Entity.js

@@ -2,7 +2,7 @@ import Cartesian3 from "../Core/Cartesian3.js";
 import Cartographic from "../Core/Cartographic.js";
 import Check from "../Core/Check.js";
 import createGuid from "../Core/createGuid.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
@@ -112,7 +112,7 @@ function createPropertyTypeDescriptor(name, Type) {
  * @see {@link https://cesium.com/learn/cesiumjs-learn/cesiumjs-creating-entities/|Creating Entities}
  */
 function Entity(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   let id = options.id;
   if (!defined(id)) {
@@ -123,11 +123,9 @@ function Entity(options) {
   this._id = id;
   this._definitionChanged = new Event();
   this._name = options.name;
-  this._show = defaultValue(options.show, true);
-  this._trackingReferenceFrame = defaultValue(
-    options.trackingReferenceFrame,
-    TrackingReferenceFrame.AUTODETECT,
-  );
+  this._show = options.show ?? true;
+  this._trackingReferenceFrame =
+    options.trackingReferenceFrame ?? TrackingReferenceFrame.AUTODETECT;
   this._parent = undefined;
   this._propertyNames = [
     "billboard",
@@ -618,8 +616,8 @@ Entity.prototype.merge = function (source) {
 
   //Name, show, and availability are not Property objects and are currently handled differently.
   //source.show is intentionally ignored because this.show always has a value.
-  this.name = defaultValue(this.name, source.name);
-  this.availability = defaultValue(this.availability, source.availability);
+  this.name = this.name ?? source.name;
+  this.availability = this.availability ?? source.availability;
 
   const propertyNames = this._propertyNames;
   const sourcePropertyNames = defined(source._propertyNames)