Each Tarktee DATEX feed now reads its body as soon as its headers arrive, so a
failed or oversized body aborts the other request at once instead of waiting
for its headers up to the shared 30 s deadline. Status and redirect errors
name the feed again.
Ontario failures log the error class and system code, never the key-bearing
URL or upstream text. DATA_SOURCES.md and the camera licence field use the
Open Government Licence – Ontario statement the credit shows, and a test pins
that credit.
The focus-release rendering test now uses main's icon renderer and its
isVideoFeedCamera contract. The Tarktee cancellation tests disable the 30 s
deadline and time out after 2 s, so a regression fails fast instead of passing
late or hanging; a duplicated older test and an unused import are gone.
This PR's notes move into changelog.d/1266-cctv-shared-fix-batch.md: the 1133
fragment described main's tracking probe and terrain check, not this branch.
Resolve conflicts with #1234: keep redirect: 'manual' on both DATEX
fetches and keep main's 30 s TARKTEE_FETCH_TIMEOUT_MS. Drop this
branch's 15 s constant and its import, which auto-merged into a
duplicate export. Keep both sets of Estonia tests and drop the 15 s
claim from the changelog fragment.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
- A background catalog refresh that rejects now keeps the old catalog for
another TTL, as an empty refresh already did, so a refresh that keeps
failing is retried once per TTL instead of on every request.
- Trim notes are keyed by the source list they describe, and /sources asks
for the list it served, so a request answered during a refresh never pairs
the old cameras with the new list's notes.
- Tests: a failed background refresh (one warning, no unhandled rejection,
no retry before the TTL, trim notes stay with their list) and an empty
background refresh (old catalog kept, no upstream fetch before the TTL).
The race assertion's message now names the failure; its timer is cleared.
- The Tarktee test no longer imports the new constant, so on main it fails
on its own assertion instead of taking the whole file down.
- precompute-cctv-heights waits 60 s for a cold catalog, past Tarktee's 30 s.
- CURRENT-STATE notes the 30 s bound and the retry spacing.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
The Estonian Transpordiamet feeds answered in 2 to 16.6 s across ten
requests (120 and 160 KB), and both must arrive for any camera to load,
so the shared 15 s catalog timeout dropped the whole pack on about a
third of loads ("Tarktee DATEX download error: The operation was aborted
due to timeout"), for the 15 minutes until the next catalog refresh.
TARKTEE_FETCH_TIMEOUT_MS gives the two requests 30 s; other packs keep
15 s.
Live: 175 cameras in 3.3 s.
Co-Authored-By: Claude Opus 5.5 <[email protected]>