Let the camera picker pick the opening CCTV camera

The picker preselected the active camera, and a native select fires no
change for the option it already shows. So while CCTV was still following
the view, choosing the camera the picker showed did nothing, and the next
pan switched to another camera.

The layer now reports whether the active camera is the opening one
(activeCameraProvisional). While it is, the picker shows that camera from
a hidden, disabled first option, so choosing it from the list is a change
and ends automatic selection; closing the list keeps it. A same-camera
pick that ends the opening pick notifies listeners so the picker drops the
hidden option, and reopenNearestCamera passes { opening: true } so its own
notification already carries the opening state.

docs/CURRENT-STATE.md now says when automatic selection ends. Tests cover
the hidden option, confirming and dismissing the picker before a pan, the
notification, and focusNearestToPoint, which is now on main.
This commit is contained in:
German Khokhlov committed 2026-11-20 01:10:42 +04:00
1 parent fe37cacba0
commit a6eecee157
12 files changed
+315 -30

No files matched your search

+10 -4
View File
@@ -49,10 +49,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);
@@ -71,19 +74,22 @@ export function createSelection({
)
) {
// Picking the camera a settled move re-opened is still a choice: later
// settled moves must leave it alone.
layerState._openingCameraProvisional = false;
// settled moves must leave it alone, and the picker learns it.
const endsOpening = layerState._openingCameraProvisional && !opening;
if (endsOpening) 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)) {
layerState._activeCameraReselection += 1;
parts.presentation.notifyListeners();
} else if (endsOpening) {
parts.presentation.notifyListeners();
}
return CCTV_ACTIVATION_RESULT.UNCHANGED;
}
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) {