mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-20 10:12:18 +00:00
Merge branch 'main' into samehkhamis/find-it
This commit is contained in:
38 files changed
+1822
-147
No files matched your search
@@ -50,6 +50,7 @@ test('normalizeAlprNode: maps a full OSM node to a plain record', () => {
|
||||
'surveillance:type': 'ALPR',
|
||||
operator: 'Flock Safety',
|
||||
'camera:type': 'fixed',
|
||||
model: ' L6Q ',
|
||||
'surveillance:zone': 'traffic',
|
||||
'camera:direction': '270',
|
||||
ref: 'ATX-001',
|
||||
@@ -63,6 +64,7 @@ test('normalizeAlprNode: maps a full OSM node to a plain record', () => {
|
||||
longitude: -97.7431,
|
||||
operator: 'Flock Safety',
|
||||
manufacturer: null,
|
||||
model: 'L6Q',
|
||||
cameraType: 'fixed',
|
||||
zone: 'traffic',
|
||||
directionDeg: 270,
|
||||
|
||||
@@ -3231,3 +3231,46 @@ test('an application with every layer registered keeps every requested layer', a
|
||||
]);
|
||||
coordinator.destroy();
|
||||
});
|
||||
|
||||
test('start layers turn on when nothing names any, and are never written as the user choice', async () => {
|
||||
const storage = memoryStorage();
|
||||
const manager = productionManager();
|
||||
const coordinator = new LayerStateCoordinator(manager, shareSink(), {
|
||||
storage,
|
||||
});
|
||||
const results = await coordinator.start({
|
||||
allowLocalState: false,
|
||||
startLayerIds: ['earthquakes', 'traffic', 'not-a-layer'],
|
||||
});
|
||||
assert.equal(coordinator.source, 'start');
|
||||
assert.deepEqual(coordinator.getDurableState().enabledLayerIds, [
|
||||
'earthquakes',
|
||||
'traffic',
|
||||
]);
|
||||
assert.equal(manager.isEnabled('earthquakes'), true);
|
||||
assert.equal(manager.isEnabled('traffic'), true);
|
||||
assert.equal(
|
||||
results.every((result) => result.persistenceWrite === false),
|
||||
true,
|
||||
);
|
||||
assert.deepEqual(storage.writes, []);
|
||||
coordinator.destroy();
|
||||
});
|
||||
|
||||
test('a shared layer payload wins over start layers', async () => {
|
||||
const manager = productionManager();
|
||||
const coordinator = new LayerStateCoordinator(manager, shareSink(), {
|
||||
storage: memoryStorage(),
|
||||
});
|
||||
const shared = createDefaultLayerState();
|
||||
shared.enabledLayerIds = ['radio'];
|
||||
await coordinator.start({
|
||||
shareLayerState: shared,
|
||||
allowLocalState: false,
|
||||
startLayerIds: ['earthquakes'],
|
||||
});
|
||||
assert.equal(coordinator.source, 'share');
|
||||
assert.deepEqual(coordinator.getDurableState().enabledLayerIds, ['radio']);
|
||||
assert.equal(manager.isEnabled('earthquakes'), false);
|
||||
coordinator.destroy();
|
||||
});
|
||||
@@ -103,6 +103,7 @@ export class LayerStateCoordinator {
|
||||
shareLayerState = null,
|
||||
allowLocalState = true,
|
||||
shareCreatedAtMs = null,
|
||||
startLayerIds = [],
|
||||
} = {}) {
|
||||
if (this._destroyed)
|
||||
throw new Error('Layer-state coordinator is destroyed');
|
||||
@@ -125,7 +126,13 @@ export class LayerStateCoordinator {
|
||||
selected = this._normalize(stored);
|
||||
this._source = 'local';
|
||||
}
|
||||
} else {
|
||||
}
|
||||
if (!selected && startLayerIds.length) {
|
||||
// The layers the application starts with when nothing names any:
|
||||
// restored passively, so they are never written as the user's choice.
|
||||
selected = this._normalize({ enabledLayerIds: startLayerIds });
|
||||
this._source = 'start';
|
||||
} else if (!selected && !allowLocalState) {
|
||||
// A valid historical camera/style share with no v2 layer payload keeps
|
||||
// the exact legacy default-layer behavior. It must not inherit an
|
||||
// unrelated recipient's saved local layer preferences.
|
||||
|
||||
Reference in new issue
Block a user