Draw the local GeoJSON layers through the draw port and take them off the Cesium list

The data centre and dam layers (src/data/localGeojsonCore.js) no longer load
a Cesium GeoJSON data source. Each build is six draw sets: ground fills,
raised fills, draped lines, pins, stems and their tip dots. A walk changes
what moved or showed in place. Ground heights come from the heights query,
with the globe visibility getter deciding whether terrain is a floor. The
stems are sized from the camera pose, and clicks select and fly through the
input and camera ports. Point-and-ask reads a draw hit's meta as the
feature's context record (drawItemMeta in src/data/pickedContext.js).

The drawn parts keep the loader's ids and its reading of each feature:
simplestyle fill, stroke and marker colours, opacities, widths and marker
sizes; polygons with heights drawn at them and outlined; 3D points standing
their pin on the stem tip; ground edges along rhumb lines.

Differences: a marker-symbol draws the plain pin; named CSS colours fall
back to the layer colour; a raised polygon's outline is 1 px around its
outer ring only, and its fill is unlit; the layer no longer sets the
viewer's selectedEntity, so Cesium's stock double-click no longer follows
a feature; a caller's own Cesium viewer needs
gods-eye-view/render/cesium/unbound loaded first.
This commit is contained in:
Sameh Khamis committed 2026-11-07 21:49:15 -08:00
1 parent 333c9b39fe
commit b0ed9d7e90
14 files changed
+1547 -947

No files matched your search

+27 -31
View File
@@ -2,10 +2,10 @@ import test from 'node:test';
import assert from 'node:assert/strict';
import { spawnSync } from 'node:child_process';
import { readFileSync } from 'node:fs';
import * as Cesium from 'cesium';
import { createInfrastructureLayers } from 'gods-eye-view/infrastructure';
import { createLocalGeoJsonLayer } from 'gods-eye-view/infrastructure/geojson';
import { fakeInput } from '../input/testDoubles.mjs';
import { bindFakeGroundRenderer } from '../testSupport/fakeGroundRenderer.mjs';
function services() {
const records = new Map();
@@ -119,7 +119,6 @@ test('two viewers use their supplied contexts and dispose independently', async
}));
const hosts = [services(), services()];
const instances = hosts.map((host) => {
const sources = new Cesium.DataSourceCollection();
const layer = createLocalGeoJsonLayer(
{
id: 'local-dams',
@@ -130,19 +129,25 @@ test('two viewers use their supplied contexts and dispose independently', async
},
host,
);
// A click picks the feature's stem, as the renderer's pick names it.
const viewer = {
dataSources: sources,
scene: {
canvas: {},
preRender: new Cesium.Event(),
requestRender() {},
screenSpaceCameraController: { enableInputs: true },
pick: () => ({ id: sources.get(0).entities.values[0] }),
pick: () => {
const [stem] = fake.set('stems').items.values();
return {
id: {
set: fake.set('stems').spec.id,
id: stem.id,
meta: stem.meta,
},
};
},
},
camera: { moveEnd: new Cesium.Event(), flyTo() {} },
};
const fake = bindFakeGroundRenderer(viewer);
const input = fakeInput(viewer);
return { layer, viewer, click: () => input.click({ x: 0, y: 0 }) };
return { layer, viewer, fake, click: () => input.click({ x: 0, y: 0 }) };
});
t.after(() =>
instances.forEach(({ layer, viewer }) => layer.destroy(viewer)),
@@ -157,10 +162,16 @@ test('two viewers use their supplied contexts and dispose independently', async
instances[0].click();
assert.ok(hosts[0].selection());
assert.equal(hosts[1].selection(), undefined);
assert.deepEqual(
instances[0].fake.flights.map(({ destination }) => destination.height),
[5000],
'the click flies to the feature',
);
instances[0].layer.destroy(instances[0].viewer);
assert.equal(hosts[0].records.size, 0);
assert.equal(hosts[1].records.size, 1);
assert.equal(instances[1].viewer.dataSources.length, 1);
assert.equal(instances[0].fake.liveSets().length, 0);
assert.equal(instances[1].fake.liveSets().length, 6);
});
test('consumer build includes only infrastructure code and resolves assets under a non-root base', async () => {
@@ -185,47 +196,32 @@ test('consumer build includes only infrastructure code and resolves assets under
const output = result.output;
const entry = output.find((item) => item.type === 'chunk' && item.isEntry);
const sources = Object.keys(entry.modules).filter((id) => id.endsWith('.js'));
// It draws through the renderer's ports: a viewer of the caller's own
// draws once the caller has loaded `./render/cesium/unbound`.
assert.deepEqual(sources.map((id) => id.split('/').at(-1)).sort(), [
'aircraftRecession.js',
'camera.js',
'cameraControls.js',
'cameraInput.js',
'celestial.js',
'common.js',
'creditMarkup.js',
'credits.js',
'color.js',
'ctrlWheelZoom.js',
'dispatcher.js',
'draw.js',
'drawHit.js',
'drawModels.js',
'events.js',
'ellipsoid.js',
'follow.js',
'frame.js',
'gpuIcons.js',
'heights.js',
'horizon.js',
'iconAtlas.js',
'iconMotion.js',
'iconSegment.js',
'iconSet.js',
'iconSetPrimitive.js',
'infrastructure.js',
'infrastructureData.js',
'infrastructureOverlayEntry.js',
'input.js',
'inputOwnership.js',
'internals.js',
'julian.js',
'localGeojsonCore.js',
'localGeojsonLod.js',
'pickRegistry.js',
'polyline.js',
'query.js',
'rendererOf.js',
'rhumb.js',
'router.js',
'scenePick.js',
'sensorPick.js',
'sphere.js',
'styleStages.js',
'vector.js',
]);