mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-20 18:22:25 +00:00
Merge branch 'main' into codex/cctv-shared-batch-20261019
This commit is contained in:
8 files changed
+377
-5
No files matched your search
@@ -81,9 +81,8 @@ export function createNavigation({
|
||||
return false;
|
||||
const nearest = nearestCameraIdToViewer();
|
||||
if (!nearest || nearest === layerState._activeCameraId) return false;
|
||||
parts.selection.setActiveCamera(nearest);
|
||||
// setActiveCamera ends the opening pick; this is still that pick.
|
||||
layerState._openingCameraProvisional = true;
|
||||
// Still the opening pick: later settled moves may replace it.
|
||||
parts.selection.setActiveCamera(nearest, { opening: true });
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -108,10 +108,13 @@ export function createSelection({
|
||||
* Sets the active camera by ID, initializes its projection runtime, refreshes
|
||||
* its frame, and updates styles.
|
||||
* @param {string} cameraId - ID of the camera to activate.
|
||||
* @param {Object} [options]
|
||||
* @param {boolean} [options.opening=false] - The opening camera following
|
||||
* the view, not someone's pick: settled moves may still replace it.
|
||||
* @returns {'activated'|'unchanged'|'not-found'} Discriminated activation result.
|
||||
*/
|
||||
|
||||
function setActiveCamera(cameraId) {
|
||||
function setActiveCamera(cameraId, { opening = false } = {}) {
|
||||
if (!cameraId || !layerState._recordById.has(cameraId))
|
||||
return CCTV_ACTIVATION_RESULT.NOT_FOUND;
|
||||
const record = layerState._recordById.get(cameraId);
|
||||
@@ -129,6 +132,9 @@ export function createSelection({
|
||||
record,
|
||||
)
|
||||
) {
|
||||
// Picking the camera a settled move re-opened is still a pick: later
|
||||
// settled moves must leave it alone.
|
||||
if (!opening) layerState._openingCameraProvisional = false;
|
||||
// Browser-only feeds have a separate player; a reselect retries it
|
||||
// without re-running activation or touching the projection geometry.
|
||||
if (parts.model.isBrowserOverlayCamera(record.camera)) {
|
||||
@@ -139,7 +145,7 @@ export function createSelection({
|
||||
}
|
||||
layerState._activeCameraId = cameraId;
|
||||
layerState._autoHopSuspended = false;
|
||||
layerState._openingCameraProvisional = false;
|
||||
layerState._openingCameraProvisional = opening;
|
||||
// A real activation creates projection work — wake the self-stopping loop.
|
||||
parts.projection.startProjectionLoop();
|
||||
if (previousActiveRecord && previousActiveRecord !== record) {
|
||||
|
||||
@@ -215,3 +215,16 @@ test('a count click is the card on top for every layer, unless the count yields'
|
||||
picking.unregisterPickOwner('flights');
|
||||
}
|
||||
});
|
||||
|
||||
test('same-camera selection ends the opening pick without notifying snapshot feeds', () => {
|
||||
const fixture = makeSelection('tripcheck-odot');
|
||||
fixture.state._openingCameraProvisional = true;
|
||||
|
||||
assert.equal(
|
||||
fixture.selection.setActiveCamera('same-camera'),
|
||||
CCTV_ACTIVATION_RESULT.UNCHANGED,
|
||||
);
|
||||
assert.equal(fixture.state._openingCameraProvisional, false);
|
||||
assert.equal(fixture.state._activeCameraReselection, 0);
|
||||
assert.equal(fixture.notifications(), 0);
|
||||
});
|
||||
@@ -108,6 +108,7 @@ export function createTesting({ state: layerState, services, parts, source }) {
|
||||
} = {}) {
|
||||
layerState._viewer = viewer;
|
||||
layerState._records = Array.isArray(records) ? records : [];
|
||||
layerState._count = layerState._records.length;
|
||||
layerState._recordById = new Map(
|
||||
layerState._records
|
||||
.filter((record) => record?.camera?.id)
|
||||
|
||||
Reference in new issue
Block a user