Draw the last native world labels through the label overlay

The Directions A and B letters and a data pack's media label were the two
Cesium text labels left, kept by an allow-list in noCesiumLabels.test.mjs.
Both now publish entries to the shared world-overlay host, and the
allow-list is gone, so any Cesium label in src is a test failure.

Directions publishes the letters to the directions-markers source; the
markers keep only their points. A clicked endpoint's letter hangs over the
surface that was clicked. One placed without a click stays hidden until its
ground-floor cell resolves, then requests a render, so a still camera shows
it; a cell that settles with no height falls back to the ellipsoid. Each
position is computed once.

A pack resource handle gains label(entry). The application passes its
shared overlay host to SceneDirector through dataPacks.overlayHost; without
one a media pack fails to load rather than drawing a native label. Each
labelled resource takes a source from a pool and returns it on dispose, as
the host never removes a source, so two presentations of one pack never
clear each other's labels and repeat loads add no sources. A label written
after dispose is ignored. The media label is protected, so it always draws
as before.

Live (Denver, keyless globe): a clicked A and a programmatic B both anchor
on their dots over 1.58 km ground. Documented in docs/CURRENT-STATE.md and
docs/DIRECTOR-DATA-PACKS.md.
This commit is contained in:
Sameh Khamis committed 2026-11-04 12:30:31 -08:00
1 parent 18d6e3292d
commit 464c29a9ed
12 files changed
+382 -44

No files matched your search

+2
View File
@@ -54,6 +54,8 @@ export {
STEP_ANCHOR_FAST_ATTEMPTS,
STEP_ANCHOR_RETRY_MS,
STEP_ANCHOR_SLOW_RETRY_MS,
DIRECTIONS_MARKER_OVERLAY_SOURCE_ID,
createDirectionsMarkerOverlayEntry,
createDirectionsStepOverlayEntry,
directionsRequestUrl,
directionsRowControls,
+82
View File
@@ -6,6 +6,8 @@ import {
DIRECTIONS_MODES,
DIRECTIONS_POINTER_OWNER,
DIRECTIONS_ROUTE_COLOR,
DIRECTIONS_MARKER_OVERLAY_SOURCE_ID,
createDirectionsMarkerOverlayEntry,
createDirectionsStepOverlayEntry,
directionsRequestUrl,
directionsRowControls,
@@ -950,3 +952,83 @@ test('the reroute tooltip keeps German mode nouns capitalized', (t) => {
'Fahrrad – Route im Modus „Fahrrad“ neu berechnen',
);
});
test('the A and B letters are protected overlay labels in the marker colour', () => {
const position = Cesium.Cartesian3.fromDegrees(-122.39, 37.79);
const entry = createDirectionsMarkerOverlayEntry('B', position, '#ff6b6b');
assert.equal(entry.id, 'directions-marker-b');
assert.equal(entry.title, 'B');
assert.equal(entry.variant, 'label');
assert.equal(entry.accent, '#ff6b6b');
assert.equal(entry.protected, true);
assert.equal(entry.position, position);
assert.equal(entry.placement, 'above');
});
test('a placed endpoint draws its letter through the overlay, not as entity text', async (t) => {
const published = [];
const cleared = [];
const visibility = [];
const entities = [];
const markerVisibility = () =>
visibility
.filter(([source]) => source === DIRECTIONS_MARKER_OVERLAY_SOURCE_ID)
.at(-1)?.[1];
directionsLayer = createApplicationDirectionsLayer();
directionsLayer._setOverlayHostForTest({
setEntries: (source, entries) => published.push([source, entries]),
setVisible: (source, visible) => visibility.push([source, visible]),
clearSource: (source) => cleared.push(source),
});
resetPointerOwnership();
const viewer = {
isDestroyed: () => false,
entities: {
add: (spec) => (entities.push(spec), spec),
remove() {},
},
scene: {
requestRender() {},
primitives: {
add: (primitive) => primitive,
remove() {},
raiseToTop() {},
lowerToBottom() {},
contains: () => true,
length: 0,
},
},
};
t.after(() => {
directionsLayer.destroy(viewer);
directionsLayer._setOverlayHostForTest(null);
resetPointerOwnership();
});
directionsLayer.init(viewer);
assert.equal(markerVisibility(), false, 'hidden until enabled');
directionsLayer.placeEndpoint('a', { lat: 37.7955, lon: -122.3937 });
assert.equal(entities.length, 1);
assert.equal(entities[0].label, undefined, 'no Cesium label on the marker');
assert.ok(entities[0].point, 'the marker keeps its point');
const [source, entries] = published.at(-1);
assert.equal(source, DIRECTIONS_MARKER_OVERLAY_SOURCE_ID);
assert.deepEqual(
entries.map((entry) => entry.title),
['A'],
);
// Hidden until the floor cell settles, then anchored (the ellipsoid here,
// where the test resolver finds no height).
assert.equal(entries[0].position(), null);
const started = Date.now();
while (!entries[0].position() && Date.now() - started < 5000)
await new Promise((resolve) => setTimeout(resolve, 10));
const anchor = Cesium.Cartographic.fromCartesian(entries[0].position());
assert.ok(Math.abs(Cesium.Math.toDegrees(anchor.latitude) - 37.7955) < 1e-9);
directionsLayer.setParams({ clear: true });
assert.ok(cleared.includes(DIRECTIONS_MARKER_OVERLAY_SOURCE_ID));
cleared.length = 0;
directionsLayer.destroy(viewer);
assert.ok(cleared.includes(DIRECTIONS_MARKER_OVERLAY_SOURCE_ID));
});
+1 -1
View File
@@ -71,7 +71,7 @@ test('Directions introduces the shared OSM credit when the requested route draws
render: { governorRequestRender: noop, holdContinuousRender: noop, releaseContinuousRender: noop },
sprites: { registerSpriteCollection: noop, unregisterSpriteCollection: noop, restoreSpriteOrder: noop },
picking: { registerPickOwner: noop, unregisterPickOwner: noop },
ground: { warmGroundFloor: noop },
ground: { warmGroundFloor: noop, resolveGroundFloorCells: async () => {} },
} });
layer.init(v); layer.enable(v);
layer.placeEndpoint('a', { lat: 0, lon: 0 }); layer.placeEndpoint('b', { lat: 0.01, lon: 0.01 });