@cesium/engine 22.1.0 → 22.3.0

package/Build/Workers/upsampleVerticesFromCesium3DTilesTerrain.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.136.0
+ * Version 1.138.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,32 +25,32 @@
 
 import {
   Cesium3DTilesTerrainGeometryProcessor_default
-} from "./chunk-WB4TSSBQ.js";
-import "./chunk-HXKUEOOD.js";
-import "./chunk-MKMZHRB3.js";
+} from "./chunk-Y5MRBKQN.js";
+import "./chunk-WHLGBMBC.js";
+import "./chunk-D63Z7KKL.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-2AM4E2WD.js";
-import "./chunk-H6Q7E4BQ.js";
-import "./chunk-YF2NVO5B.js";
-import "./chunk-RXZDTDIY.js";
-import "./chunk-Z6DFT4D3.js";
-import "./chunk-OXFU5HNU.js";
-import "./chunk-DMEFNTUV.js";
-import "./chunk-4BHWJWS3.js";
-import "./chunk-A6YFUGJO.js";
-import "./chunk-GDU4RZSZ.js";
-import "./chunk-23T2IPHV.js";
-import "./chunk-AOIO5VUS.js";
-import "./chunk-W4XUEDU5.js";
-import "./chunk-I4REFVXB.js";
-import "./chunk-YSYSXSHF.js";
-import "./chunk-5JKH4AMT.js";
-import "./chunk-TDSVSW5A.js";
-import "./chunk-3YTMGEXW.js";
-import "./chunk-IL5F6WEE.js";
-import "./chunk-QEANVUGT.js";
-import "./chunk-2RCIRXNI.js";
+} from "./chunk-LK7GEFGB.js";
+import "./chunk-N6XBJBI7.js";
+import "./chunk-6WDMPXQ7.js";
+import "./chunk-4R6FGUFP.js";
+import "./chunk-XLIJV3YZ.js";
+import "./chunk-EY5HOJFQ.js";
+import "./chunk-FDOLXORR.js";
+import "./chunk-M5DVYXJJ.js";
+import "./chunk-K2PLKJJG.js";
+import "./chunk-E4YDCSQK.js";
+import "./chunk-4O2ARYS7.js";
+import "./chunk-S2KVL7OJ.js";
+import "./chunk-LWZHJWYK.js";
+import "./chunk-EOSX23OS.js";
+import "./chunk-L4OFWHNI.js";
+import "./chunk-VRAAQ3FS.js";
+import "./chunk-7SLNBIZS.js";
+import "./chunk-LYBNPUEI.js";
+import "./chunk-BO22JHBX.js";
+import "./chunk-FS42VX2H.js";
+import "./chunk-7U5YNLF3.js";
 
 // packages/engine/Source/Workers/upsampleVerticesFromCesium3DTilesTerrain.js
 function upsampleVerticesFromCesium3DTilesTerrain(options, transferableObjects) {

package/Source/Core/BoxGeometry.js

@@ -29,7 +29,7 @@ const diffScratch = new Cartesian3();
  * @see BoxGeometry.createGeometry
  * @see Packable
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Box.html|Cesium Sandcastle Box Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=box|Cesium Sandcastle Box Demo}
  *
  * @example
  * const box = new Cesium.BoxGeometry({

package/Source/Core/CornerType.js

@@ -1,7 +1,7 @@
 /**
  * Style options for corners.
  *
- * @demo The {@link https://sandcastle.cesium.com/index.html?src=Corridor.html&label=Geometries|Corridor Demo}
+ * @demo The {@link https://sandcastle.cesium.com/index.html?id=corridor|Corridor Demo}
  * demonstrates the three corner types, as used by {@link CorridorGraphics}.
  *
  * @enum {number}

package/Source/Core/CorridorGeometry.js

@@ -1060,7 +1060,7 @@ function computeRectangle(positions, ellipsoid, width, cornerType, result) {
  * @see CorridorGeometry.createGeometry
  * @see Packable
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Corridor.html|Cesium Sandcastle Corridor Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=corridor|Cesium Sandcastle Corridor Demo}
  *
  * @example
  * const corridor = new Cesium.CorridorGeometry({

package/Source/Core/FeatureDetection.js

@@ -88,36 +88,6 @@ function webkitVersion() {
   return isWebkit() && webkitVersionResult;
 }
 
-let isInternetExplorerResult;
-let internetExplorerVersionResult;
-function isInternetExplorer() {
-  if (!defined(isInternetExplorerResult)) {
-    isInternetExplorerResult = false;
-
-    let fields;
-    if (theNavigator.appName === "Microsoft Internet Explorer") {
-      fields = /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec(theNavigator.userAgent);
-      if (fields !== null) {
-        isInternetExplorerResult = true;
-        internetExplorerVersionResult = extractVersion(fields[1]);
-      }
-    } else if (theNavigator.appName === "Netscape") {
-      fields = /Trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec(
-        theNavigator.userAgent,
-      );
-      if (fields !== null) {
-        isInternetExplorerResult = true;
-        internetExplorerVersionResult = extractVersion(fields[1]);
-      }
-    }
-  }
-  return isInternetExplorerResult;
-}
-
-function internetExplorerVersion() {
-  return isInternetExplorer() && internetExplorerVersionResult;
-}
-
 let isEdgeResult;
 let edgeVersionResult;
 function isEdge() {
@@ -303,8 +273,7 @@ const FeatureDetection = {
   safariVersion: safariVersion,
   isWebkit: isWebkit,
   webkitVersion: webkitVersion,
-  isInternetExplorer: isInternetExplorer,
-  internetExplorerVersion: internetExplorerVersion,
+
   isEdge: isEdge,
   edgeVersion: edgeVersion,
   isFirefox: isFirefox,

package/Source/Core/Geometry.js

@@ -41,7 +41,7 @@ import Transforms from "./Transforms.js";
  * @see BoxGeometry
  * @see EllipsoidGeometry
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Geometry%20and%20Appearances.html|Geometry and Appearances Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=geometry-and-appearances|Geometry and Appearances Demo}
  *
  * @example
  * // Create geometry with a position attribute and indexed lines.

package/Source/Core/IntersectionTests.js

@@ -67,7 +67,7 @@ const scratchQVec = new Cartesian3();
 /**
  * Computes the intersection of a ray and a triangle as a parametric distance along the input ray. The result is negative when the triangle is behind the ray.
  *
- * Implements {@link https://cadxfem.org/inf/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf|
+ * Implements {@link https://cadxfem.org/inf/Fast MinimumStorage RayTriangle Intersection.pdf|
  * Fast Minimum Storage Ray/Triangle Intersection} by Tomas Moller and Ben Trumbore.
  *
  * @memberof IntersectionTests
@@ -167,7 +167,7 @@ IntersectionTests.rayTriangleParametric = function (
 /**
  * Computes the intersection of a ray and a triangle as a Cartesian3 coordinate.
  *
- * Implements {@link https://cadxfem.org/inf/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf|
+ * Implements {@link https://cadxfem.org/inf/Fast MinimumStorage RayTriangle Intersection.pdf|
  * Fast Minimum Storage Ray/Triangle Intersection} by Tomas Moller and Ben Trumbore.
  *
  * @memberof IntersectionTests

package/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIxYTBmZmMzNy02NzcxLTRiMjUtYTllZS1hZmJjY2RkYjVhY2UiLCJpZCI6MjU5LCJpYXQiOjE3NjQ2MDU5OTB9.Nefln7pgRwDffoCJRJ8aaZn5iQzIPQrboLwKD2-ArDU";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlZWVkZjhjNC01NjdhLTQwNTctOTExMy02MThlYjIxM2U4OTkiLCJpZCI6MjU5LCJpYXQiOjE3NzAwNTUxOTV9.aJTRjsRlsJwPC0Nfcq4xscYc2lPJcGFku_PVxp1ZPyQ";
 /**
  * Default settings for accessing the Cesium ion API.
  *

package/Source/Core/PinBuilder.js

@@ -16,7 +16,7 @@ import writeTextToCanvas from "./writeTextToCanvas.js";
  * @alias PinBuilder
  * @constructor
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Map%20Pins.html|Cesium Sandcastle PinBuilder Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=map-pins|Cesium Sandcastle PinBuilder Demo}
  */
 function PinBuilder() {
   this._cache = {};

package/Source/Core/PolygonGeometry.js

@@ -596,7 +596,7 @@ function createGeometryFromPositionsExtruded(
  * @see PolygonGeometry#createGeometry
  * @see PolygonGeometry#fromPositions
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Polygon.html|Cesium Sandcastle Polygon Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=polygon|Cesium Sandcastle Polygon Demo}
  *
  * @example
  * // 1. create a polygon from points

package/Source/Core/PolylineGeometry.js

@@ -83,7 +83,7 @@ function interpolateColors(p0, p1, color0, color1, numPoints) {
  *
  * @see PolylineGeometry#createGeometry
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Polyline.html|Cesium Sandcastle Polyline Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=polyline|Cesium Sandcastle Polyline Demo}
  *
  * @example
  * // A polyline with two connected line segments

package/Source/Core/PolylineVolumeGeometry.js

@@ -185,7 +185,7 @@ function computeAttributes(
  *
  * @see PolylineVolumeGeometry#createGeometry
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Polyline%20Volume.html|Cesium Sandcastle Polyline Volume Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=polyline-volume|Cesium Sandcastle Polyline Volume Demo}
  *
  * @example
  * function computeCircle(radius) {

package/Source/Core/RectangleGeometry.js

@@ -993,7 +993,7 @@ function computeRectangle(rectangle, granularity, rotation, ellipsoid, result) {
  *
  * @see RectangleGeometry#createGeometry
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Rectangle.html|Cesium Sandcastle Rectangle Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=rectangle|Cesium Sandcastle Rectangle Demo}
  *
  * @example
  * // 1. create a rectangle

package/Source/Core/ScreenSpaceEventHandler.js

@@ -53,14 +53,10 @@ function registerListener(screenSpaceEventHandler, domType, element, callback) {
     callback(screenSpaceEventHandler, e);
   }
 
-  if (FeatureDetection.isInternetExplorer()) {
-    element.addEventListener(domType, listener, false);
-  } else {
-    element.addEventListener(domType, listener, {
-      capture: false,
-      passive: false,
-    });
-  }
+  element.addEventListener(domType, listener, {
+    capture: false,
+    passive: false,
+  });
 
   screenSpaceEventHandler._removalFunctions.push(function () {
     element.removeEventListener(domType, listener, false);

package/Source/Core/TerrainMesh.js

@@ -179,10 +179,10 @@ function TerrainMesh(
   this._transform = new Matrix4();
 
   /**
-   * True if the transform needs to be recomputed (due to changes in exaggeration or scene mode).
-   * @type {boolean}
+   * The scene mode used the last time a pick was performed on this terrain mesh.
+   * @type {SceneMode}
    */
-  this._recomputeTransform = true;
+  this._lastPickSceneMode = undefined;
 
   /**
    * The terrain picker for this mesh, used for ray intersection tests.
@@ -199,10 +199,10 @@ function TerrainMesh(
  * @private
  */
 TerrainMesh.prototype.getTransform = function (mode, projection) {
-  if (!this._recomputeTransform) {
+  if (this._lastPickSceneMode === mode) {
     return this._transform;
   }
-  this._recomputeTransform = false;
+  this._terrainPicker.needsRebuild = true;
 
   if (!defined(mode) || mode === SceneMode.SCENE3D) {
     return computeTransform(this, this._transform);
@@ -322,13 +322,16 @@ function computeTransform2D(mesh, projection, result) {
  * @private
  */
 TerrainMesh.prototype.pick = function (ray, cullBackFaces, mode, projection) {
-  return this._terrainPicker.rayIntersect(
+  const intersection = this._terrainPicker.rayIntersect(
     ray,
     this.getTransform(mode, projection),
     cullBackFaces,
     mode,
     projection,
   );
+
+  this._lastPickSceneMode = mode;
+  return intersection;
 };
 
 /**
@@ -345,7 +348,7 @@ TerrainMesh.prototype.updateExaggeration = function (
   // to trigger a rebuild on the terrain picker.
   this._terrainPicker._vertices = this.vertices;
   this._terrainPicker.needsRebuild = true;
-  this._recomputeTransform = true;
+  this._lastPickSceneMode = undefined;
 };
 
 /**
@@ -355,7 +358,7 @@ TerrainMesh.prototype.updateExaggeration = function (
  */
 TerrainMesh.prototype.updateSceneMode = function (mode) {
   this._terrainPicker.needsRebuild = true;
-  this._recomputeTransform = true;
+  this._lastPickSceneMode = undefined;
 };
 
 export default TerrainMesh;

package/Source/Core/TerrainPicker.js

@@ -10,6 +10,7 @@ import SceneMode from "../Scene/SceneMode.js";
 import Interval from "./Interval.js";
 import Check from "./Check.js";
 import DeveloperError from "./DeveloperError.js";
+import CesiumMath from "./Math.js";
 
 // Terrain picker can be 4 levels deep (0-3)
 const MAXIMUM_TERRAIN_PICKER_LEVEL = 3;
@@ -20,7 +21,7 @@ const MAXIMUM_TERRAIN_PICKER_LEVEL = 3;
  * @alias TerrainPicker
  * @constructor
  *
- * @param {Float32Array} vertices The terrain mesh's vertex buffer.
+ * @param {Float64Array} vertices The terrain mesh's vertex buffer.
  * @param {Uint8Array|Uint16Array|Uint32Array} indices The terrain mesh's index buffer.
  * @param {TerrainEncoding} encoding The terrain mesh's vertex encoding.
  *
@@ -35,7 +36,7 @@ function TerrainPicker(vertices, indices, encoding) {
 
   /**
    * The terrain mesh's vertex buffer.
-   * @type {Float32Array}
+   * @type {Float64Array}
    */
   this._vertices = vertices;
   /**
@@ -268,7 +269,7 @@ function createAABBForNode(x, y, level) {
 /**
  * Packs triangle vertex positions and index into provided buffers, for the worker to process.
  * (The worker does tests to organize triangles into child nodes of the quadtree.)
- * @param {Float32Array} trianglePositionsBuffer The buffer to pack triangle vertex positions into.
+ * @param {Float64Array} trianglePositionsBuffer The buffer to pack triangle vertex positions into.
  * @param {Uint32Array} triangleIndicesBuffer The buffer to pack triangle indices into.
  * @param {Cartesian3[]} trianglePositions The triangle's vertex positions.
  * @param {number} triangleIndex The triangle's index in the overall tile's index buffer.
@@ -424,7 +425,7 @@ function getClosestTriangleInNode(
   let triangleIndices;
   if (shouldBuildChildren) {
     // If the tree can be built deeper, prepare buffers to store triangle data for child nodes
-    trianglePositions = new Float32Array(triangleCount * 9); // 3 vertices per triangle * 3 floats per vertex
+    trianglePositions = new Float64Array(triangleCount * 9); // 3 vertices per triangle * 3 floats per vertex
     triangleIndices = new Uint32Array(triangleCount);
   }
 
@@ -434,6 +435,7 @@ function getClosestTriangleInNode(
       encoding,
       mode,
       projection,
+      ray,
       vertices,
       indices[3 * triIndex],
       scratchTrianglePoints[0],
@@ -442,6 +444,7 @@ function getClosestTriangleInNode(
       encoding,
       mode,
       projection,
+      ray,
       vertices,
       indices[3 * triIndex + 1],
       scratchTrianglePoints[1],
@@ -450,6 +453,7 @@ function getClosestTriangleInNode(
       encoding,
       mode,
       projection,
+      ray,
       vertices,
       indices[3 * triIndex + 2],
       scratchTrianglePoints[2],
@@ -502,7 +506,8 @@ const scratchCartographic = new Cartographic();
  * @param {TerrainEncoding} encoding The terrain encoding.
  * @param {SceneMode} mode The scene mode (2D/3D/Columbus View).
  * @param {MapProjection} projection The map projection.
- * @param {Float32Array} vertices The vertex buffer of the terrain mesh.
+ * @param {Ray} ray The pick ray being tested (used here as a reference to resolve antimeridian wrapping in 2D/Columbus View).
+ * @param {Float64Array} vertices The terrain mesh's vertex buffer.
  * @param {Number} index The index of the vertex to get.
  * @param {Cartesian3} result The decoded, exaggerated, and possibly projected vertex position.
  * @returns {Cartesian3} The result vertex position.
@@ -512,6 +517,7 @@ function getVertexPosition(
   encoding,
   mode,
   projection,
+  ray,
   vertices,
   index,
   result,
@@ -535,6 +541,14 @@ function getVertexPosition(
     result,
   );
 
+  // Due to wrapping in 2D/CV modes, near the antimeridian, the vertex
+  // position may correspond to the other side of the world from the ray origin.
+  // Compare the vertex position to the ray origin and adjust it accordingly.
+  // A spherical approximation is sufficient for cylindrical projections,
+  // like mercator and geographic.
+  const worldWidth = CesiumMath.TWO_PI * projection.ellipsoid.maximumRadius;
+  const k = Math.round((ray.origin.y - position.y) / worldWidth);
+  position.y += k * worldWidth;
   return position;
 }
 
@@ -544,7 +558,7 @@ function getVertexPosition(
  * @param {Matrix4} inverseTransform
  * @param {TerrainNode} node
  * @param {Uint32Array} triangleIndices
- * @param {Float32Array} trianglePositions
+ * @param {Float64Array} trianglePositions
  * @returns {Promise<void>} A promise that resolves when the triangles have been added to the child nodes.
  * @private
  */
@@ -596,7 +610,10 @@ async function addTrianglesToChildrenNodes(
   // Assign these to the child nodes
   const result = await incrementallyBuildTerrainPickerPromise;
   result.intersectingTrianglesArrays.forEach((buffer, index) => {
-    node.children[index].intersectingTriangles = new Uint32Array(buffer);
+    // Guard against case where tree is reset while waiting for worker
+    if (defined(node.children[index])) {
+      node.children[index].intersectingTriangles = new Uint32Array(buffer);
+    }
   });
 
   // The node's triangles have been distributed to its children

package/Source/Core/VideoSynchronizer.js

@@ -16,7 +16,7 @@ import JulianDate from "./JulianDate.js";
  * @param {JulianDate} [options.epoch=Iso8601.MINIMUM_VALUE] The simulation time that marks the start of the video.
  * @param {number} [options.tolerance=1.0] The maximum amount of time, in seconds, that the clock and video can diverge.
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Video.html|Video Material Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=video|Video Material Demo}
  */
 function VideoSynchronizer(options) {
   options = options ?? Frozen.EMPTY_OBJECT;

package/Source/Core/WallGeometry.js

@@ -46,7 +46,7 @@ const scratchNormal = new Cartesian3();
  * @see WallGeometry#createGeometry
  * @see WallGeometry#fromConstantHeight
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Wall.html|Cesium Sandcastle Wall Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=wall|Cesium Sandcastle Wall Demo}
  *
  * @example
  * // create a wall that spans from ground level to 10000 meters

package/Source/Core/writeTextToCanvas.js

@@ -3,95 +3,41 @@ import Frozen from "./Frozen.js";
 import defined from "./defined.js";
 import DeveloperError from "./DeveloperError.js";
 
-function measureText(context2D, textString, font, stroke, fill) {
+/**
+ * Computes dimensions for text, based on current canvas state.
+ *
+ * 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
+ */
+function measureText(context2D, textString) {
   const metrics = context2D.measureText(textString);
   const isSpace = !/\S/.test(textString);
 
-  if (!isSpace) {
-    const fontSize = document.defaultView
-      .getComputedStyle(context2D.canvas)
-      .getPropertyValue("font-size")
-      .replace("px", "");
-    const canvas = document.createElement("canvas");
-    const padding = 100;
-    const width = (metrics.width + padding) | 0;
-    const height = 3 * fontSize;
-    const baseline = height / 2;
-    canvas.width = width;
-    canvas.height = height;
-
-    const ctx = canvas.getContext("2d");
-    ctx.font = font;
-    ctx.fillStyle = "white";
-    ctx.fillRect(0, 0, canvas.width + 1, canvas.height + 1);
-
-    if (stroke) {
-      ctx.strokeStyle = "black";
-      ctx.lineWidth = context2D.lineWidth;
-      ctx.strokeText(textString, padding / 2, baseline);
-    }
-
-    if (fill) {
-      ctx.fillStyle = "black";
-      ctx.fillText(textString, padding / 2, baseline);
-    }
-
-    // Context image data has width * height * 4 elements, because
-    // each pixel's R, G, B and A are consecutive values in the array.
-    const pixelData = ctx.getImageData(0, 0, width, height).data;
-    const length = pixelData.length;
-    const width4 = width * 4;
-    let i, j;
-
-    let ascent, descent;
-    // Find the number of rows (from the top) until the first non-white pixel
-    for (i = 0; i < length; ++i) {
-      if (pixelData[i] !== 255) {
-        ascent = (i / width4) | 0;
-        break;
-      }
-    }
-
-    // Find the number of rows (from the bottom) until the first non-white pixel
-    for (i = length - 1; i >= 0; --i) {
-      if (pixelData[i] !== 255) {
-        descent = (i / width4) | 0;
-        break;
-      }
-    }
-
-    let minx = -1;
-    // For each column, for each row, check for first non-white pixel
-    for (i = 0; i < width && minx === -1; ++i) {
-      for (j = 0; j < height; ++j) {
-        const pixelIndex = i * 4 + j * width4;
-        if (
-          pixelData[pixelIndex] !== 255 ||
-          pixelData[pixelIndex + 1] !== 255 ||
-          pixelData[pixelIndex + 2] !== 255 ||
-          pixelData[pixelIndex + 3] !== 255
-        ) {
-          minx = i;
-          break;
-        }
-      }
-    }
-
+  if (isSpace) {
     return {
       width: metrics.width,
-      height: descent - ascent,
-      ascent: baseline - ascent,
-      descent: descent - baseline,
-      minx: minx - padding / 2,
+      height: 0,
+      ascent: 0,
+      descent: 0,
+      minx: 0,
     };
   }
 
+  // Baseline alignment requires `height = ascent + descent`. Rounding (if any)
+  // must be done before summing, or glyph pairs like "ij" may be misaligned.
+  const ascent = Math.round(metrics.actualBoundingBoxAscent);
+  const descent = Math.round(metrics.actualBoundingBoxDescent);
+
+  // Characters like "_" may have height <0.5 at some sizes, don't round to zero.
+  const height = Math.max(ascent + descent, 1);
+
   return {
     width: metrics.width,
-    height: 0,
-    ascent: 0,
-    descent: 0,
-    minx: 0,
+    height,
+    ascent,
+    descent,
+    minx: -Math.round(metrics.actualBoundingBoxLeft),
   };
 }
 
@@ -164,28 +110,36 @@ function writeTextToCanvas(text, options) {
   canvas.style.visibility = "hidden";
   document.body.appendChild(canvas);
 
-  const dimensions = measureText(context2D, text, font, stroke, fill);
-  // Set canvas.dimensions to be accessed in LabelCollection
+  const dimensions = measureText(context2D, text);
+
+  // Set canvas.dimensions to be accessed in LabelCollection. LabelCollection
+  // hard-codes strokeWidth=0, so dimensions should not include stroke padding.
   canvas.dimensions = dimensions;
 
   document.body.removeChild(canvas);
   canvas.style.visibility = "";
 
+  // measureText does not account for stroke width, added here. LabelCollection
+  // calls writeTextToCanvas with hard-coded strokeWidth=0, so stroke padding
+  // matters only when calling `writeTextToCanvas` directly.
+  const isSpace = !/\S/.test(text);
+  const strokePadding = stroke && !isSpace ? Math.ceil(strokeWidth / 2) : 0;
+  const doubleStrokePadding = strokePadding * 2;
+
   // Some characters, such as the letter j, have a non-zero starting position.
   // This value is used for kerning later, but we need to take it into account
   // now in order to draw the text completely on the canvas
-  const x = -dimensions.minx;
+  const x = -dimensions.minx + strokePadding;
 
   // Expand the width to include the starting position.
-  const width = Math.ceil(dimensions.width) + x + doublePadding;
+  const width = Math.ceil(dimensions.width) + x + doublePadding + strokePadding;
 
   // While the height of the letter is correct, we need to adjust
   // where we start drawing it so that letters like j and y properly dip
   // below the line.
 
-  const height = dimensions.height + doublePadding;
-  const baseline = height - dimensions.ascent + padding;
-  const y = height - baseline + doublePadding;
+  const height = dimensions.height + doublePadding + doubleStrokePadding;
+  const y = dimensions.ascent + padding + strokePadding;
 
   canvas.width = width;
   canvas.height = height;

package/Source/DataSources/BillboardGraphics.js

@@ -46,7 +46,7 @@ import createPropertyDescriptor from "./createPropertyDescriptor.js";
  *
  * @param {BillboardGraphics.ConstructorOptions} [options] Object describing initialization options
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Billboards.html|Cesium Sandcastle Billboard Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=billboards|Cesium Sandcastle Billboard Demo}
  */
 function BillboardGraphics(options) {
   this._definitionChanged = new Event();

package/Source/DataSources/BoxGraphics.js

@@ -31,7 +31,7 @@ import createPropertyDescriptor from "./createPropertyDescriptor.js";
  *
  * @param {BoxGraphics.ConstructorOptions} [options] Object describing initialization options
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Box.html|Cesium Sandcastle Box Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=box|Cesium Sandcastle Box Demo}
  */
 function BoxGraphics(options) {
   this._definitionChanged = new Event();

package/Source/DataSources/CallbackPositionProperty.js

@@ -15,7 +15,7 @@ import PositionProperty from "./PositionProperty.js";
  * @param {boolean} isConstant <code>true</code> when the callback function returns the same value every time, <code>false</code> if the value will change.
  * @param {ReferenceFrame} [referenceFrame=ReferenceFrame.FIXED] The reference frame in which the position is defined.
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Callback%20Position%20Property.html|Cesium Sandcastle Callback Position Property Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=callback-position-property|Cesium Sandcastle Callback Position Property Demo}
  */
 function CallbackPositionProperty(callback, isConstant, referenceFrame) {
   this._callback = undefined;

package/Source/DataSources/CorridorGraphics.js

@@ -41,7 +41,7 @@ import createPropertyDescriptor from "./createPropertyDescriptor.js";
  * @param {CorridorGraphics.ConstructorOptions} [options] Object describing initialization options
  *
  * @see Entity
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Corridor.html|Cesium Sandcastle Corridor Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=corridor|Cesium Sandcastle Corridor Demo}
  */
 function CorridorGraphics(options) {
   this._definitionChanged = new Event();