Merge remote-tracking branch 'upstream/main' into pr1469-fix

This commit is contained in:
Said Turksever committed 2026-10-30 15:17:15 +00:00
commit 828417f98b
162 files changed
+22045 -1988

No files matched your search

+2 -4
View File
@@ -66,7 +66,6 @@ const ALLOWED_STYLES = new Set([
'thermal',
'anime',
'noir',
'snow',
]);
const PANEL_ALIASES = new Map([
['data', 'data-panel'],
@@ -1663,9 +1662,8 @@ export async function controlCctv(dataManager, args = {}, styleManager = null) {
return {
activeCameraId: ui.activeCameraId || null,
activeCamera: ui.activeCamera?.name || ui.activeCamera?.id || null,
cameraCount: Array.isArray(ui.cameras)
? ui.cameras.length
: ui.count || 0,
// `count`, not `cameras.length`: reading `cameras` builds every camera.
cameraCount: Number.isFinite(ui.count) ? ui.count : 0,
showCoverage: !!ui.showCoverage,
coverageMode: ui.coverageMode || (ui.showCoverage ? 'on' : 'off'),
showProjection: !!ui.showProjection,