mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Merge main through #1634 into the renderer seam
Brings in the CCTV opening camera, the Iceland, Giroc HLS, Taiwan, Quebec, Ottawa and world camera packs, the world clock and timeline, the zoom-out limit and registered-only layer state, ported onto the renderer contract: the sky follows the world time through the frame port's setTime in preUpdate, the Quebec overlay reads the eye, projects and redraws through the camera, query and frame ports, launches hide pending missions through their draw records, and mission orbit rings turn on the scene clock.
This commit is contained in:
commit
2b60531c3c
170 files changed
+44067
-290
No files matched your search
+9
-1
@@ -218,6 +218,7 @@ AISSTREAM_API_KEY=
|
|||||||
# CCTV_TFL_MAX_SOURCES=250 # cap cameras loaded from TfL
|
# CCTV_TFL_MAX_SOURCES=250 # cap cameras loaded from TfL
|
||||||
# CCTV_ONTARIO_ENABLED=1 # set 0 to disable Ontario 511 cameras
|
# CCTV_ONTARIO_ENABLED=1 # set 0 to disable Ontario 511 cameras
|
||||||
# ONTARIO_511_API_KEY= # free developer key: sign up at 511on.ca/my511/register, then request it at 511on.ca/developers/doc
|
# ONTARIO_511_API_KEY= # free developer key: sign up at 511on.ca/my511/register, then request it at 511on.ca/developers/doc
|
||||||
|
# OTTAWA_CAMERA_CERTIFICATE= # City of Ottawa Traffic Camera Images API certificate (free; request it via the form on traffic.ottawa.ca 'About the data'); without it the Ottawa pack is skipped
|
||||||
# CCTV_ONTARIO_MAX_SOURCES=1000 # cap cameras loaded from Ontario 511
|
# CCTV_ONTARIO_MAX_SOURCES=1000 # cap cameras loaded from Ontario 511
|
||||||
# CCTV_FINTRAFFIC_ENABLED=1 # set 0 to drop the Fintraffic (Finland) pack
|
# CCTV_FINTRAFFIC_ENABLED=1 # set 0 to drop the Fintraffic (Finland) pack
|
||||||
# CCTV_FINTRAFFIC_MAX_SOURCES=300 # cap cameras loaded from the Fintraffic catalog
|
# CCTV_FINTRAFFIC_MAX_SOURCES=300 # cap cameras loaded from the Fintraffic catalog
|
||||||
@@ -238,6 +239,8 @@ AISSTREAM_API_KEY=
|
|||||||
# CCTV_CALGARY_ROWS_URL= # override the Open Calgary catalog URL
|
# CCTV_CALGARY_ROWS_URL= # override the Open Calgary catalog URL
|
||||||
# CCTV_CATALONIA_ENABLED=1 # set 0 to disable the Servei Català de Trànsit cameras
|
# CCTV_CATALONIA_ENABLED=1 # set 0 to disable the Servei Català de Trànsit cameras
|
||||||
# CCTV_CATALONIA_MAX_SOURCES=150 # cap cameras loaded from Catalonia (~130 exist today)
|
# CCTV_CATALONIA_MAX_SOURCES=150 # cap cameras loaded from Catalonia (~130 exist today)
|
||||||
|
# CCTV_ICELAND_ENABLED=1 # set 0 to disable the Vegagerðin (Iceland) road cameras
|
||||||
|
# CCTV_ICELAND_MAX_SOURCES=250 # cap cameras loaded from Iceland (~500 views exist today)
|
||||||
# CCTV_HK_ENABLED=1 # set 0 to disable the Hong Kong Transport Department cameras
|
# CCTV_HK_ENABLED=1 # set 0 to disable the Hong Kong Transport Department cameras
|
||||||
# CCTV_HK_MAX_SOURCES=1100 # cap cameras loaded from Hong Kong (~1,013 exist today); min 8, max 1200
|
# CCTV_HK_MAX_SOURCES=1100 # cap cameras loaded from Hong Kong (~1,013 exist today); min 8, max 1200
|
||||||
# CCTV_HK_CAMERAS_URL= # override the DATA.GOV.HK camera locations XML URL
|
# CCTV_HK_CAMERAS_URL= # override the DATA.GOV.HK camera locations XML URL
|
||||||
@@ -268,7 +271,12 @@ AISSTREAM_API_KEY=
|
|||||||
# CCTV_HOUSTON_CAMERAS_URL= # override the Houston TranStar catalog URL
|
# CCTV_HOUSTON_CAMERAS_URL= # override the Houston TranStar catalog URL
|
||||||
# CCTV_A22_ENABLED=1 # set 0 to disable the Autostrada del Brennero (A22, Italy) webcams
|
# CCTV_A22_ENABLED=1 # set 0 to disable the Autostrada del Brennero (A22, Italy) webcams
|
||||||
# CCTV_A22_URL= # override the Open Data Hub A22 webcam catalog URL
|
# CCTV_A22_URL= # override the Open Data Hub A22 webcam catalog URL
|
||||||
# CCTV_MAX_SOURCES=4000 # catalog-wide ceiling, shared round-robin across packs
|
# CCTV_OTTAWA_ENABLED=1 # set 0 to skip City of Ottawa cameras (also needs OTTAWA_CAMERA_CERTIFICATE)
|
||||||
|
# CCTV_OTTAWA_MAX_SOURCES=250 # cap Ottawa cameras (8-500, nearest downtown first)
|
||||||
|
# CCTV_QUEBEC_ENABLED=1 # set 0 to skip the Québec camera locations (MTQ, Montréal, scenic links)
|
||||||
|
# CCTV_QUEBEC_VIDEO_ENABLED= # off by default; set 1 to let viewers play Québec 511 clips in their browser after pressing Play (511 terms of use unconfirmed; see DATA_SOURCES.md)
|
||||||
|
# CCTV_WORLD_CAMERAS_ENABLED=1 # set 0 to skip the Oregon and MLIT (Japan) still cameras
|
||||||
|
# CCTV_MAX_SOURCES=7350 # catalog-wide ceiling: 4,000 slots shared round-robin, the rest reserved for Québec and World
|
||||||
# CCTV_PREFER_AUSTIN=1 # prioritize Austin cameras in the registry
|
# CCTV_PREFER_AUSTIN=1 # prioritize Austin cameras in the registry
|
||||||
# CCTV_FORCE_AUSTIN= # force live default sources when a source-pack JSON is configured
|
# CCTV_FORCE_AUSTIN= # force live default sources when a source-pack JSON is configured
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -128,7 +128,7 @@ prints anything; never fix that by renaming or deleting PR A's published token.
|
|||||||
|
|
||||||
The highest-leverage places to jump in:
|
The highest-leverage places to jump in:
|
||||||
|
|
||||||
- **🌆 Add a CCTV source pack.** Austin is the reference camera source. Adding another city means a clean public camera catalog with coordinates, attribution, and server-registered frame URLs (the proxy only fetches registered URLs — never client-supplied ones, see [SECURITY.md](SECURITY.md)). City packs are the best first lane.
|
- **🌆 Add a CCTV source pack.** Austin is the reference camera source. Follow the [CCTV integration workflow](docs/CCTV_INTEGRATION.md) for source review, provider registration, proxy security, tests, and attribution. The proxy only fetches server-registered URLs — never client-supplied ones; see [SECURITY.md](SECURITY.md).
|
||||||
- **🛰️ Add or improve a data layer.** Layer factories live in `src/layers/<family>/`, with source, record, controller and renderer owners implementing the layer interface (`init/enable/disable/update/destroy/getStats`, optional `getDetectableObjects`/`getStats`). Use an existing layer as a template, and see [Adding a new layer](#adding-a-new-layer) for what the PR needs.
|
- **🛰️ Add or improve a data layer.** Layer factories live in `src/layers/<family>/`, with source, record, controller and renderer owners implementing the layer interface (`init/enable/disable/update/destroy/getStats`, optional `getDetectableObjects`/`getStats`). Use an existing layer as a template, and see [Adding a new layer](#adding-a-new-layer) for what the PR needs.
|
||||||
- **🎙️ Extend voice control.** Voice arguments are defined in `src/voice/actionSchemas.js`, with server-side descriptions in `server/providers/openai/tools.js` and client-side execution in `src/voice/gevActions.js`. Keep the tool surface tight and the responses honest (confirm only what actually happened).
|
- **🎙️ Extend voice control.** Voice arguments are defined in `src/voice/actionSchemas.js`, with server-side descriptions in `server/providers/openai/tools.js` and client-side execution in `src/voice/gevActions.js`. Keep the tool surface tight and the responses honest (confirm only what actually happened).
|
||||||
- **🎨 Add a visual style.** Styles are GLSL post-process shaders in `src/styles/`.
|
- **🎨 Add a visual style.** Styles are GLSL post-process shaders in `src/styles/`.
|
||||||
|
|||||||
+9
-1
@@ -65,9 +65,11 @@ How to read this:
|
|||||||
| **DriveBC** (Government of British Columbia) | CCTV camera catalog + frames, British Columbia highways | [Open Government Licence – British Columbia](https://www2.gov.bc.ca/gov/content/data/open-data/open-government-licence-bc) — attribution REQUIRED | "DriveBC. Contains information licensed under the Open Government Licence – British Columbia" |
|
| **DriveBC** (Government of British Columbia) | CCTV camera catalog + frames, British Columbia highways | [Open Government Licence – British Columbia](https://www2.gov.bc.ca/gov/content/data/open-data/open-government-licence-bc) — attribution REQUIRED | "DriveBC. Contains information licensed under the Open Government Licence – British Columbia" |
|
||||||
| **Open Calgary** (`data.calgary.ca`) | CCTV camera catalog + frames, Calgary | [Open Government Licence – City of Calgary](https://data.calgary.ca/stories/s/Open-Calgary-Terms-of-Use/u45n-7awa) — attribution REQUIRED | "Contains information licensed under the Open Government Licence – City of Calgary" |
|
| **Open Calgary** (`data.calgary.ca`) | CCTV camera catalog + frames, Calgary | [Open Government Licence – City of Calgary](https://data.calgary.ca/stories/s/Open-Calgary-Terms-of-Use/u45n-7awa) — attribution REQUIRED | "Contains information licensed under the Open Government Licence – City of Calgary" |
|
||||||
| **Servei Català de Trànsit** (+ Ajuntament de Barcelona, Ajuntament de Terrassa) | CCTV camera catalog + frames, Catalonia | [Llicència oberta d'ús d'informació - Catalunya](https://web.gencat.cat/ca/generalitat/dades-indicadors/dades-obertes/llicencies) — attribution REQUIRED | "Servei Català de Trànsit"; partner-supplied cameras also name their owner |
|
| **Servei Català de Trànsit** (+ Ajuntament de Barcelona, Ajuntament de Terrassa) | CCTV camera catalog + frames, Catalonia | [Llicència oberta d'ús d'informació - Catalunya](https://web.gencat.cat/ca/generalitat/dades-indicadors/dades-obertes/llicencies) — attribution REQUIRED | "Servei Català de Trànsit"; partner-supplied cameras also name their owner |
|
||||||
|
| **Icelandic Road and Coastal Administration (Vegagerðin, IRCA)** | CCTV camera catalog + frames, Iceland road cameras | [CC BY 4.0](https://www.vegagerdin.is/vegagerdin/gagnasafn/vefthjonustur/terms-and-conditions) (IRCA terms of use, Act 45/2018) — attribution REQUIRED; no suggestion of IRCA endorsement; IRCA and State logos are excluded; real-time data is provided as is | "Icelandic Road and Coastal Administration (Vegagerðin)", CC BY 4.0 |
|
||||||
| **King County Road Services** (`services.arcgis.com`, King County GIS) | CCTV camera catalog + frames, unincorporated King County WA road network | [KCGIS Center terms](https://kingcounty.gov/en/dept/kcit/data-information-services/gis-center/about/terms-conditions-copyrights) — attribution required; public ArcGIS layer | "King County Road Services" (partner-city cameras name their owner) |
|
| **King County Road Services** (`services.arcgis.com`, King County GIS) | CCTV camera catalog + frames, unincorporated King County WA road network | [KCGIS Center terms](https://kingcounty.gov/en/dept/kcit/data-information-services/gis-center/about/terms-conditions-copyrights) — attribution required; public ArcGIS layer | "King County Road Services" (partner-city cameras name their owner) |
|
||||||
| **WSDOT** (`data.wsdot.wa.gov`) | CCTV camera catalog + frames, Washington State highways | [WSDOT travel information disclaimer](https://wsdot.wa.gov/about/policies/travel-information-disclaimer) — public "low volume" feed; catalog cached, frames on WSDOT's own image host only | "Washington State Department of Transportation (Travel Center)" (courtesy) |
|
| **WSDOT** (`data.wsdot.wa.gov`) | CCTV camera catalog + frames, Washington State highways | [WSDOT travel information disclaimer](https://wsdot.wa.gov/about/policies/travel-information-disclaimer) — public "low volume" feed; catalog cached, frames on WSDOT's own image host only | "Washington State Department of Transportation (Travel Center)" (courtesy) |
|
||||||
| **Hong Kong Transport Department / DATA.GOV.HK** | CCTV camera catalog + frames, Hong Kong traffic snapshot cameras | [DATA.GOV.HK Terms of Use](https://data.gov.hk/en/terms-and-conditions) — attribution REQUIRED | "Hong Kong Transport Department / DATA.GOV.HK" |
|
| **Hong Kong Transport Department / DATA.GOV.HK** | CCTV camera catalog + frames, Hong Kong traffic snapshot cameras | [DATA.GOV.HK Terms of Use](https://data.gov.hk/en/terms-and-conditions) — attribution REQUIRED | "Hong Kong Transport Department / DATA.GOV.HK" |
|
||||||
|
| **Webcam Romania — Giroc** (`webcamromania.ro`, `w4.webcamromania.ro`) | Optional Giroc camera metadata, JPEG snapshot and live HLS video | [Provider terms](https://webcamromania.ro/termeni-si-conditii/): video belongs to the original camera operator; no open video redistribution licence asserted. The [camera page](https://webcamromania.ro/webcam-orase/webcam-giroc/) offers an embed. Local opt-in via `CCTV_SOURCES_FILE`; media is fetched at runtime, never bundled. | "Webcam Romania · webcamromania.ro"; source link and rights notice in the Data attribution popover |
|
||||||
| **Statens vegvesen** (catalog `ogckart-sn1.atlas.vegvesen.no`, frames `kamera.atlas.vegvesen.no`, HLS `kamera.vegvesen.no`) | CCTV camera catalog + frames + live HLS video, Norway road cameras | [NLOD 2.0](https://data.norge.no/nlod/en/2.0) — attribution REQUIRED | "Contains data under the Norwegian licence for Open Government data (NLOD) distributed by Statens vegvesen" |
|
| **Statens vegvesen** (catalog `ogckart-sn1.atlas.vegvesen.no`, frames `kamera.atlas.vegvesen.no`, HLS `kamera.vegvesen.no`) | CCTV camera catalog + frames + live HLS video, Norway road cameras | [NLOD 2.0](https://data.norge.no/nlod/en/2.0) — attribution REQUIRED | "Contains data under the Norwegian licence for Open Government data (NLOD) distributed by Statens vegvesen" |
|
||||||
| **Kartverket** (`ws.geonorge.no/hoydedata/v1/punkt`) | Terrain heights (NN2000) used as the ground prior for Statens vegvesen cameras | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) — attribution REQUIRED | "© Kartverket", modified (heights over water set to 0 m, rounded to 0.1 m) |
|
| **Kartverket** (`ws.geonorge.no/hoydedata/v1/punkt`) | Terrain heights (NN2000) used as the ground prior for Statens vegvesen cameras | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) — attribution REQUIRED | "© Kartverket", modified (heights over water set to 0 m, rounded to 0.1 m) |
|
||||||
| **NYC DOT Traffic Management Center** (`webcams.nyctmc.org`) | CCTV camera catalog + frames, New York City five boroughs | NYC DOT requires developers to sign a [data-sharing agreement](https://www.nyc.gov/html/dot/html/about/datafeeds.shtml) for the camera feed. **Off by default**; enable only under your own agreement | "NYC DOT Traffic Management Center" + NYC DOT's required application disclaimer (in the Data attribution popover) |
|
| **NYC DOT Traffic Management Center** (`webcams.nyctmc.org`) | CCTV camera catalog + frames, New York City five boroughs | NYC DOT requires developers to sign a [data-sharing agreement](https://www.nyc.gov/html/dot/html/about/datafeeds.shtml) for the camera feed. **Off by default**; enable only under your own agreement | "NYC DOT Traffic Management Center" + NYC DOT's required application disclaimer (in the Data attribution popover) |
|
||||||
@@ -122,7 +124,8 @@ The optional Local ADS-B layer and the broadcast-FM receiver use radio you recei
|
|||||||
**Quebec is thinly represented**, and that is upstream rather than a filter here: the province runs its own Info-Smog program, so only a handful of Quebec stations appear in ECCC's national feed. The reporting station count also varies hour to hour as stations report or fall silent.
|
**Quebec is thinly represented**, and that is upstream rather than a filter here: the province runs its own Info-Smog program, so only a handful of Quebec stations appear in ECCC's national feed. The reporting station count also varies hour to hour as stations report or fall silent.
|
||||||
|
|
||||||
- **Via Lietuva / Eismoinfo (Lithuania).** Public road-camera catalogs and periodically updated still images from [Eismoinfo](https://eismoinfo.lt/), credited to Via Lietuva / eismoinfo.lt in the app. **Off by default.** The camera endpoints are the eismoinfo.lt website backend and are not among the services listed in Via Lietuva's [open-data statement](https://eismoinfo.lt/eismoinfo-backend/content?id=44), whose conditions are attribution and reuse on the same terms. Until the statement is confirmed to cover the camera photos, the pack loads only when an operator sets `CCTV_LITHUANIA_ENABLED=1`; with the flag unset, empty or any other value, the server makes no request to Eismoinfo. `eismoinfo-backend/camera-info-table` is joined by ID to `layer-static-features/VKR`. Without `lks=true`, the latter returns WGS84 `[latitude, longitude]`; the table's `x/y` instead use LKS-94 metres. Only the official HTTPS `/eismoinfo-backend/image-provider/camera/last?id=…` image endpoint is registered. Catalogs use the shared 15-minute cache; frames are fetched on demand and never bundled or archived. These are periodic snapshots, not continuous video. Camera headings are low-confidence estimates. No API key is required. `CCTV_LITHUANIA_MAX_SOURCES` defaults to 400.
|
- **Via Lietuva / Eismoinfo (Lithuania).** Public road-camera catalogs and periodically updated still images from [Eismoinfo](https://eismoinfo.lt/), credited to Via Lietuva / eismoinfo.lt in the app. **Off by default.** The camera endpoints are the eismoinfo.lt website backend and are not among the services listed in Via Lietuva's [open-data statement](https://eismoinfo.lt/eismoinfo-backend/content?id=44), whose conditions are attribution and reuse on the same terms. Until the statement is confirmed to cover the camera photos, the pack loads only when an operator sets `CCTV_LITHUANIA_ENABLED=1`; with the flag unset, empty or any other value, the server makes no request to Eismoinfo. `eismoinfo-backend/camera-info-table` is joined by ID to `layer-static-features/VKR`. Without `lks=true`, the latter returns WGS84 `[latitude, longitude]`; the table's `x/y` instead use LKS-94 metres. Only the official HTTPS `/eismoinfo-backend/image-provider/camera/last?id=…` image endpoint is registered. Catalogs use the shared 15-minute cache; frames are fetched on demand and never bundled or archived. These are periodic snapshots, not continuous video. Camera headings are low-confidence estimates. No API key is required. `CCTV_LITHUANIA_MAX_SOURCES` defaults to 400.
|
||||||
- **Freeway Bureau, MOTC (Taiwan).** National freeway cameras from the Freeway Bureau's keyless [CCTV static table](https://tisvcloud.freeway.gov.tw/history/motc20/CCTV.xml) in the MOTC 2.0 standard, refreshed daily and fetched at runtime (never bundled). Freeway Bureau traffic data is published under the [Open Government Data License, Taiwan (Version 1.0)](https://data.gov.tw/license), which permits reuse, including commercial reuse, with attribution; the app credits the Freeway Bureau, MOTC, names the dataset and links the licence, as its attribution exhibit asks. The table publishes each camera's MJPEG stream on one of four official camera servers (`cctvn`, `cctvn5`, `cctvc`, `cctvs` under `freeway.gov.tw`). The frame proxy relays single images, so each published stream URL is mapped to the same server's single-JPEG path for the same camera number (`/abs2mjpg/bmjpg` → `/abs2mjpg/jpg`, `/live-view/mjpg/video.cgi` → `/live-view/jpg/image.cgi`); only those exact HTTPS pairs are registered, and the still path is not itself listed in the table. These are on-demand snapshots, not continuous video. Camera headings are low-confidence estimates. No API key is required. The table host does not answer from some networks outside Taiwan (the camera servers do); there the pack is empty, logs one warning and retries hourly. On by default; `CCTV_TAIWAN_ENABLED=0` skips the pack, and `CCTV_TAIWAN_MAX_SOURCES` defaults to 600 (bounded to 1–2000).
|
- **Freeway Bureau and Highway Bureau, MOTC (Taiwan).** National freeway cameras use the Freeway Bureau’s keyless [MOTC 2.0 CCTV table](https://tisvcloud.freeway.gov.tw/history/motc20/CCTV.xml), refreshed daily and fetched at runtime (never bundled). Freeway Bureau data follows the [Open Government Data License, Taiwan v1.0](https://data.gov.tw/license); the app credits the Bureau, names the dataset and links the licence. If that catalog is unreachable and no last-good source list exists, the app falls back to the Highway Bureau’s free [provincial-road CCTV XML feed](https://thbapp.thb.gov.tw/opendata/), with attribution as requested by the Bureau. Its MJPEG streams are accepted only from cctv-ss01 through cctv-ss08.thb.gov.tw over HTTPS; the frame proxy extracts one bounded JPEG per request. This fallback covers provincial roads, not national freeways. Neither feed requires an API key. CCTV_TAIWAN_ENABLED=0 disables both; CCTV_TAIWAN_MAX_SOURCES defaults to 600 (bounded to 1–2000).
|
||||||
|
- **Québec CCTV (MTQ / Québec 511, Montréal and scenic links).** `public/quebec-cameras.json` contains 680 MTQ positions from the official georeferenced WFS (CC BY 4.0), 426 Montréal camera locations derived from OSM (ODbL 1.0), and 14 scenic records with per-row provenance and accuracy. The MTQ video is **opt-in** (`CCTV_QUEBEC_VIDEO_ENABLED=1`): the CC BY 4.0 licence covers the camera locations only, and Québec 511's terms for embedding its clips on another site are unconfirmed, so by default MTQ cameras link to the Québec 511 viewer page instead. With the flag set, the 680 MTQ cameras play the operator's five-second MP4 clip directly in the viewer's browser from `www.quebec511.info/Carte/Fenetres/camera.ashx?id=<id>&format=mp4`, only after the viewer presses Play, so Québec 511 sees the viewer's IP address; Québec 511 refreshes those clips every few minutes. A second browser request supplies an approximate map still. The app does not proxy, store, or read video pixels, and no camera images are bundled. The selected-camera credit names both sources: locations MTQ under CC BY 4.0, video Québec 511. Montréal and scenic entries have provider-page links rather than direct frame URLs; their source-page terms apply. The video remains hosted by Québec 511 under its service terms. No API key is required; `CCTV_QUEBEC_ENABLED=0` disables the pack. Confirm Québec 511's terms of use before setting `CCTV_QUEBEC_VIDEO_ENABLED=1` on a public deployment.
|
||||||
|
|
||||||
- **Google Maps Platform.** You supply your own API key and are bound by [Google's ToS](https://cloud.google.com/maps-platform/terms). Google Maps Content (tiles, geocodes, places) **may not be cached, stored, rehosted, or committed** — this app only ever uses it live, which is the compliant pattern. The "Google" attribution is displayed on the globe and must stay visible. Restrict your key (see [SECURITY.md](SECURITY.md)).
|
- **Google Maps Platform.** You supply your own API key and are bound by [Google's ToS](https://cloud.google.com/maps-platform/terms). Google Maps Content (tiles, geocodes, places) **may not be cached, stored, rehosted, or committed** — this app only ever uses it live, which is the compliant pattern. The "Google" attribution is displayed on the globe and must stay visible. Restrict your key (see [SECURITY.md](SECURITY.md)).
|
||||||
- **Sea Marks and Ski Pistes (#10).** Two keyless raster overlay layers under Infrastructure, OpenSeaMap sea marks and OpenSnowMap ski pistes, requested tile by tile as the camera views them, with no prefetch, bulk download or caching on our side (OpenSnowMap forbids bulk tile download without prior agreement). They drape on the globe on the OSM and Bing stacks and on the Google Photorealistic tileset on Google 3D (see `src/maps/imageryHost.js`). OpenRailwayMap and OpenInfraMap, also requested in #10, are not included: OpenRailwayMap's tile server only answers requests whose Referer is its own site, and OpenInfraMap serves vector tiles that need a vector rendering pipeline.
|
- **Sea Marks and Ski Pistes (#10).** Two keyless raster overlay layers under Infrastructure, OpenSeaMap sea marks and OpenSnowMap ski pistes, requested tile by tile as the camera views them, with no prefetch, bulk download or caching on our side (OpenSnowMap forbids bulk tile download without prior agreement). They drape on the globe on the OSM and Bing stacks and on the Google Photorealistic tileset on Google 3D (see `src/maps/imageryHost.js`). OpenRailwayMap and OpenInfraMap, also requested in #10, are not included: OpenRailwayMap's tile server only answers requests whose Referer is its own site, and OpenInfraMap serves vector tiles that need a vector rendering pipeline.
|
||||||
@@ -170,6 +173,8 @@ The optional Local ADS-B layer and the broadcast-FM receiver use radio you recei
|
|||||||
- **DelDOT live video cameras.** The keyless `tmc.deldot.gov/json/videocamera.json` catalog supplies active cameras and official `https://video.deldot.gov/live/…/playlist.m3u8` links. The local server transiently buffers bounded MPEG-TS segments in memory and deletes them on session release or idle expiry. No recordings are retained. `CCTV_DELDOT_ENABLED=0` disables the pack. Public availability is not a blanket redistribution license; deployment beyond personal local viewing needs confirmation of applicable DelDOT terms.
|
- **DelDOT live video cameras.** The keyless `tmc.deldot.gov/json/videocamera.json` catalog supplies active cameras and official `https://video.deldot.gov/live/…/playlist.m3u8` links. The local server transiently buffers bounded MPEG-TS segments in memory and deletes them on session release or idle expiry. No recordings are retained. `CCTV_DELDOT_ENABLED=0` disables the pack. Public availability is not a blanket redistribution license; deployment beyond personal local viewing needs confirmation of applicable DelDOT terms.
|
||||||
- **Fintraffic weathercams.** The camera list is one keyless GeoJSON request to `tie.digitraffic.fi/api/weathercam/v1/stations` (809 stations / 2,275 presets), sent with the `Digitraffic-User: gods-eye-view` header the service asks clients to identify themselves with and with gzip; frames are stills on `weathercam.digitraffic.fi`, refreshed on each station's 600 s collection interval, which is also the client's ambient-still refresh cadence for this pack (the active camera keeps the usual 10-second refresh). One preset (a fixed camera view) is one camera; stations not `GATHERING` and presets not `inCollection` are dropped. Attribution is required by the CC BY 4.0 licence and is registered in the Data attribution popover. `CCTV_FINTRAFFIC_ENABLED=0` is the kill switch.
|
- **Fintraffic weathercams.** The camera list is one keyless GeoJSON request to `tie.digitraffic.fi/api/weathercam/v1/stations` (809 stations / 2,275 presets), sent with the `Digitraffic-User: gods-eye-view` header the service asks clients to identify themselves with and with gzip; frames are stills on `weathercam.digitraffic.fi`, refreshed on each station's 600 s collection interval, which is also the client's ambient-still refresh cadence for this pack (the active camera keeps the usual 10-second refresh). One preset (a fixed camera view) is one camera; stations not `GATHERING` and presets not `inCollection` are dropped. Attribution is required by the CC BY 4.0 licence and is registered in the Data attribution popover. `CCTV_FINTRAFFIC_ENABLED=0` is the kill switch.
|
||||||
- **DriveBC highway cameras.** The camera list comes from the keyless `https://www.drivebc.ca/api/webcams/` endpoint served by the DriveBC.ca site ([bcgov/DriveBC.ca](https://github.com/bcgov/DriveBC.ca)); frames come from `https://www.drivebc.ca/images/<id>.jpg`, built from the numeric camera id. DataBC's [DriveBC HighwayCams](https://catalogue.data.gov.bc.ca/dataset/bc-highwaycams) catalogue entry publishes the same cameras under the Open Government Licence – British Columbia, but its CSV still lists the retired `images.drivebc.ca` frame URLs, which now return a placeholder. The licence's attribution statement is required and is registered in the Data attribution popover. By default the 250 cameras nearest Vancouver and Victoria load; `CCTV_DRIVEBC_MAX_SOURCES` changes the cap and `CCTV_DRIVEBC_ENABLED=0` turns the pack off. Some cameras in the feed are supplied by partners (TransLink, the City of Vancouver, the City of Surrey, Parks Canada / Alberta Motor Association and others); the feed's per-camera credit is carried onto the camera record and shown beside the provider in the CCTV panel.
|
- **DriveBC highway cameras.** The camera list comes from the keyless `https://www.drivebc.ca/api/webcams/` endpoint served by the DriveBC.ca site ([bcgov/DriveBC.ca](https://github.com/bcgov/DriveBC.ca)); frames come from `https://www.drivebc.ca/images/<id>.jpg`, built from the numeric camera id. DataBC's [DriveBC HighwayCams](https://catalogue.data.gov.bc.ca/dataset/bc-highwaycams) catalogue entry publishes the same cameras under the Open Government Licence – British Columbia, but its CSV still lists the retired `images.drivebc.ca` frame URLs, which now return a placeholder. The licence's attribution statement is required and is registered in the Data attribution popover. By default the 250 cameras nearest Vancouver and Victoria load; `CCTV_DRIVEBC_MAX_SOURCES` changes the cap and `CCTV_DRIVEBC_ENABLED=0` turns the pack off. Some cameras in the feed are supplied by partners (TransLink, the City of Vancouver, the City of Surrey, Parks Canada / Alberta Motor Association and others); the feed's per-camera credit is carried onto the camera record and shown beside the provider in the CCTV panel.
|
||||||
|
- **City of Ottawa traffic cameras.** Camera images come from the city's [Traffic Camera Images API](https://traffic.ottawa.ca/en/traffic-map-data-lists-and-resources/about-the-data), which requires an access certificate requested through the city's registration form and allows one certificate and user id to fetch a camera at most once every 60 seconds. Set `OTTAWA_CAMERA_CERTIFICATE`; without it the pack is skipped and makes no request. The camera list is the documented keyless `traffic.ottawa.ca/map/service/camera` JSON (camera number, English and French names, coordinates, owner). Frames are `traffic.ottawa.ca/opendata/camera?c=<number>`; the server adds the certificate and the user id `gev` at fetch time, so no catalog response carries the key, and serves each camera from one shared in-memory frame per minute. MTO cameras carried on the city feed keep their owner as a per-camera credit. The feed publishes no bearing, so headings use the shared id-hash fallback at low confidence, and no status field, so a camera the city takes offline still registers. Frames are never stored on disk. The city states no redistribution licence for the images; the certificate request asks how they will be used, so describe the deployment there. `CCTV_OTTAWA_MAX_SOURCES` caps the pack (default 250, nearest downtown) and `CCTV_OTTAWA_ENABLED=0` turns it off.
|
||||||
|
- **World cams image subset.** The normal CCTV catalog adds 1,176 Oregon TripCheck stills and 1,054 MLIT river cameras from the curated `config/cctv_sources.world-image-cameras.json` export; disable it with `CCTV_WORLD_CAMERAS_ENABLED=0`. The export's Vegagerðin rows are left out because the Iceland pack already loads those cameras. The server validates and pins each image URL to its provider path, fetches a frame only when a camera is viewed, and never stores or redistributes it. [ODOT allows businesses, private citizens and organizations to use TripCheck images and asks for credit](https://www.tripcheck.com/Pages/Frequently-Asked-Questions) ("Camera courtesy of ODOT"); TripCheck also carries partner cameras run by Oregon counties and cities, Caltrans and WSDOT, which keep their owner's name in the camera label. MLIT's [site terms](https://www.river.go.jp/kawabou/kwb_apend/html/caution.html) follow the Government of Japan Standard Terms of Use 2.0 (CC BY 4.0 compatible, commercial use allowed, source credit required) and ask tools not to collect data periodically, pointing regular collection to the river information data service; frames are therefore fetched only on view and refresh at most every ten minutes per camera. Both credits are registered in the Data attribution popover.
|
||||||
- **TxDOT ITS cameras.** The catalog comes from the keyless `its.txdot.gov/its/DistrictIts/GetCctvStatusListByDistrict` endpoint, one call per district. Frames come from the per-camera `GetCctvSnapshotByIcdId` endpoint, which answers JSON carrying a base64 JPEG rather than an image body; the proxy decodes it only for responses from the official TxDOT origin and validates the JPEG header before serving. Only cameras reporting `Device Online` are registered. Districts default to Austin and San Antonio (`CCTV_TXDOT_DISTRICTS`; 25 codes exist statewide); `CCTV_TXDOT_MAX_SOURCES` caps the pack and `CCTV_TXDOT_ENABLED=0` turns it off. Frames are fetched live at request time and are never stored or redistributed.
|
- **TxDOT ITS cameras.** The catalog comes from the keyless `its.txdot.gov/its/DistrictIts/GetCctvStatusListByDistrict` endpoint, one call per district. Frames come from the per-camera `GetCctvSnapshotByIcdId` endpoint, which answers JSON carrying a base64 JPEG rather than an image body; the proxy decodes it only for responses from the official TxDOT origin and validates the JPEG header before serving. Only cameras reporting `Device Online` are registered. Districts default to Austin and San Antonio (`CCTV_TXDOT_DISTRICTS`; 25 codes exist statewide); `CCTV_TXDOT_MAX_SOURCES` caps the pack and `CCTV_TXDOT_ENABLED=0` turns it off. Frames are fetched live at request time and are never stored or redistributed.
|
||||||
- **Tallinn ristmikud.** Intersection camera stills are fetched live from `ristmikud.tallinn.ee` (`/last/camNNN.jpg`). The curated catalog (`config/cctv_sources.tallinn.json`) supplies coordinates and heading priors; only server-registered ristmikud HTTPS URLs are proxied. Frames are fetched at request time and never stored or redistributed. Disable with `CCTV_TALLINN_ENABLED=0`.
|
- **Tallinn ristmikud.** Intersection camera stills are fetched live from `ristmikud.tallinn.ee` (`/last/camNNN.jpg`). The curated catalog (`config/cctv_sources.tallinn.json`) supplies coordinates and heading priors; only server-registered ristmikud HTTPS URLs are proxied. Frames are fetched at request time and never stored or redistributed. Disable with `CCTV_TALLINN_ENABLED=0`.
|
||||||
- **Tarktee / Transpordiamet.** Estonia road-weather camera locations and current JPEG URLs come from keyless DATEX2 endpoints on `tarktee.transpordiamet.ee` (`/api/v1/datex/roadCameraLocations` + `roadCameraImages`). Frame URLs rotate with each capture; the 15-minute CCTV source cache refreshes them. Only `https://tarktee.transpordiamet.ee/images/…` URLs are registered. Disable with `CCTV_TARKTEE_ENABLED=0`.
|
- **Tarktee / Transpordiamet.** Estonia road-weather camera locations and current JPEG URLs come from keyless DATEX2 endpoints on `tarktee.transpordiamet.ee` (`/api/v1/datex/roadCameraLocations` + `roadCameraImages`). Frame URLs rotate with each capture; the 15-minute CCTV source cache refreshes them. Only `https://tarktee.transpordiamet.ee/images/…` URLs are registered. Disable with `CCTV_TARKTEE_ENABLED=0`.
|
||||||
@@ -178,6 +183,7 @@ The optional Local ADS-B layer and the broadcast-FM receiver use radio you recei
|
|||||||
- **Open Calgary traffic cameras.** Keyless. The camera list is the public Socrata dataset `k7p9-kppz` on `data.calgary.ca`; frames are stills on the city's own `trafficcam.calgary.ca` host, and only that host is registered. Most rows publish an `http://` frame URL and the host redirects those to HTTPS, so URLs are upgraded and pinned to that origin before registration. Frames are fetched at request time and never stored or redistributed. The dataset publishes no camera facing: the `quadrant` field and the quadrant suffix on each camera name are Calgary's address grid, not a bearing, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. The licence requires the attribution statement above. Disable with `CCTV_CALGARY_ENABLED=0`.
|
- **Open Calgary traffic cameras.** Keyless. The camera list is the public Socrata dataset `k7p9-kppz` on `data.calgary.ca`; frames are stills on the city's own `trafficcam.calgary.ca` host, and only that host is registered. Most rows publish an `http://` frame URL and the host redirects those to HTTPS, so URLs are upgraded and pinned to that origin before registration. Frames are fetched at request time and never stored or redistributed. The dataset publishes no camera facing: the `quadrant` field and the quadrant suffix on each camera name are Calgary's address grid, not a bearing, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. The licence requires the attribution statement above. Disable with `CCTV_CALGARY_ENABLED=0`.
|
||||||
- **FL511 Florida cameras.** Off by default; set `CCTV_FLORIDA_ENABLED=1` to load them. The camera list is the keyless FL511 traffic camera layer on ArcGIS (`services.arcgis.com/.../FL511_Traffic_Cameras`), published from a Florida Division of Emergency Management account rather than by FL511 directly, and the service carries no licence text of its own. It is paged up to 2,000 rows at a time, ordered by the layer's object id and following ArcGIS's `exceededTransferLimit`, to cover the ~4,000-camera statewide set. Frames are stills on two Divas Cloud hosts (`images-dis.divas.cloud`, `snapshots.divas.cloud`); both are host-pinned and a row whose image resolves elsewhere is dropped. `CCTV_FLORIDA_MAX_SOURCES` caps the pack (default 500, anchored per region across the state). Each catalog page is read under a 2 MiB cap and redirects are refused. Frames are fetched live at request time and never stored or redistributed. FL511's terms (fl511.com/privacy#disclaimer) license its content for individual, personal use only; any other use, including a public deployment, needs FDOT's express written consent.
|
- **FL511 Florida cameras.** Off by default; set `CCTV_FLORIDA_ENABLED=1` to load them. The camera list is the keyless FL511 traffic camera layer on ArcGIS (`services.arcgis.com/.../FL511_Traffic_Cameras`), published from a Florida Division of Emergency Management account rather than by FL511 directly, and the service carries no licence text of its own. It is paged up to 2,000 rows at a time, ordered by the layer's object id and following ArcGIS's `exceededTransferLimit`, to cover the ~4,000-camera statewide set. Frames are stills on two Divas Cloud hosts (`images-dis.divas.cloud`, `snapshots.divas.cloud`); both are host-pinned and a row whose image resolves elsewhere is dropped. `CCTV_FLORIDA_MAX_SOURCES` caps the pack (default 500, anchored per region across the state). Each catalog page is read under a 2 MiB cap and redirects are refused. Frames are fetched live at request time and never stored or redistributed. FL511's terms (fl511.com/privacy#disclaimer) license its content for individual, personal use only; any other use, including a public deployment, needs FDOT's express written consent.
|
||||||
- **Catalonia (Servei Català de Trànsit) cameras.** The camera list is the keyless `https://www.gencat.cat/transit/opendata/cameres.xml` WFS/GML feed, fetched over https with redirects refused and the body read capped at 1 MiB, since the list decides ids, coordinates and which allowlisted frame path is proxied. It carries a `font` field naming the real publisher per camera; this pack keeps SCT's own highway cameras plus hotlinked Barcelona (IMI) and Terrassa municipal cameras (~130 total), each confirmed to return a real frame, so frame URLs are checked against a small host allowlist (`mct.gencat.cat`, `www.bcn.cat`, `emap.terrassa.cat`) rather than one pinned origin (a link carrying `user:pass@` userinfo or an explicit port, or pointing outside that host's frame directory, is rejected even on an allowed host; an SCT `sctidcam` must be a bare `.gif`/`.jpg` filename), and every non-SCT camera carries its real owner as a `credit` shown beside the shared `provider`. The feed carries no compass heading, so every camera loads at low heading confidence (same as TfL and Fintraffic). SCT's own feed link (`RenderService`) needed a workaround: it always 302s to a second endpoint (`TransitCamera`) on a Location the upstream hardcodes as plain http even when requested over https — refused by `fetchWithinHost`'s same-origin (scheme-included) redirect policy — and separately, `mct.gencat.cat`'s TLS setup fails the handshake with Node's fetch outright (`ERR_SSL_WRONG_SIGNATURE_TYPE`) even though other HTTP clients complete it. The loader therefore builds the `TransitCamera` URL itself, over plain http, from `RenderService`'s `sctidcam` id, rather than registering the (broken) upstream link — the only transport this one host actually serves to this runtime. Camera ids are built from the SCT camera file or the partner image path, not the feed's `fid` (which embeds an upstream server-start stamp and changes on every upstream restart), and rows the feed lists more than once collapse to one camera. The feed carries no camera status field, so a camera its publisher has taken offline still registers and shows the publisher's own "image unavailable" still (SCT and Barcelona both serve one with HTTP 200), the same as other packs without a status field. Frames are fetched at request time and never stored or redistributed. The feed itself states no licence; the pack relies on the Generalitat de Catalunya open-data portal's terms for this dataset (the licence and attribution above). Disable with `CCTV_CATALONIA_ENABLED=0`.
|
- **Catalonia (Servei Català de Trànsit) cameras.** The camera list is the keyless `https://www.gencat.cat/transit/opendata/cameres.xml` WFS/GML feed, fetched over https with redirects refused and the body read capped at 1 MiB, since the list decides ids, coordinates and which allowlisted frame path is proxied. It carries a `font` field naming the real publisher per camera; this pack keeps SCT's own highway cameras plus hotlinked Barcelona (IMI) and Terrassa municipal cameras (~130 total), each confirmed to return a real frame, so frame URLs are checked against a small host allowlist (`mct.gencat.cat`, `www.bcn.cat`, `emap.terrassa.cat`) rather than one pinned origin (a link carrying `user:pass@` userinfo or an explicit port, or pointing outside that host's frame directory, is rejected even on an allowed host; an SCT `sctidcam` must be a bare `.gif`/`.jpg` filename), and every non-SCT camera carries its real owner as a `credit` shown beside the shared `provider`. The feed carries no compass heading, so every camera loads at low heading confidence (same as TfL and Fintraffic). SCT's own feed link (`RenderService`) needed a workaround: it always 302s to a second endpoint (`TransitCamera`) on a Location the upstream hardcodes as plain http even when requested over https — refused by `fetchWithinHost`'s same-origin (scheme-included) redirect policy — and separately, `mct.gencat.cat`'s TLS setup fails the handshake with Node's fetch outright (`ERR_SSL_WRONG_SIGNATURE_TYPE`) even though other HTTP clients complete it. The loader therefore builds the `TransitCamera` URL itself, over plain http, from `RenderService`'s `sctidcam` id, rather than registering the (broken) upstream link — the only transport this one host actually serves to this runtime. Camera ids are built from the SCT camera file or the partner image path, not the feed's `fid` (which embeds an upstream server-start stamp and changes on every upstream restart), and rows the feed lists more than once collapse to one camera. The feed carries no camera status field, so a camera its publisher has taken offline still registers and shows the publisher's own "image unavailable" still (SCT and Barcelona both serve one with HTTP 200), the same as other packs without a status field. Frames are fetched at request time and never stored or redistributed. The feed itself states no licence; the pack relies on the Generalitat de Catalunya open-data portal's terms for this dataset (the licence and attribution above). Disable with `CCTV_CATALONIA_ENABLED=0`.
|
||||||
|
- **Iceland (Vegagerðin / IRCA) cameras.** The camera list is the keyless `https://gagnaveita.vegagerdin.is/api/vefmyndavelar2014_1` JSON feed (about 500 camera views at roughly 170 stations), fetched over https with redirects refused and the body read capped at 2 MiB, since the list decides ids, coordinates and which frame path is proxied. Frames are JPEG stills in `https://www.vegagerdin.is/vgdata/vefmyndavelar/`; only links inside that directory are registered (userinfo, explicit ports and encoded path separators are rejected). Camera ids come from the frame file name. The feed's `Skyring` view description is the camera label, and a stated facing ("til vesturs", "í suður", "séð austur") sets a high-confidence heading; a view that states none, or two different ones ("niður á veg", a bare road direction), takes the id-hash low-confidence pose. The feed has no elevation, so cameras carry a flat prior that the client's ground snap corrects. IRCA publishes road camera images under CC BY 4.0 and requires the licensor to be acknowledged without implying endorsement; the pack shows the attribution above (licensor, dataset, CC BY 4.0, terms link and no-endorsement note) in the Data attribution popover, and every camera record carries the licence string. IRCA describes the images as fetched several times per hour (a live frame's `Last-Modified` was about four minutes old on 2026-11-06) and the real-time data as provided as is, without warranty. Frames are fetched at request time and never stored or redistributed. Disable with `CCTV_ICELAND_ENABLED=0`.
|
||||||
- **King County road cameras.** Keyless. The camera list is one public ArcGIS FeatureServer GeoJSON query (King County DOT Road Services, "King County and WSDOT Traffic Cameras"). The `outFields` list is explicit on purpose: the layer also carries asset-administration columns — including staff names — that are never fetched. Only live, active cameras with frames on the county's own `info.kingcounty.gov` image handler are registered (the feed writes `http://`; the handler serves HTTPS, so URLs are upgraded and pinned before registration). WSDOT-owned rows in the layer are skipped because their frames are WSDOT-hosted, outside the pinned image origin; partner-city cameras hosted on the county image handler (e.g. Newcastle) name their owner as the per-camera credit. The layer publishes no facing, so headings use the shared id-hash fallback at low confidence. Uniquely, the county publishes each camera's hardware `Manufacturer`/`Model` (Cohu 3950/3965, Bosch AUTODOME, Axis PTZ domes); both are carried on the source (and served by `/api/cctv/sources`) as `model` and `manufacturer` for identified-hardware consumers (vendor-generic strings such as `PTZ` name no model and are omitted). Frames are fetched at request time and never stored or redistributed. Disable with `CCTV_KINGCOUNTY_ENABLED=0`.
|
- **King County road cameras.** Keyless. The camera list is one public ArcGIS FeatureServer GeoJSON query (King County DOT Road Services, "King County and WSDOT Traffic Cameras"). The `outFields` list is explicit on purpose: the layer also carries asset-administration columns — including staff names — that are never fetched. Only live, active cameras with frames on the county's own `info.kingcounty.gov` image handler are registered (the feed writes `http://`; the handler serves HTTPS, so URLs are upgraded and pinned before registration). WSDOT-owned rows in the layer are skipped because their frames are WSDOT-hosted, outside the pinned image origin; partner-city cameras hosted on the county image handler (e.g. Newcastle) name their owner as the per-camera credit. The layer publishes no facing, so headings use the shared id-hash fallback at low confidence. Uniquely, the county publishes each camera's hardware `Manufacturer`/`Model` (Cohu 3950/3965, Bosch AUTODOME, Axis PTZ domes); both are carried on the source (and served by `/api/cctv/sources`) as `model` and `manufacturer` for identified-hardware consumers (vendor-generic strings such as `PTZ` name no model and are omitted). Frames are fetched at request time and never stored or redistributed. Disable with `CCTV_KINGCOUNTY_ENABLED=0`.
|
||||||
- **WSDOT highway cameras.** Keyless. The camera list is the Esri JSON layer `data.wsdot.wa.gov/travelcenter/Cameras.json` — the same layer WSDOT's own Travel Center map consumes (~1,700 point features, EPSG:3857 geometry converted to WGS84 on load; the body carries Windows-1252 bytes and is decoded as such). Only frames on WSDOT's own `images.wsdot.wa.gov` host are registered — the catalog also lists ~70 partner cameras (Oregon DOT, City of Seattle, lodges, airports) whose own terms apply, and those are skipped rather than proxied. WSDOT's layer metadata marks the feed for "low volume" use (see WSDOT's [travel information disclaimer](https://wsdot.wa.gov/about/policies/travel-information-disclaimer)). The catalog is fetched once per CCTV catalog refresh (every 15 minutes), and a camera's frame is fetched only when that camera is viewed; frames are never stored or redistributed. The live feed's `CompassDirection` is a single cardinal (N/E/S/W), `B` (both directions — most rows), `O`, or null. A single cardinal gives a high-confidence heading (the diagonals NE/SE/SW/NW are mapped too should they appear); `B`, `O`, null, and any other code carry no single facing and use the shared id-hash fallback at low confidence. By default the 250 cameras nearest Seattle and Spokane load; `CCTV_WSDOT_MAX_SOURCES` changes the cap (8–1,200) and `CCTV_WSDOT_ENABLED=0` turns the pack off. A keyed WSDOT Traveler Information API serves the same population for higher-volume use and is deliberately not required here.
|
- **WSDOT highway cameras.** Keyless. The camera list is the Esri JSON layer `data.wsdot.wa.gov/travelcenter/Cameras.json` — the same layer WSDOT's own Travel Center map consumes (~1,700 point features, EPSG:3857 geometry converted to WGS84 on load; the body carries Windows-1252 bytes and is decoded as such). Only frames on WSDOT's own `images.wsdot.wa.gov` host are registered — the catalog also lists ~70 partner cameras (Oregon DOT, City of Seattle, lodges, airports) whose own terms apply, and those are skipped rather than proxied. WSDOT's layer metadata marks the feed for "low volume" use (see WSDOT's [travel information disclaimer](https://wsdot.wa.gov/about/policies/travel-information-disclaimer)). The catalog is fetched once per CCTV catalog refresh (every 15 minutes), and a camera's frame is fetched only when that camera is viewed; frames are never stored or redistributed. The live feed's `CompassDirection` is a single cardinal (N/E/S/W), `B` (both directions — most rows), `O`, or null. A single cardinal gives a high-confidence heading (the diagonals NE/SE/SW/NW are mapped too should they appear); `B`, `O`, null, and any other code carry no single facing and use the shared id-hash fallback at low confidence. By default the 250 cameras nearest Seattle and Spokane load; `CCTV_WSDOT_MAX_SOURCES` changes the cap (8–1,200) and `CCTV_WSDOT_ENABLED=0` turns the pack off. A keyed WSDOT Traveler Information API serves the same population for higher-volume use and is deliberately not required here.
|
||||||
- **Hong Kong Transport Department traffic snapshot cameras.** Keyless. The English camera list is the public DATA.GOV.HK XML at `static.data.gov.hk/td/traffic-snapshot-images/code/Traffic_Camera_Locations_En.xml`; frames are stills on `tdcctv.data.one.gov.hk`, and only that host is registered. Frame URLs are rebuilt from each camera key (`https://tdcctv.data.one.gov.hk/{KEY}.JPG`) rather than taken verbatim from the catalog. Stills were probed to answer directly on that origin with no redirect hop. Frames are fetched at request time and never stored or redistributed. The dataset publishes no camera facing, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. By default nearly the full catalog loads (~1,013; pack cap 1,100), prioritized nearest Central, Tsim Sha Tsui, Sha Tin, Tsuen Wan, Tai Po, Fanling, Tuen Mun, Yuen Long and Tseung Kwan O so a lowered cap still spans Hong Kong Island, Kowloon and the New Territories. When the sum of packs exceeds the catalog-wide ceiling, shared round-robin keeps every lane represented. `CCTV_HK_MAX_SOURCES` (8–1200) changes the cap and `CCTV_HK_ENABLED=0` turns the pack off. The DATA.GOV.HK Terms of Use require attribution to the Government / Transport Department / DATA.GOV.HK.
|
- **Hong Kong Transport Department traffic snapshot cameras.** Keyless. The English camera list is the public DATA.GOV.HK XML at `static.data.gov.hk/td/traffic-snapshot-images/code/Traffic_Camera_Locations_En.xml`; frames are stills on `tdcctv.data.one.gov.hk`, and only that host is registered. Frame URLs are rebuilt from each camera key (`https://tdcctv.data.one.gov.hk/{KEY}.JPG`) rather than taken verbatim from the catalog. Stills were probed to answer directly on that origin with no redirect hop. Frames are fetched at request time and never stored or redistributed. The dataset publishes no camera facing, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. By default nearly the full catalog loads (~1,013; pack cap 1,100), prioritized nearest Central, Tsim Sha Tsui, Sha Tin, Tsuen Wan, Tai Po, Fanling, Tuen Mun, Yuen Long and Tseung Kwan O so a lowered cap still spans Hong Kong Island, Kowloon and the New Territories. When the sum of packs exceeds the catalog-wide ceiling, shared round-robin keeps every lane represented. `CCTV_HK_MAX_SOURCES` (8–1200) changes the cap and `CCTV_HK_ENABLED=0` turns the pack off. The DATA.GOV.HK Terms of Use require attribution to the Government / Transport Department / DATA.GOV.HK.
|
||||||
@@ -220,6 +226,8 @@ The [Bhote Koshi event pack](public/events/bhote-koshi-2026/README.md), under `p
|
|||||||
| **Datacenters** (4,352) | `datacenters/` | **ODbL 1.0** (OpenStreetMap extract) | ✅ (attribution + share-alike on data) | © OpenStreetMap contributors (shared credit) |
|
| **Datacenters** (4,352) | `datacenters/` | **ODbL 1.0** (OpenStreetMap extract) | ✅ (attribution + share-alike on data) | © OpenStreetMap contributors (shared credit) |
|
||||||
| **Dams** (704) | `dams/` | **ODbL 1.0** (OpenInfraMap / OSM extract) | ✅ (attribution + share-alike on data) | © OpenStreetMap contributors (shared credit) + Open Infrastructure Map |
|
| **Dams** (704) | `dams/` | **ODbL 1.0** (OpenInfraMap / OSM extract) | ✅ (attribution + share-alike on data) | © OpenStreetMap contributors (shared credit) + Open Infrastructure Map |
|
||||||
| **Military area names** (36,466) | `osm_military_names/` | **ODbL 1.0** (OpenStreetMap, via Overture Maps) | ✅ (attribution + share-alike on data) | © OpenStreetMap contributors (shared credit) + Overture Maps Foundation |
|
| **Military area names** (36,466) | `osm_military_names/` | **ODbL 1.0** (OpenStreetMap, via Overture Maps) | ✅ (attribution + share-alike on data) | © OpenStreetMap contributors (shared credit) + Overture Maps Foundation |
|
||||||
|
| **Québec CCTV source catalog** (1,120 locations) | `public/quebec-cameras.json` | Mixed: MTQ locations CC BY 4.0; Montréal camera nodes ODbL 1.0; scenic records retain per-record provenance. No video files are bundled or cached. | Location data is per-record; video remains hosted by Québec 511 and its platform terms apply; scenic source pages may have separate terms | MTQ / Données Québec CC BY 4.0; © OpenStreetMap contributors (ODbL); scenic operator and position source shown in the selected-camera panel |
|
||||||
|
| **World camera image subset** (2,230 locations) | `config/cctv_sources.world-image-cameras.json` | Mixed: ODOT TripCheck public images (ODOT permits use with credit) and MLIT site content under terms compatible with CC BY 4.0. Frames are not bundled or persisted; the server holds a bounded in-memory cache. | Per-source terms apply; NZTA Journey Planner web-cache rows are excluded; Vegagerðin rows are served by the Iceland pack instead | Oregon Department of Transportation (Camera courtesy of ODOT) and Japan Ministry of Land, Infrastructure, Transport and Tourism (出典:国土交通省 川の防災情報) |
|
||||||
| **TeleGeography Submarine Cable Map** (712 cables + 1,917 landing points) | `telegeography_submarine_cables/` | **CC BY-NC-SA 3.0** | ❌ **NonCommercial — remove for commercial use** | "© TeleGeography — submarinecablemap.com" |
|
| **TeleGeography Submarine Cable Map** (712 cables + 1,917 landing points) | `telegeography_submarine_cables/` | **CC BY-NC-SA 3.0** | ❌ **NonCommercial — remove for commercial use** | "© TeleGeography — submarinecablemap.com" |
|
||||||
| **Natural Earth physical regions** (1,046 land + 292 marine named polygons) | `natural_earth/` | **Public domain** | ✅ (no restrictions) | "Made with Natural Earth" (courtesy credit — not legally required) |
|
| **Natural Earth physical regions** (1,046 land + 292 marine named polygons) | `natural_earth/` | **Public domain** | ✅ (no restrictions) | "Made with Natural Earth" (courtesy credit — not legally required) |
|
||||||
| **DataSF Analysis Neighborhoods** (41 SF neighborhood polygons) | `neighborhoods/` | **PDDL 1.0** (public domain) | ✅ (no restrictions) | "City & County of San Francisco — DataSF" (courtesy — not legally required) |
|
| **DataSF Analysis Neighborhoods** (41 SF neighborhood polygons) | `neighborhoods/` | **PDDL 1.0** (public domain) | ✅ (no restrictions) | "City & County of San Francisco — DataSF" (courtesy — not legally required) |
|
||||||
|
|||||||
@@ -440,7 +440,7 @@ Twenty-two layers and map sources. **Twenty have a keyless path.** Some offer ad
|
|||||||
| 🌍 **Earthquakes** | Global seismic activity, last 24h | USGS | 🟢 |
|
| 🌍 **Earthquakes** | Global seismic activity, last 24h | USGS | 🟢 |
|
||||||
| ◍ **Air quality** | Live AQHI on the published 1–10+ health-risk scale, with a Weather-panel card showing the band legend and the highest readings in view. **Canada only** — ECCC is the first registered provider | ECCC MSC GeoMet | 🟢 |
|
| ◍ **Air quality** | Live AQHI on the published 1–10+ health-risk scale, with a Weather-panel card showing the band legend and the highest readings in view. **Canada only** — ECCC is the first registered provider | ECCC MSC GeoMet | 🟢 |
|
||||||
| 🚗 **Traffic** | Simulated vehicles on OSM roads. With TomTom, live flow speeds drive the simulation and congestion colors below ~8 km; individual vehicle positions are not live observations | TomTom + OSM | 🟢 simulation · 🟡 live flow speeds |
|
| 🚗 **Traffic** | Simulated vehicles on OSM roads. With TomTom, live flow speeds drive the simulation and congestion colors below ~8 km; individual vehicle positions are not live observations | TomTom + OSM | 🟢 simulation · 🟡 live flow speeds |
|
||||||
| 📹 **CCTV Mesh** | ~4,000 public cameras (shared cap) projected _into_ the 3D space — Austin · Texas (TxDOT) · California (Caltrans) · London (TfL) · Ontario (511, free developer key) · Finland (Fintraffic) · British Columbia (DriveBC) · Estonia (Tallinn, Tarktee) · Delaware (DelDOT live video) · New South Wales (Live Traffic NSW) · Calgary · Norway (Statens vegvesen) · Toronto · King County (WA) · Washington (WSDOT) · Catalonia (Servei Català de Trànsit) · Hong Kong (Transport Department) · Taiwan (Freeway Bureau, MOTC) · Italy (A22 Brennero motorway), plus opt-in New York City (NYC DOT TMC, needs your own NYC DOT agreement), opt-in Lithuania (Via Lietuva / Eismoinfo, photo licence unconfirmed), opt-in Florida (FL511, individual personal use only; other use needs FDOT's written consent) and opt-in Houston (TranStar, enable only with TxDOT's written permission per TranStar's Content Usage terms). Positions are published; poses are estimated priors **you calibrate by dragging a gizmo on the camera itself** | City APIs | 🟢 |
|
| 📹 **CCTV Mesh** | up to 7,350 camera locations (4,000 shared round-robin slots, plus room for 1,120 Québec and 2,230 World image cameras) projected _into_ the 3D space — Austin · Texas (TxDOT) · California (Caltrans) · London (TfL) · Ontario (511, free developer key) · Ottawa (City of Ottawa, free access certificate) · Finland (Fintraffic) · British Columbia (DriveBC) · Estonia (Tallinn, Tarktee) · Delaware (DelDOT live video) · New South Wales (Live Traffic NSW) · Calgary · Norway (Statens vegvesen) · Toronto · King County (WA) · Washington (WSDOT) · Catalonia (Servei Català de Trànsit) · Iceland (Vegagerðin) · Hong Kong (Transport Department) · Taiwan (Freeway Bureau, MOTC) · Québec (MTQ locations with Québec 511 links, Montréal locations, regional webcams) · Oregon (TripCheck) · Japan (MLIT river cameras) · Italy (A22 Brennero motorway), plus opt-in New York City (NYC DOT TMC, needs your own NYC DOT agreement), opt-in Lithuania (Via Lietuva / Eismoinfo, photo licence unconfirmed), opt-in Québec 511 in-browser video (embedding terms unconfirmed), opt-in Florida (FL511, individual personal use only; other use needs FDOT's written consent) and opt-in Houston (TranStar, enable only with TxDOT's written permission per TranStar's Content Usage terms). Positions are published or attributed; poses are estimated priors **you calibrate by dragging a gizmo on the camera itself** | City APIs | 🟢 |
|
||||||
| 📷 **Mapped ALPR Cameras** | License-plate-reader camera locations tagged by OpenStreetMap contributors, loaded one city-sized view at a time, with **SHOW NEAREST**. Locations and tags only: no plate data, no video | OpenStreetMap (incl. DeFlock mapping) | 🟢 |
|
| 📷 **Mapped ALPR Cameras** | License-plate-reader camera locations tagged by OpenStreetMap contributors, loaded one city-sized view at a time, with **SHOW NEAREST**. Locations and tags only: no plate data, no video | OpenStreetMap (incl. DeFlock mapping) | 🟢 |
|
||||||
| 📷 **Street Level** | Street-level photos behind one panel, one chip per provider: coverage on the streets, image cones, an embedded viewer with full-screen **EXPAND**. Mapillary, Google Street View, KartaView and Panoramax | Mapillary · Google · KartaView · Panoramax | 🟢 KartaView, Panoramax · 🟡 Mapillary token · 🔴 Google Maps key |
|
| 📷 **Street Level** | Street-level photos behind one panel, one chip per provider: coverage on the streets, image cones, an embedded viewer with full-screen **EXPAND**. Mapillary, Google Street View, KartaView and Panoramax | Mapillary · Google · KartaView · Panoramax | 🟢 KartaView, Panoramax · 🟡 Mapillary token · 🔴 Google Maps key |
|
||||||
| 📻 **Radio** | Geolocated world radio with an **analog tuner** — drag the needle across up to 750 stations and the globe flies to each broadcaster | Radio Browser / broadcasters | 🟢 |
|
| 📻 **Radio** | Geolocated world radio with an **analog tuner** — drag the needle across up to 750 stations and the globe flies to each broadcaster | Radio Browser / broadcasters | 🟢 |
|
||||||
@@ -639,7 +639,7 @@ and panel. DelDOT uses its official HTTPS HLS catalog links. Disable that
|
|||||||
pack with `CCTV_DELDOT_ENABLED=0`.
|
pack with `CCTV_DELDOT_ENABLED=0`.
|
||||||
|
|
||||||
The server allows two concurrent sessions. Each retains at most 12 segments
|
The server allows two concurrent sessions. Each retains at most 12 segments
|
||||||
and 24 MiB in memory; individual downloads are capped at 4 MiB with a ten
|
and 24 MiB in memory; individual downloads are capped at 8 MiB with a ten
|
||||||
second deadline. There are no segment files or ffmpeg processes. Redirects,
|
second deadline. There are no segment files or ffmpeg processes. Redirects,
|
||||||
off-origin references, encrypted playlists and non-MPEG-TS segments are refused.
|
off-origin references, encrypted playlists and non-MPEG-TS segments are refused.
|
||||||
Each decoder has its own client lease (at most eight per session), including
|
Each decoder has its own client lease (at most eight per session), including
|
||||||
|
|||||||
+3
-2
@@ -69,13 +69,14 @@ browser-key fallback for existing single-key setups.
|
|||||||
The data proxies under `server/providers/` are written so the browser cannot turn the server into an open relay:
|
The data proxies under `server/providers/` are written so the browser cannot turn the server into an open relay:
|
||||||
|
|
||||||
- **No arbitrary-URL fetching.** The CCTV frame proxy fetches only server-registered camera/frame URLs — clients cannot pass an upstream URL to fetch (SSRF mitigation). Other proxies target fixed upstream hosts.
|
- **No arbitrary-URL fetching.** The CCTV frame proxy fetches only server-registered camera/frame URLs — clients cannot pass an upstream URL to fetch (SSRF mitigation). Other proxies target fixed upstream hosts.
|
||||||
- **Live HLS is bounded and origin-pinned.** Registered HTTP(S) HLS sources use a Node puller that rejects redirects and off-origin playlist references, bounds playlists and segment bodies while streaming, and aborts timed-out or released sessions. At most two sessions retain 12 segments/24 MiB each, plus bounded download buffers. Stores are memory-only and idle sessions expire after 15 seconds. RTMP/ffmpeg execution is not enabled. Locally configured source URLs remain an operator trust boundary.
|
- **Live HLS is bounded and origin-pinned.** Registered HTTP(S) HLS sources use a Node puller that rejects redirects and off-origin playlist references, bounds playlists to 256 KiB and segment bodies to 8 MiB while streaming, and aborts timed-out or released sessions. At most two sessions retain 12 segments/24 MiB each, plus bounded download buffers. Stores are memory-only and idle sessions expire after 15 seconds. RTMP/ffmpeg execution is not enabled. Locally configured source URLs remain an operator trust boundary.
|
||||||
- **Radio is not an audio relay.** `/api/radio/stations` contacts only allowlisted Radio Browser HTTPS hosts and paths, rejects redirects, rejects any hostname with a loopback/private/link-local/metadata/non-public A or AAAA result, and pins each TLS connection to a validated address. It returns normalized public HTTPS stream URLs; `/api/radio/click/:uuid` applies the same destination policy and accepts only station IDs from the current bounded catalog. The browser then connects directly to the broadcaster after an explicit playback action, so the broadcaster sees the listener's IP address. GEV never proxies, caches, records, or redistributes audio.
|
- **Radio is not an audio relay.** `/api/radio/stations` contacts only allowlisted Radio Browser HTTPS hosts and paths, rejects redirects, rejects any hostname with a loopback/private/link-local/metadata/non-public A or AAAA result, and pins each TLS connection to a validated address. It returns normalized public HTTPS stream URLs; `/api/radio/click/:uuid` applies the same destination policy and accepts only station IDs from the current bounded catalog. The browser then connects directly to the broadcaster after an explicit playback action, so the broadcaster sees the listener's IP address. GEV never proxies, caches, records, or redistributes audio.
|
||||||
|
- **Québec 511 video plays in the browser, opt-in and after Play.** With `CCTV_QUEBEC_VIDEO_ENABLED=1`, `/api/cctv/sources` lists, for each MTQ camera, one URL built server-side from its numeric id on `https://www.quebec511.info/Carte/Fenetres/camera.ashx`; the overlay accepts no other host, path or format. The browser loads that clip only after the viewer presses Play for the selected camera, so Québec 511 sees the viewer's IP address, and the panel says so before Play. Selecting a camera by click, auto-hop, a scene or voice never loads it, and switching cameras stops playback. GEV never proxies, caches or reads the video's pixels. With the flag unset (the default) the browser makes no request to Québec 511.
|
||||||
- **No verbatim client headers upstream.** The CCTV media route is the one route that relays a request header (`Range`, for video seeking). It is parsed and canonicalized before it is forwarded: one `bytes=` range only, with every accepted form — explicit span, open-ended and suffix — bounded to the same 64 MiB ceiling the relay applies to a declared response body. Multi-range, malformed, inverted and non-`bytes` values are dropped and the request proceeds without a `Range`, as RFC 7233 §3.1 prescribes. Bounding the request bounds what is asked for: a response that declares no length — live streamed media, or a chunked body from an upstream that ignores the `Range` — has no ceiling. An upstream request the browser has stopped waiting for is cancelled rather than left running, whether the viewer leaves before the headers arrive or during the body.
|
- **No verbatim client headers upstream.** The CCTV media route is the one route that relays a request header (`Range`, for video seeking). It is parsed and canonicalized before it is forwarded: one `bytes=` range only, with every accepted form — explicit span, open-ended and suffix — bounded to the same 64 MiB ceiling the relay applies to a declared response body. Multi-range, malformed, inverted and non-`bytes` values are dropped and the request proceeds without a `Range`, as RFC 7233 §3.1 prescribes. Bounding the request bounds what is asked for: a response that declares no length — live streamed media, or a chunked body from an upstream that ignores the `Range` — has no ceiling. An upstream request the browser has stopped waiting for is cancelled rather than left running, whether the viewer leaves before the headers arrive or during the body.
|
||||||
- **Transit fetches registered feeds only.** `/api/transit/vehicles/<id>` resolves the id against `src/data/transitFeeds.js`; the browser never supplies a URL, and a feed that is registered but disabled does not resolve at all. Redirects are followed manually and each hop is validated against the feed's own https origin before it is requested, so an off-origin or downgraded hop is refused rather than contacted. Bodies are capped at 8 MB, the protobuf is decoded server-side under entity-count and string-length ceilings, a differential feed is refused, and snapshots live 15 s in memory with no disk cache. A per-feed admission limiter and a failure cooldown ladder bound what this process can ask of any operator.
|
- **Transit fetches registered feeds only.** `/api/transit/vehicles/<id>` resolves the id against `src/data/transitFeeds.js`; the browser never supplies a URL, and a feed that is registered but disabled does not resolve at all. Redirects are followed manually and each hop is validated against the feed's own https origin before it is requested, so an off-origin or downgraded hop is refused rather than contacted. Bodies are capped at 8 MB, the protobuf is decoded server-side under entity-count and string-length ceilings, a differential feed is refused, and snapshots live 15 s in memory with no disk cache. A per-feed admission limiter and a failure cooldown ladder bound what this process can ask of any operator.
|
||||||
- **Local receiver feeds are operator-configured and local-only.** `/api/local-receivers/aircraft` reads only the `aircraft.json` URLs in the server's `LOCAL_RECEIVER_FEEDS`; the browser never supplies an address. Each host must pass the shared tap address rule (`src/data/tapAddress.js`: loopback, RFC1918, `localhost`, `*.local`; no link-local, IPv6 or other names), the scheme must be http(s), the path must end in `aircraft.json`, and credentials, queries and fragments are refused. Invalid entries are logged at startup and never fetched. Reads use a 2 s timeout, refuse redirects, cap bodies at 2 MB and share one read per second; responses name each feed by band only and never carry upstream error text.
|
- **Local receiver feeds are operator-configured and local-only.** `/api/local-receivers/aircraft` reads only the `aircraft.json` URLs in the server's `LOCAL_RECEIVER_FEEDS`; the browser never supplies an address. Each host must pass the shared tap address rule (`src/data/tapAddress.js`: loopback, RFC1918, `localhost`, `*.local`; no link-local, IPv6 or other names), the scheme must be http(s), the path must end in `aircraft.json`, and credentials, queries and fragments are refused. Invalid entries are logged at startup and never fetched. Reads use a 2 s timeout, refuse redirects, cap bodies at 2 MB and share one read per second; responses name each feed by band only and never carry upstream error text.
|
||||||
- **Voice place search runs only on the operator's Overpass.** `/api/osm/features` answers only when `OVERPASS_UPSTREAMS` is set and never falls back to a public instance. The client sends a curated preset id, a box, a mode and a limit; the server writes and quotes the Overpass query itself, so no client or model text reaches it. Boxes are capped (36 deg² for a count, 4 deg² for a listing), as are the feature limit, the Overpass timeout and memory, and the response bytes read. Each client (IPv6 clients keyed by /64, as on `/api/overpass`) runs one search at a time and two run at once in all, under a per-client rate limit (12/min) and a global one (30/min); a search gets 22 s across every configured endpoint in turn (Overpass itself is told 20 s), which ends before the voice answer stops waiting at 25 s. The route sits behind the cross-site gate below. Answers are cached in memory and on disk (`.gev-cache/osm-features/`, at most 400 entries and 256 MB, kept a day), keyed to the configured instance so a repointed `OVERPASS_UPSTREAMS` never serves the old one's answers; a malformed answer is never cached.
|
- **Voice place search runs only on the operator's Overpass.** `/api/osm/features` answers only when `OVERPASS_UPSTREAMS` is set and never falls back to a public instance. The client sends a curated preset id, a box, a mode and a limit; the server writes and quotes the Overpass query itself, so no client or model text reaches it. Boxes are capped (36 deg² for a count, 4 deg² for a listing), as are the feature limit, the Overpass timeout and memory, and the response bytes read. Each client (IPv6 clients keyed by /64, as on `/api/overpass`) runs one search at a time and two run at once in all, under a per-client rate limit (12/min) and a global one (30/min); a search gets 22 s across every configured endpoint in turn (Overpass itself is told 20 s), which ends before the voice answer stops waiting at 25 s. The route sits behind the cross-site gate below. Answers are cached in memory and on disk (`.gev-cache/osm-features/`, at most 400 entries and 256 MB, kept a day), keyed to the configured instance so a repointed `OVERPASS_UPSTREAMS` never serves the old one's answers; a malformed answer is never cached.
|
||||||
- **Validated response formats.** Proxied bodies are relayed only in the format the route serves. CCTV frames and the Street View fallback accept JPEG, PNG, GIF, WebP and AVIF only, sent under their canonical type; any other type falls through to the next fallback. Live CCTV media must match its feed kind (`video/mp4`, `video/webm`, or `multipart/x-mixed-replace` with a boundary) before it is relayed or the camera counts as healthy, and its redirects stay on the registered origin. GBFS bodies must parse as JSON and are re-serialized as `application/json; charset=utf-8`. Camera catalog URLs are pinned by parsed URL — scheme, exact host, no credentials, default port, and a normalized path inside the agency's image directory — and a redirect on a pinned host must stay inside the same directory. Every `/api/cctv` route uses the keyless cross-site checks described below, so cameras stay reachable behind a reverse proxy; a request carrying forwarding headers never reaches the key-bearing Street View fallback and gets the placeholder frame instead, as when no key is configured.
|
- **Validated response formats.** Proxied bodies are relayed only in the format the route serves. CCTV frames and the Street View fallback accept JPEG, PNG, GIF, WebP and AVIF only, sent under their canonical type; any other type falls through to the next fallback. The one exception is a source registered as an MJPEG still (the Taiwan Highway Bureau feeds): its `multipart/x-mixed-replace` answer is read only up to its first JPEG part, capped at 2 MB, and sent as `image/jpeg`; a multipart answer from any other camera falls through. A camera whose API needs an operator credential (the City of Ottawa certificate, `OTTAWA_CAMERA_CERTIFICATE`) has a keyless catalog URL; the frame proxy adds the credential only at fetch time, only for a URL inside that camera's pinned path, so `/api/cctv/sources` and `/api/cctv/stream` never carry it. Live CCTV media must match its feed kind (`video/mp4`, `video/webm`, or `multipart/x-mixed-replace` with a boundary) before it is relayed or the camera counts as healthy, and its redirects stay on the registered origin. GBFS bodies must parse as JSON and are re-serialized as `application/json; charset=utf-8`. Camera catalog URLs are pinned by parsed URL — scheme, exact host, no credentials, default port, and a normalized path inside the agency's image directory — and a redirect on a pinned host must stay inside the same directory. Every `/api/cctv` route uses the keyless cross-site checks described below, so cameras stay reachable behind a reverse proxy; a request carrying forwarding headers never reaches the key-bearing Street View fallback and gets the placeholder frame instead, as when no key is configured.
|
||||||
- **Consistent API response headers.** Every `/api` response, including errors, partial content, Host refusals and unknown routes, carries `Content-Security-Policy: default-src 'none'; sandbox` and `X-Content-Type-Options: nosniff` (`apiResponseHeadersPlugin` in `build/vite.js`, installed ahead of the Host check). A route that sets its own policy adds it as a further policy; it never replaces this one.
|
- **Consistent API response headers.** Every `/api` response, including errors, partial content, Host refusals and unknown routes, carries `Content-Security-Policy: default-src 'none'; sandbox` and `X-Content-Type-Options: nosniff` (`apiResponseHeadersPlugin` in `build/vite.js`, installed ahead of the Host check). A route that sets its own policy adds it as a further policy; it never replaces this one.
|
||||||
- **Response-size caps and timeouts** on proxied responses.
|
- **Response-size caps and timeouts** on proxied responses.
|
||||||
- **Sanitized errors** — internal error details are not echoed back to clients.
|
- **Sanitized errors** — internal error details are not echoed back to clients.
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
- Expand CCTV coverage with a keyless Taiwan Highway Bureau fallback, 1,120
|
||||||
|
Québec camera locations, City of Ottawa traffic cameras (needs a free city
|
||||||
|
access certificate, `OTTAWA_CAMERA_CERTIFICATE`), and 2,230 curated
|
||||||
|
image-backed cameras from Oregon and Japan (InoukT, #1506).
|
||||||
|
- Québec 511 in-browser video is opt-in (`CCTV_QUEBEC_VIDEO_ENABLED=1`) and
|
||||||
|
loads only after the viewer presses Play; enforce provider-specific frame
|
||||||
|
refresh limits, and report recognized MLIT maintenance images as degraded
|
||||||
|
instead of healthy camera snapshots.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
- One world clock now drives everything with a time of its own: the sky,
|
||||||
|
the HUD clock, satellites, launches and weather. A timeline along the
|
||||||
|
bottom of the screen, shown while one of those layers is on, plays, pauses
|
||||||
|
and scrubs it, with a tick for each launch or frame and a way back to
|
||||||
|
live. Share links made away from live carry the time (samehkhamis, #1512).
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
- The timeline brings launches up as the time passes them, offers play
|
||||||
|
speeds from real time to a week a second, and plays smoothly, holding only
|
||||||
|
when the next weather frame has yet to load, with a spinner by the time
|
||||||
|
while it waits. The time rides in a bubble over the handle. The track zooms
|
||||||
|
with a scroll or a pinch, drags along, and goes to the time under a tap, on
|
||||||
|
a phone as on a desktop. Zooming out on the globe stops while the globe is
|
||||||
|
still in view instead of leaving it a speck (samehkhamis, #1513).
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
- Add Icelandic road cameras from the Icelandic Road and Coastal Administration
|
||||||
|
(Vegagerðin) as a CCTV pack. The camera list is one keyless JSON request to
|
||||||
|
`gagnaveita.vegagerdin.is/api/vefmyndavelar2014_1` (about 500 views at 166
|
||||||
|
stations); frames are JPEG stills in `www.vegagerdin.is/vgdata/vefmyndavelar/`,
|
||||||
|
and only links inside that directory are registered. The catalog is fetched
|
||||||
|
over https with redirects refused and a 2 MiB body cap. An explicit facing in
|
||||||
|
the view description ("til vesturs", "í suður", "séð austur") sets a
|
||||||
|
high-confidence heading; other views keep the low-confidence fallback pose.
|
||||||
|
IRCA publishes the images under CC BY 4.0, credited in the Data attribution
|
||||||
|
popover. Loads the 250 views nearest Reykjavík, Akureyri, Egilsstaðir,
|
||||||
|
Ísafjörður and Selfoss; `CCTV_ICELAND_MAX_SOURCES` changes that cap and
|
||||||
|
`CCTV_ICELAND_ENABLED=0` turns the pack off (daikaginza, #1617).
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
- Add an optional Giroc / Webcam Romania CCTV source pack with corrected
|
||||||
|
coordinates, live HLS, a snapshot fallback and provider attribution. Allow
|
||||||
|
HLS segments up to 8 MiB so high-resolution cameras whose segments exceed
|
||||||
|
4 MiB can play, while retaining the 24 MiB per-session cache and existing
|
||||||
|
origin and session limits (NeoXrated23, #1619).
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
- Turning CCTV on opens the camera nearest you instead of the first camera in
|
||||||
|
the catalog, which showed a Sydney camera in London. A share link opens on
|
||||||
|
the camera nearest the shared view once its flight lands (samehkhamis, #1620).
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
- An application built with fewer layers no longer restores, saves or shares a
|
||||||
|
layer it does not have when a link or saved state from a full build names it
|
||||||
|
(samehkhamis, #1634).
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"id": "ro-giroc-webcamromania",
|
||||||
|
"name": "Giroc — Webcam Romania",
|
||||||
|
"city": "Giroc, Timiș",
|
||||||
|
"cityId": "giroc",
|
||||||
|
"provider": "Webcam Romania · webcamromania.ro",
|
||||||
|
"sourceKind": "configured",
|
||||||
|
"feedType": "hls",
|
||||||
|
"url": "https://w4.webcamromania.ro/giroc/index.m3u8",
|
||||||
|
"snapshotUrl": "https://webcamromania.ro/media/snapshots/01a0267e-d893-7203-a7eb-7ce3c8c99703/latest.jpg",
|
||||||
|
"lat": 45.70028947266781,
|
||||||
|
"lon": 21.233675914004227,
|
||||||
|
"headingDeg": 0,
|
||||||
|
"headingConfidence": "low",
|
||||||
|
"pitchDeg": -17,
|
||||||
|
"fovDeg": 74,
|
||||||
|
"rangeM": 700,
|
||||||
|
"mountHeightM": 24,
|
||||||
|
"groundElevationM": 87,
|
||||||
|
"license": "Public camera: https://webcamromania.ro/webcam-orase/webcam-giroc/ . Provider terms: https://webcamromania.ro/termeni-si-conditii/ . Video rights remain with the camera operator. Coordinates corrected by the contributor; direction, height, elevation and field of view are uncalibrated estimates."
|
||||||
|
}
|
||||||
|
]
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,155 @@
|
|||||||
|
# CCTV integration workflow
|
||||||
|
|
||||||
|
Use this workflow when adding a camera provider or repairing an existing feed.
|
||||||
|
The CCTV catalog comes through the local server; media normally does too. Keep
|
||||||
|
provider-specific URL policy on the server, including any validated browser-only
|
||||||
|
media URL permitted by the exception below.
|
||||||
|
|
||||||
|
## 1. Check the source before coding
|
||||||
|
|
||||||
|
- Identify the catalog endpoint and the actual frame or live-media endpoint.
|
||||||
|
They may be different hosts or use different formats.
|
||||||
|
- Read the provider's license, terms, attribution, rate limits, and access
|
||||||
|
requirements. Publicly reachable data is not automatically licensed for
|
||||||
|
reuse. Record whether the app may display it and whether any use is
|
||||||
|
restricted.
|
||||||
|
- Prefer a public, keyless feed. If credentials are required, keep them in a
|
||||||
|
server-only environment variable; never put a secret in browser code or a
|
||||||
|
Vite-exposed variable. A pack that needs a key is opt-in by that key: with
|
||||||
|
the variable unset it makes no request and logs once (Ontario 511 and
|
||||||
|
Ottawa). Keep the key out of catalog URLs and add it only at fetch time. Use
|
||||||
|
the provider's documented API, not a website endpoint that skips its key. If
|
||||||
|
access terms require an agreement or remain unconfirmed, make the pack
|
||||||
|
opt-in and ensure it makes no request by default.
|
||||||
|
- Confirm the feed can be fetched from the app's Node server environment. A URL
|
||||||
|
opening in a browser does not prove the server can reach it, and browser CORS
|
||||||
|
behavior does not diagnose a server-side fetch.
|
||||||
|
- Treat camera directories and aggregators such as [TW Live](https://tw.live/)
|
||||||
|
as discovery aids. Trace each listing to the original agency or camera owner;
|
||||||
|
their data and media terms govern reuse. For example, SkylineWebcams says
|
||||||
|
only camera hosts may embed its live feed and its terms restrict copying or
|
||||||
|
retransmitting footage, so do not proxy its stream without written
|
||||||
|
authorization ([FAQ](https://www.skylinewebcams.com/support/faq.html),
|
||||||
|
[terms](https://www.skylinewebcams.com/en/terms-of-use.html)).
|
||||||
|
- Decide whether the provider supplies still snapshots or continuous video.
|
||||||
|
Prefer stills unless live video is necessary and supported by the existing
|
||||||
|
proxy path.
|
||||||
|
|
||||||
|
## 2. Add and register the provider pack
|
||||||
|
|
||||||
|
Use the smallest existing provider as a template. Current owners are:
|
||||||
|
|
||||||
|
- `server/providers/cctv/sources.js` for standard open-data loaders.
|
||||||
|
- `server/providers/cctv/<provider>.js` for a provider with its own parser,
|
||||||
|
fallback, or more involved URL policy.
|
||||||
|
- `server/providers/cctv/catalog.js` to import the loader and add it to
|
||||||
|
`LIVE_PACKS`. Each pack is independently gated and the shared catalog cap
|
||||||
|
allocates space across packs.
|
||||||
|
- `server/providers/cctv/constants.js` for provider endpoints, caps, and
|
||||||
|
timeouts.
|
||||||
|
|
||||||
|
Return normalized camera records with stable unique IDs, readable names,
|
||||||
|
`city`/`cityId`, provider attribution, valid `lat`/`lon`, and the correct
|
||||||
|
`feedType`. Include camera heading only when the source actually provides a
|
||||||
|
bearing; descriptive direction text is not a numeric heading. Mark uncertain
|
||||||
|
heading data with the existing low-confidence conventions. Set `sourceKind` so
|
||||||
|
health and source diagnostics identify the provider. Apply a bounded per-pack
|
||||||
|
camera limit and geographic filtering where appropriate; avoid one provider
|
||||||
|
silently consuming the whole shared catalog cap.
|
||||||
|
|
||||||
|
Camera coordinates need their own verification. Prefer the original provider's
|
||||||
|
camera coordinates, then corroborate them against its location description,
|
||||||
|
route/mile marker, or official map. An aggregator's map dot, a town/county name,
|
||||||
|
or a geocoded attraction name is not a precise camera position. Do not pin a
|
||||||
|
camera to a city center or nearby landmark; if its actual location cannot be
|
||||||
|
verified, leave it out until it can. For manually curated coordinates, record
|
||||||
|
the evidence in the provider data or an adjacent comment. For example, TW Live
|
||||||
|
camera pages identify the originating agency; use that agency's catalog for
|
||||||
|
the camera point when available.
|
||||||
|
|
||||||
|
If the source becomes opt-in, use the catalog's opt-in gate (`envOptIn`) and
|
||||||
|
document the flag and reason in `DATA_SOURCES.md`. Otherwise use the normal
|
||||||
|
enabled-by-default flag pattern and document how to disable the pack.
|
||||||
|
|
||||||
|
## 3. Keep frame and media requests server-registered
|
||||||
|
|
||||||
|
The browser should request the local `/api/cctv/frame/:id` or
|
||||||
|
`/api/cctv/media/:id` endpoint. Do not pass an arbitrary upstream URL from the
|
||||||
|
browser, and do not fetch an unvalidated URL supplied by a catalog record.
|
||||||
|
Every provider must have a server-side rule that pins frame and media URLs to
|
||||||
|
the expected scheme, host, and path; use HTTPS where the provider supports it.
|
||||||
|
Use `pinnedCameraUrl()` for URLs that belong under a fixed provider directory,
|
||||||
|
or a stricter provider-specific validator when hosts or paths vary. Register
|
||||||
|
any new permitted image/media origin in the existing
|
||||||
|
`server/providers/cctv` media policy.
|
||||||
|
|
||||||
|
Catalog and media loaders must also:
|
||||||
|
|
||||||
|
- refuse unsafe schemes, credentials, unexpected ports, redirects outside the
|
||||||
|
registered origin/path, and malformed identifiers;
|
||||||
|
- set request deadlines and cap catalog and buffered frame bodies;
|
||||||
|
- parse only the expected format and validate coordinates before returning a
|
||||||
|
camera;
|
||||||
|
- handle offline cameras and partial provider failures without failing the
|
||||||
|
entire merged catalog; and
|
||||||
|
- avoid persistent frame storage unless the provider's terms explicitly allow
|
||||||
|
it and the design has been reviewed.
|
||||||
|
|
||||||
|
For live media, prefer the existing proxy and supported feed type (`mjpeg`,
|
||||||
|
`mp4`, `webm`, or `hls`). A direct browser-only video is a narrow fallback for
|
||||||
|
a source whose terms allow embedding when the browser can play it but the app
|
||||||
|
server cannot fetch it. Unconfirmed embedding terms make it opt-in like any
|
||||||
|
other pack, and the browser loads it only after an explicit play action, never
|
||||||
|
on selection, because the provider sees the viewer's IP address. Build its URL
|
||||||
|
from a validated provider ID on the server; never accept a browser-supplied
|
||||||
|
media URL. Render it in a native DOM
|
||||||
|
`<video>` without `crossOrigin`, and do not read its pixels into canvas, WebGL,
|
||||||
|
or a Cesium texture. If a map preview is needed, a second video request may be
|
||||||
|
paused as a DOM overlay at the camera location; label it as an approximate
|
||||||
|
still and scale it with map distance. If terms disallow embedding, use a source
|
||||||
|
link instead. Read [SECURITY.md](../SECURITY.md) before changing URL
|
||||||
|
validation, redirects, or proxy behavior.
|
||||||
|
|
||||||
|
When an image provider sets a minimum refresh interval, enforce it at the
|
||||||
|
server frame boundary as well as in the client. A bounded in-memory cache and
|
||||||
|
single-flight request per camera prevent projection, panel, and re-selection
|
||||||
|
paths from multiplying upstream requests; do not persist frames unless the
|
||||||
|
provider's terms explicitly allow it.
|
||||||
|
|
||||||
|
## 4. Add focused regression coverage
|
||||||
|
|
||||||
|
Add provider tests under `src/data/` following the existing CCTV test naming
|
||||||
|
and fixtures. Cover at least:
|
||||||
|
|
||||||
|
- representative valid catalog rows and their normalized output;
|
||||||
|
- missing or invalid IDs, coordinates, and frame URLs;
|
||||||
|
- duplicate records and the pack's cap/filter behavior;
|
||||||
|
- unsafe host/path, credentials, and redirect cases;
|
||||||
|
- timeout, oversized, malformed, and unavailable upstream responses; and
|
||||||
|
- the frame or live-media content type the provider actually serves.
|
||||||
|
|
||||||
|
Use `src/data/cctvProxy.test.mjs` for shared proxy/media behavior and
|
||||||
|
`src/data/cctvCatalogCap.test.mjs` for shared catalog allocation. For a
|
||||||
|
browser-only source, verify native playback, denied canvas pixel access, the
|
||||||
|
paused second-player overlay, and its cleanup separately from proxy tests. Run
|
||||||
|
the focused provider and proxy tests, then the standard checks from
|
||||||
|
[CONTRIBUTING.md](../CONTRIBUTING.md) that apply to the change. For runtime
|
||||||
|
verification, inspect `/api/cctv/sources`, `/api/cctv/health`, and the camera's
|
||||||
|
`/api/cctv/frame/:id` or `/api/cctv/stream/:id` response locally. Confirm a
|
||||||
|
successful frame is from the upstream camera by checking its content type and
|
||||||
|
`X-CCTV-Source`; a fallback image is not proof that the upstream feed works.
|
||||||
|
|
||||||
|
## 5. Update source documentation and submit
|
||||||
|
|
||||||
|
- Add the provider, endpoint, terms/license, required attribution, key status,
|
||||||
|
caching behavior, and any restrictions to `DATA_SOURCES.md`.
|
||||||
|
- Update the CCTV source section in `docs/CURRENT-STATE.md` when runtime
|
||||||
|
behavior, flags, caps, or fallback behavior changes.
|
||||||
|
- Register in-app attribution through the existing source/provider credit
|
||||||
|
fields; update `src/data/dataCredits.js` when the source needs a layer-level
|
||||||
|
credit.
|
||||||
|
- Add the required `changelog.d/<pr-number>-<slug>.md` entry for a runtime
|
||||||
|
change, and include the source, license, attribution, key/runtime-fetch
|
||||||
|
details, and verification evidence in the PR description.
|
||||||
|
- For a new layer, also follow the camera/source requirements in the
|
||||||
|
[new-layer PR checklist](../CONTRIBUTING.md#adding-a-new-layer).
|
||||||
+124
-26
@@ -1641,6 +1641,32 @@ default renderer's entity clustering grouped them (`geo/screenCluster.js`,
|
|||||||
changes. A caller handing the layer a Cesium viewer, with no
|
changes. A caller handing the layer a Cesium viewer, with no
|
||||||
renderer bound, loads the `./render/cesium/unbound` export once first.
|
renderer bound, loads the `./render/cesium/unbound` export once first.
|
||||||
|
|
||||||
|
## Giroc / Webcam Romania CCTV source pack
|
||||||
|
|
||||||
|
`config/cctv_sources.romania.json` is an optional single-camera pack for Giroc,
|
||||||
|
Timiș, Romania. To use it, set `CCTV_SOURCES_FILE=config/cctv_sources.romania.json`
|
||||||
|
in the local `.env` and restart the server. Set `CCTV_FORCE_AUSTIN=1` as well to
|
||||||
|
retain the built-in live packs; despite its historical name, this flag applies
|
||||||
|
to all live packs. The default catalog is unchanged.
|
||||||
|
|
||||||
|
The camera uses Webcam Romania's public HLS stream and JPEG snapshot, fetched
|
||||||
|
at runtime without an API key. Its position, 45.70028947266781, 21.233675914004227,
|
||||||
|
was corrected by the contributor rather than copied from the directory's
|
||||||
|
inaccurate pin. Heading, pitch, field of view, mounting height and ground
|
||||||
|
elevation are uncalibrated priors; the camera retains the RAW PRIOR badge.
|
||||||
|
See `DATA_SOURCES.md` for attribution and provider terms. Webcam Romania's
|
||||||
|
terms grant no reuse licence for the video and name no camera operator; the
|
||||||
|
provider's sanctioned route is its iframe embed. Keep this pack to local use
|
||||||
|
and off hosted deployments unless the operator grants permission.
|
||||||
|
|
||||||
|
The existing HLS puller resolves same-origin relative master/media references
|
||||||
|
and serves local leased playlists and segments. It downloads complete segments
|
||||||
|
without forwarding a browser Range header. Its per-segment streamed-byte cap
|
||||||
|
is 8 MiB: Giroc's roughly ten-second 2702×1520 segments can exceed the former
|
||||||
|
4 MiB cap (one measured 6,437,120 bytes). Retained data remains capped at
|
||||||
|
24 MiB and 12 segments per session, with two sessions maximum. Redirect
|
||||||
|
refusal, origin pinning, timeouts and lease expiry are unchanged.
|
||||||
|
|
||||||
## NYC DOT TMC CCTV source pack
|
## NYC DOT TMC CCTV source pack
|
||||||
|
|
||||||
The CCTV catalog can add New York City traffic cameras from the NYC DOT
|
The CCTV catalog can add New York City traffic cameras from the NYC DOT
|
||||||
@@ -1656,9 +1682,11 @@ from the payload. There is no heading in the feed, so gizmos use the shared
|
|||||||
id-hash fallback at low confidence.
|
id-hash fallback at low confidence.
|
||||||
|
|
||||||
Once enabled, the 250 cameras nearest the five borough cores load.
|
Once enabled, the 250 cameras nearest the five borough cores load.
|
||||||
`CCTV_NYC_MAX_SOURCES` sets the pack cap (8–400). The catalog-wide ceiling stays at 4,000 and is shared
|
`CCTV_NYC_MAX_SOURCES` sets the pack cap (8–400). The default catalog limit is
|
||||||
round-robin: no region is dropped outright, but when the packs together exceed
|
7,350: 4,000 shared round-robin slots, plus room above them for the 1,120
|
||||||
the ceiling, adding a pack trims cameras from the largest packs.
|
Québec locations and 2,230 World image sources. Lower explicit
|
||||||
|
`CCTV_MAX_SOURCES` values are honored; reservations only use the capacity
|
||||||
|
above the 4,000 shared slots.
|
||||||
|
|
||||||
## City of Toronto RESCU CCTV source pack
|
## City of Toronto RESCU CCTV source pack
|
||||||
|
|
||||||
@@ -1674,8 +1702,9 @@ cameras return a 200 "Image Unavailable" placeholder frame instead of an error.
|
|||||||
|
|
||||||
By default all ~336 cameras load, nearest downtown first.
|
By default all ~336 cameras load, nearest downtown first.
|
||||||
`CCTV_TORONTO_MAX_SOURCES` sets the pack cap (8–500) and
|
`CCTV_TORONTO_MAX_SOURCES` sets the pack cap (8–500) and
|
||||||
`CCTV_TORONTO_ENABLED=0` turns the pack off. The pack shares the 4,000
|
`CCTV_TORONTO_ENABLED=0` turns the pack off. The pack shares the default
|
||||||
catalog-wide ceiling round-robin with the other packs.
|
7,350-source catalog limit with the other packs; Québec and the World image
|
||||||
|
pack have reserved slots and the remaining sources use round-robin allocation.
|
||||||
|
|
||||||
## Lithuania CCTV source pack
|
## Lithuania CCTV source pack
|
||||||
|
|
||||||
@@ -1695,24 +1724,8 @@ video; camera poses use the existing low-confidence heading prior.
|
|||||||
|
|
||||||
## Taiwan CCTV source pack
|
## Taiwan CCTV source pack
|
||||||
|
|
||||||
The CCTV catalog includes Taiwan national freeway cameras from the Freeway
|
The CCTV catalog includes Taiwan national freeway cameras from the Freeway Bureau, MOTC. The app first reads the daily MOTC 2.0 CCTV.xml table with a keyless HTTPS request, a 15-second deadline, a 6 MiB response cap, and the shared 15-minute cache. If that catalog is unreachable and no last-good source list exists, the loader uses the Highway Bureau’s public provincial-road CCTV XML feed at https://cctv-maintain.thb.gov.tw/opendataCCTVs.xml. The fallback is capped by the same Taiwan source limit and hourly retry backoff; its MJPEG feeds are restricted to the eight cctv-ss01 through cctv-ss08.thb.gov.tw HTTPS servers. The frame proxy returns one bounded JPEG from each stream, not an unbounded video response. The Highway Bureau open-data page states XML downloads are free and asks users to attribute the source; the app credits Highway Bureau, MOTC. These are provincial-road cameras, not a replacement for the national freeway cameras. CCTV_TAIWAN_ENABLED=0 disables both feeds; CCTV_TAIWAN_MAX_SOURCES sets the shared cap (default 600, bounded to 1–2000), and CCTV_TAIWAN_URL overrides the Freeway Bureau table URL.
|
||||||
Bureau, MOTC. One keyless request reads the daily MOTC 2.0 `CCTV.xml` table
|
Gate: src/data/cctvTaiwan.test.mjs and src/data/cctvProxy.test.mjs.
|
||||||
(~1,800 cameras); the request refuses redirects, has a 15-second deadline and a
|
|
||||||
6 MiB response cap, and uses the shared 15-minute cache and fair catalog
|
|
||||||
allocation. A failed download serves the last good table (up to a day old),
|
|
||||||
or an empty pack, and is not retried for an hour: the catalog host does not
|
|
||||||
answer from some networks outside Taiwan, and without the backoff every refresh
|
|
||||||
there would wait out the connect timeout. The table
|
|
||||||
publishes MJPEG stream URLs; each is mapped to the same camera server's
|
|
||||||
single-JPEG path for the same camera number, and only those exact HTTPS pairs
|
|
||||||
on the four `freeway.gov.tw` camera servers are registered with the frame
|
|
||||||
proxy. Camera keys come from the server and camera number, because published
|
|
||||||
CCTV IDs contain Chinese place names and a few repeat across cameras. Poses use
|
|
||||||
the low-confidence heading prior. `CCTV_TAIWAN_ENABLED=0` disables the pack;
|
|
||||||
`CCTV_TAIWAN_MAX_SOURCES` sets its cap (default 600, bounded to 1–2000), and
|
|
||||||
`CCTV_TAIWAN_URL` overrides the table URL.
|
|
||||||
Gate: `src/data/cctvTaiwan.test.mjs`.
|
|
||||||
|
|
||||||
## DriveBC CCTV source pack
|
## DriveBC CCTV source pack
|
||||||
|
|
||||||
The CCTV catalog adds DriveBC highway cameras for British Columbia alongside the
|
The CCTV catalog adds DriveBC highway cameras for British Columbia alongside the
|
||||||
@@ -4467,7 +4480,7 @@ its criteria cannot be silently ignored.
|
|||||||
| Satellites | CelesTrak | `src/data/satellites.js` | `/api/celestrak` | 120s |
|
| Satellites | CelesTrak | `src/data/satellites.js` | `/api/celestrak` | 120s |
|
||||||
| Space Missions (30d) | Launch Library 2 + CelesTrak | `src/data/rocketLaunches.js` | `/api/launches` + `/api/celestrak/active` | 5 min |
|
| Space Missions (30d) | Launch Library 2 + CelesTrak | `src/data/rocketLaunches.js` | `/api/launches` + `/api/celestrak/active` | 5 min |
|
||||||
| Traffic | Selectable TomTom / OpenStreetMap / Hybrid roads; optional TomTom flow (BYOK) | `src/data/traffic.js` | browser-direct OpenFreeMap tiles; `/api/tomtom` for flow | viewport-driven; capped tile cache |
|
| Traffic | Selectable TomTom / OpenStreetMap / Hybrid roads; optional TomTom flow (BYOK) | `src/data/traffic.js` | browser-direct OpenFreeMap tiles; `/api/tomtom` for flow | viewport-driven; capped tile cache |
|
||||||
| CCTV | Austin + Caltrans (CA) + TfL London + Ontario 511 + Fintraffic (FI) + DriveBC (BC) + TxDOT (TX) + Estonia (Tallinn, Tarktee) + Live Traffic NSW + Open Calgary Open Data + Statens vegvesen (NO, stills + live HLS, Kartverket ground heights) + King County (WA) Open Data + WSDOT (WA) Open Data + NYC DOT TMC (opt-in) + City of Toronto RESCU + Catalonia (Servei Català de Trànsit) + Hong Kong Transport Department + FL511 (FL, opt-in) + Freeway Bureau, MOTC (Taiwan) + Houston TranStar (opt-in) + Autostrada del Brennero (IT, A22 stills) + Street View fallback | `src/data/cctv.js` | `/api/cctv` | 10s (active) |
|
| CCTV | Austin + Caltrans (CA) + TfL London + Ontario 511 + Fintraffic (FI) + DriveBC (BC) + TxDOT (TX) + Estonia (Tallinn, Tarktee) + Live Traffic NSW + Open Calgary Open Data + Statens vegvesen (NO, stills + live HLS, Kartverket ground heights) + King County (WA) Open Data + WSDOT (WA) Open Data + NYC DOT TMC (opt-in) + City of Toronto RESCU + Catalonia (Servei Català de Trànsit) + Iceland (Vegagerðin / IRCA) + Hong Kong Transport Department + FL511 (FL, opt-in) + Freeway Bureau, MOTC (Taiwan) + Houston TranStar (opt-in) + Autostrada del Brennero (IT, A22 stills) + Street View fallback | `src/data/cctv.js` | `/api/cctv` | 10s (active) |
|
||||||
| Radio | Radio Browser (public-domain station directory) | `src/data/radio.js` | `/api/radio/stations`, `/api/radio/click/:uuid` | 45 min directory refresh |
|
| Radio | Radio Browser (public-domain station directory) | `src/data/radio.js` | `/api/radio/stations`, `/api/radio/click/:uuid` | 45 min directory refresh |
|
||||||
| Transit 🚌 | Operator GTFS-Realtime VehiclePositions (7 keyless regions, `src/data/transitFeeds.js`) | `src/layers/transit/` via `src/app/layers/transit.js` | `/api/transit` | 15s (poll + delayed playback) |
|
| Transit 🚌 | Operator GTFS-Realtime VehiclePositions (7 keyless regions, `src/data/transitFeeds.js`) | `src/layers/transit/` via `src/app/layers/transit.js` | `/api/transit` | 15s (poll + delayed playback) |
|
||||||
| Bikeshare 🚲 | GBFS (Lyft + BCycle + Social Bicycles + PBSC incl. Bike Share Toronto, Bike Itaú (Brazil), Bicing (Barcelona) and seven other Spanish cities + Urban Sharing, Entur, JCDecaux (Lillestrøm, Valencia, Seville) + nextbike (AMBici)) | `src/data/bikeshare.js` | `/api/gbfs` | 60s |
|
| Bikeshare 🚲 | GBFS (Lyft + BCycle + Social Bicycles + PBSC incl. Bike Share Toronto, Bike Itaú (Brazil), Bicing (Barcelona) and seven other Spanish cities + Urban Sharing, Entur, JCDecaux (Lillestrøm, Valencia, Seville) + nextbike (AMBici)) | `src/data/bikeshare.js` | `/api/gbfs` | 60s |
|
||||||
@@ -5548,8 +5561,10 @@ silently demoting every later lookup for the session.
|
|||||||
kill switch `CCTV_FINTRAFFIC_ENABLED=0`) are the fourth pack: one keyless GeoJSON station list
|
kill switch `CCTV_FINTRAFFIC_ENABLED=0`) are the fourth pack: one keyless GeoJSON station list
|
||||||
covering the whole country, where one _preset_ (a station's fixed view) is one camera — 806
|
covering the whole country, where one _preset_ (a station's fixed view) is one camera — 806
|
||||||
GATHERING stations carry 2,256 in-collection presets, prioritized to 300 against seven anchors
|
GATHERING stations carry 2,256 in-collection presets, prioritized to 300 against seven anchors
|
||||||
on the main road spine. `CCTV_MAX_SOURCES` is a 4,000 catalog-wide ceiling shared round-robin
|
on the main road spine. `CCTV_MAX_SOURCES` defaults to 7,350: 4,000 shared
|
||||||
across packs, so a lower global cap thins every region instead of starving the last pack.
|
round-robin slots plus 3,350 reserved Québec and World image slots.
|
||||||
|
Reservations only use capacity above the 4,000 shared slots, so at 4,000 or
|
||||||
|
less every pack, Québec and World included, shares the cap round-robin.
|
||||||
~1,100 cameras total, all RAW PRIOR poses, stills-first. The catalog lives for 15 minutes; once
|
~1,100 cameras total, all RAW PRIOR poses, stills-first. The catalog lives for 15 minutes; once
|
||||||
it expires, `/api/cctv` keeps answering from it while one background refresh reloads every
|
it expires, `/api/cctv` keeps answering from it while one background refresh reloads every
|
||||||
pack, so only the very first load waits for the slowest pack (a live first load took about
|
pack, so only the very first load waits for the slowest pack (a live first load took about
|
||||||
@@ -5738,6 +5753,13 @@ and unreachable upstream (502/504) separately from road geometry.
|
|||||||
explicit-empty form); unknown option tokens are ignored. Restoration
|
explicit-empty form); unknown option tokens are ignored. Restoration
|
||||||
settles independently per layer so one failed or unavailable source cannot
|
settles independently per layer so one failed or unavailable source cannot
|
||||||
block its siblings.
|
block its siblings.
|
||||||
|
- An application that registers fewer layers (an embedder with a smaller
|
||||||
|
catalog) keeps only its own: `LayerStateCoordinator` drops enabled-layer ids
|
||||||
|
the application did not register before it normalizes a share, saved state or
|
||||||
|
explicit change, so such a layer is never restored, written to local storage
|
||||||
|
or carried into a link this application shares. Options that depend on a
|
||||||
|
dropped layer (a tracked selection) go with it. An application with every
|
||||||
|
layer registered is unchanged.
|
||||||
- Layer tokens are permanent public compatibility identifiers. The reservation
|
- Layer tokens are permanent public compatibility identifiers. The reservation
|
||||||
JSON ledger at `src/data/layerStateTokenReservations.json` pins all existing
|
JSON ledger at `src/data/layerStateTokenReservations.json` pins all existing
|
||||||
one-character assignments (all letters plus `0`, `1` and
|
one-character assignments (all letters plus `0`, `1` and
|
||||||
@@ -7260,3 +7282,79 @@ the container healthy. Checks time out after 10 seconds, with a 30-second
|
|||||||
startup grace period and three consecutive failures before reporting unhealthy.
|
startup grace period and three consecutive failures before reporting unhealthy.
|
||||||
This reports app HTTP availability, not individual provider health, and does not
|
This reports app HTTP availability, not individual provider health, and does not
|
||||||
configure automatic restarts.
|
configure automatic restarts.
|
||||||
|
|
||||||
|
## Québec CCTV integration
|
||||||
|
|
||||||
|
The regular CCTV source loader reads `public/quebec-cameras.json` by default
|
||||||
|
when `CCTV_QUEBEC_ENABLED` is not `0`. The pack contains 1,120 records: 680
|
||||||
|
MTQ highway cameras, 426 Montréal OSM camera locations, and 14 scenic webcams.
|
||||||
|
The default catalog limit is 7,350: it reserves all 1,120 Québec locations and
|
||||||
|
2,230 World image feeds, and keeps 4,000 slots for the existing round-robin
|
||||||
|
camera packs. Reservations only use capacity above those 4,000 slots: a lower
|
||||||
|
explicit `CCTV_MAX_SOURCES` thins every pack round-robin, Québec and World
|
||||||
|
included, instead of taking the shared slots.
|
||||||
|
|
||||||
|
The Québec 511 video is opt-in (`CCTV_QUEBEC_VIDEO_ENABLED=1`) because Québec
|
||||||
|
511's terms for embedding its clips on another site are unconfirmed; the camera
|
||||||
|
locations themselves are CC BY 4.0. With the flag unset, MTQ cameras show
|
||||||
|
their location, credit and a link to the Québec 511 viewer page. With it set,
|
||||||
|
selecting an MTQ camera opens a floating panel with a Play button and a notice
|
||||||
|
that Québec 511 sees the viewer's IP address; the browser contacts Québec 511
|
||||||
|
only after Play, never on selection alone (layer enable, auto-hop, a scene or
|
||||||
|
voice), and a different camera starts unplayed. After Play, the panel plays
|
||||||
|
the official MP4 in a native browser player and requests a second video for the
|
||||||
|
paused map preview. The official feed is a five-second clip refreshed by
|
||||||
|
Québec 511 every 2–4 minutes, not continuous live video; the browser player
|
||||||
|
reloads every two minutes while the tab is visible. The
|
||||||
|
map preview is a DOM overlay attached to the camera's coordinates and scales
|
||||||
|
down with camera distance. Neither video is read into a canvas or Cesium texture:
|
||||||
|
Québec 511 does not grant localhost pixel access, and its MP4 is not available
|
||||||
|
to the app's server proxy. Montréal and scenic entries are regular CCTV camera
|
||||||
|
locations with per-camera source-page links, but no direct frame URLs; those
|
||||||
|
show a location label and open the official/operator page. MTQ positions carry
|
||||||
|
CC BY 4.0 attribution, Montréal positions are attributed to OpenStreetMap
|
||||||
|
contributors under ODbL, and scenic rows retain their position accuracy and
|
||||||
|
provenance. Québec cameras load through the normal CCTV layer.
|
||||||
|
|
||||||
|
## City of Ottawa CCTV source pack
|
||||||
|
|
||||||
|
The CCTV catalog can add City of Ottawa traffic cameras, including the MTO
|
||||||
|
cameras the city carries. Camera images come from the city's Traffic Camera
|
||||||
|
Images API (`traffic.ottawa.ca/opendata/camera`), which needs a certificate
|
||||||
|
from the city's registration form and lets one certificate and user id fetch a
|
||||||
|
camera at most once a minute. Without `OTTAWA_CAMERA_CERTIFICATE` the pack is
|
||||||
|
skipped with no request and one log line. The camera list is the documented
|
||||||
|
keyless `traffic.ottawa.ca/map/service/camera` JSON. Catalog URLs carry no
|
||||||
|
key: the frame proxy adds the certificate and the fixed user id `gev` at fetch
|
||||||
|
time, only for a numeric camera number inside the pinned `/opendata/` path,
|
||||||
|
and serves each camera from one shared server-side frame per minute. Inside
|
||||||
|
that minute a camera with no cached frame gets the placeholder, never the
|
||||||
|
Street View fallback. The feed publishes no bearing, so headings use the
|
||||||
|
id-hash fallback at low confidence. `CCTV_OTTAWA_MAX_SOURCES` caps the pack
|
||||||
|
(default 250, nearest downtown) and `CCTV_OTTAWA_ENABLED=0` turns it off.
|
||||||
|
|
||||||
|
## World camera image feeds
|
||||||
|
|
||||||
|
The default `world-cameras` pack reads only the checked-in, curated
|
||||||
|
`config/cctv_sources.world-image-cameras.json` file. It adds 1,176 Oregon
|
||||||
|
TripCheck and 1,054 MLIT river cameras. Duplicate feeds are excluded because
|
||||||
|
DriveBC, Ottawa, Québec and Iceland (Vegagerðin) already have app packs. NZTA's
|
||||||
|
249 rows are excluded because they were collected from a Journey Planner web
|
||||||
|
cache whose current terms prohibit automated scraping; an authorized API feed
|
||||||
|
or permission is required before adding them. The wider discovery export is
|
||||||
|
not shipped with the app.
|
||||||
|
|
||||||
|
The app validates and pins each still-image URL to its provider directory
|
||||||
|
before the server proxy uses it. Oregon frames refresh no faster
|
||||||
|
than every five minutes; MLIT river frames refresh every ten minutes to reduce
|
||||||
|
requests. Images are not persisted; the proxy reuses frames in a bounded 32 MB
|
||||||
|
in-memory cache until their provider cadence. Set
|
||||||
|
`CCTV_WORLD_CAMERAS_ENABLED=0` to disable the pack.
|
||||||
|
|
||||||
|
Only the curated image-backed rows are bundled. Camera images are fetched from
|
||||||
|
their registered providers at request time and are not included in this data
|
||||||
|
file. The additive `/api/cctv/sources` metadata includes provider source links,
|
||||||
|
browser-only media links, refresh cadence, and location provenance where
|
||||||
|
available. When MLIT serves its recognized adjustment image, `/api/cctv/frame`
|
||||||
|
returns a God’s Eye maintenance card and `/api/cctv/health` reports the camera
|
||||||
|
as degraded with the provider-adjustment reason.
|
||||||
@@ -119,6 +119,7 @@ probability of about 255 in 256 (many of them already fail as base64url).
|
|||||||
| 25 | `scopeFeatherPct` | uint | 100 | 0–200 |
|
| 25 | `scopeFeatherPct` | uint | 100 | 0–200 |
|
||||||
| 26 | `scopeTerminusPct` | uint | none | 94–100; absent is the adaptive terminus |
|
| 26 | `scopeTerminusPct` | uint | none | 94–100; absent is the adaptive terminus |
|
||||||
| 27 | `styleParams` | LEN | style | packed `(token, value × 100)` pairs |
|
| 27 | `styleParams` | LEN | style | packed `(token, value × 100)` pairs |
|
||||||
|
| 28 | `worldTime` | epoch | none (live) | zigzag seconds since 2026-01-01T00:00:00Z |
|
||||||
|
|
||||||
Field 1 absent means `thing` when field 13 is present and `place` otherwise,
|
Field 1 absent means `thing` when field 13 is present and `place` otherwise,
|
||||||
so v1 never writes it; a later view kind writes its code.
|
so v1 never writes it; a later view kind writes its code.
|
||||||
@@ -132,6 +133,10 @@ style also extends the pinned style-defaults table.
|
|||||||
`hudVariant` code 1 (`operator`) is retired: the app no longer offers that
|
`hudVariant` code 1 (`operator`) is retired: the app no longer offers that
|
||||||
layout and restores it as `tactical`. The code stays reserved.
|
layout and restores it as `tactical`. The code stays reserved.
|
||||||
|
|
||||||
|
Field 28 is the world time the link was made at, written only when it was away
|
||||||
|
from live. A link without it opens live. Unlike field 8 it may lie ahead of the
|
||||||
|
link's creation (a forecast moment), and it opens paused at that time.
|
||||||
|
|
||||||
Flag bits (field 9): 0 `bloom`, 1 `sharpen`, 2 `hudVisible`, 3
|
Flag bits (field 9): 0 `bloom`, 1 `sharpen`, 2 `hudVisible`, 3
|
||||||
`celestialRing` (each defaulting by style), 4 `scopeEnabled` (default on).
|
`celestialRing` (each defaulting by style), 4 `scopeEnabled` (default on).
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@
|
|||||||
with the sources: src/materialSymbolsSubset.test.mjs fails when a source
|
with the sources: src/materialSymbolsSubset.test.mjs fails when a source
|
||||||
names a glyph this list is missing, because a missing glyph does not draw
|
names a glyph this list is missing, because a missing glyph does not draw
|
||||||
a box — the ligature never forms and the element renders the literal word. -->
|
a box — the ligature never forms and the element renders the literal word. -->
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20,400,0,0&icon_names=adjust,arrow_drop_down,arrow_forward,arrow_left,arrow_right,bolt,bug_report,category,chevron_left,chevron_right,close,close_fullscreen,dark_mode,draw,east,eco,egg_alt,flare,flight,handyman,layers,layers_clear,light_mode,local_fire_department,location_on,more_horiz,movie,my_location,navigation,normal,on,open_in_full,partly_cloudy_day,pentagon,pest_control,pets,public,question_mark,radar,radio,raven,right_panel_close,right_panel_open,rocket_launch,satellite_alt,search,set_meal,settings,skip_next,skip_previous,streetview,timeline,tune,umbrella,upload_file,videocam,view_in_ar,visibility,visibility_off,water_drop" rel="stylesheet" />
|
<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20,400,0,0&icon_names=adjust,arrow_drop_down,arrow_forward,arrow_left,arrow_right,bolt,bug_report,category,chevron_left,chevron_right,close,close_fullscreen,dark_mode,draw,east,eco,egg_alt,flare,flight,handyman,layers,layers_clear,light_mode,local_fire_department,location_on,more_horiz,movie,my_location,navigation,normal,on,open_in_full,partly_cloudy_day,pause,pentagon,pest_control,pets,play_arrow,public,question_mark,radar,radio,raven,right_panel_close,right_panel_open,rocket_launch,satellite_alt,search,set_meal,settings,skip_next,skip_previous,streetview,timeline,traffic,tune,umbrella,upload_file,videocam,view_in_ar,visibility,visibility_off,water_drop" rel="stylesheet" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="gev-view" data-gev-view="scene-chrome"></div>
|
<div class="gev-view" data-gev-view="scene-chrome"></div>
|
||||||
|
|||||||
+2
-1
@@ -305,6 +305,7 @@
|
|||||||
"./render/cesium/unbound": "./src/render/cesium/unbound.js",
|
"./render/cesium/unbound": "./src/render/cesium/unbound.js",
|
||||||
"./render/conformance": "./src/render/conformance/index.js",
|
"./render/conformance": "./src/render/conformance/index.js",
|
||||||
"./layers/wildlife-sightings": "./src/layers/wildlifeSightings/index.js",
|
"./layers/wildlife-sightings": "./src/layers/wildlifeSightings/index.js",
|
||||||
"./layers/wildlife-sightings/source": "./src/layers/wildlifeSightings/source.js"
|
"./layers/wildlife-sightings/source": "./src/layers/wildlifeSightings/source.js",
|
||||||
|
"./time": "./src/time/worldClock.js"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"source":"Revos addons/Qc cams/quebec_all_cameras.geojson","count":1120,"cameras":[{"id":"4103","kind":"traffic","name":"Route 117 à la jonction de la route 101 et à la hauteur du carrefour giratoire (Rouyn-Noranda)","nameEn":"Junction of route 117 and route 101 and at roundabout (Rouyn-Noranda)","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Abitibi-Témiscamingue","lat":48.26461,"lon":-79.01808,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=4103","notes":"Live since 2025/11/26"},{"id":"3820","kind":"traffic","name":"Aut. 20 à la hauteur de la montée Industrielle-et-Commerciale","nameEn":"Aut. 20 at montée Industrielle-et-Commerciale","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":48.43993,"lon":-68.47784,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3820","notes":"Live since 2018/12/12"},{"id":"3821","kind":"traffic","name":"Montée Industrielle-et-Commerciale à Rimouski","nameEn":"Montée Industrielle-et-Commerciale at Rimouski","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":48.44639,"lon":-68.48528,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3821","notes":"Live since 2018/12/12"},{"id":"3822","kind":"traffic","name":"Route 132 à la hauteur du Bic à la jonction de l'Aut. 20","nameEn":"Route 132 at Bic at the junction of Aut. 20","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":48.3775,"lon":-68.68694,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3822","notes":"Live since 2018/12/12"},{"id":"3834","kind":"traffic","name":"Route 132 à la hauteur de Saint-Fabien","nameEn":"Route 132 at Saint-Fabien","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":48.32927,"lon":-68.80262,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3834","notes":"Live since 2019/02/07"},{"id":"3835","kind":"traffic","name":"Route 132 à la hauteur de Cap-Chat (secteur Capucins)","nameEn":"Route 132 at Cap-Chat (Capucins sector)","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":49.04153,"lon":-66.86847,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3835","notes":"Live since 2019/02/07"},{"id":"3856","kind":"traffic","name":"Route 132 à l'est de Gros-Morne","nameEn":"Route 132, east of Gros-Morne","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":49.25302,"lon":-65.48355,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3856","notes":"Live since 2019/12/06"},{"id":"3836","kind":"traffic","name":"Route 132 à la hauteur de la baie du Petit Pabos","nameEn":"Route 132 at baie du Petit Pabos","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":48.37216,"lon":-64.58866,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3836","notes":"Live since 2019/02/07"},{"id":"3837","kind":"traffic","name":"Route 132 à la hauteur de Bonaventure","nameEn":"Route 132 at Bonaventure","category":"Highway traffic","operator":"Ministere des Transports et de la Mobilite durable (MTQ) - Quebec 511","region":"Bas-Saint-Laurent—Gaspésie—Îles-de-la-Madeleine","lat":48.03448,"lon":-65.46953,"accuracyM":0,"positionSource":"MTQ georeferenced point (WFS, EPSG:4326, 5 decimals)","viewerUrl":"https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3837","Line truncated
|
||||||
@@ -44,7 +44,7 @@ CCTV_NSW_ENABLED="${CCTV_NSW_ENABLED:-1}"
|
|||||||
CCTV_NSW_MAX_SOURCES="${CCTV_NSW_MAX_SOURCES:-250}"
|
CCTV_NSW_MAX_SOURCES="${CCTV_NSW_MAX_SOURCES:-250}"
|
||||||
CCTV_CALGARY_ENABLED="${CCTV_CALGARY_ENABLED:-1}"
|
CCTV_CALGARY_ENABLED="${CCTV_CALGARY_ENABLED:-1}"
|
||||||
CCTV_CALGARY_MAX_SOURCES="${CCTV_CALGARY_MAX_SOURCES:-220}"
|
CCTV_CALGARY_MAX_SOURCES="${CCTV_CALGARY_MAX_SOURCES:-220}"
|
||||||
CCTV_MAX_SOURCES="${CCTV_MAX_SOURCES:-4000}"
|
CCTV_MAX_SOURCES="${CCTV_MAX_SOURCES:-7350}"
|
||||||
|
|
||||||
# Capture which provider credentials genuinely came from the parent shell
|
# Capture which provider credentials genuinely came from the parent shell
|
||||||
# before this launcher resolves dotenv and Keychain fallbacks. Only names are
|
# before this launcher resolves dotenv and Keychain fallbacks. Only names are
|
||||||
|
|||||||
@@ -610,6 +610,7 @@
|
|||||||
"src/data/cctvHk.test.mjs",
|
"src/data/cctvHk.test.mjs",
|
||||||
"src/data/cctvVegvesen.test.mjs",
|
"src/data/cctvVegvesen.test.mjs",
|
||||||
"src/data/cctvA22.test.mjs",
|
"src/data/cctvA22.test.mjs",
|
||||||
|
"src/data/cctvIceland.test.mjs",
|
||||||
"src/data/cctvNyc.test.mjs",
|
"src/data/cctvNyc.test.mjs",
|
||||||
"src/data/cctvHouston.test.mjs",
|
"src/data/cctvHouston.test.mjs",
|
||||||
"src/data/cctvNswSource.test.mjs",
|
"src/data/cctvNswSource.test.mjs",
|
||||||
|
|||||||
@@ -204,6 +204,10 @@
|
|||||||
"src/ui/stores/recording.js",
|
"src/ui/stores/recording.js",
|
||||||
"src/ui/styleParameters.js",
|
"src/ui/styleParameters.js",
|
||||||
"src/ui/i18n.js",
|
"src/ui/i18n.js",
|
||||||
|
"src/time/worldClock.js",
|
||||||
|
"src/ui/kit/UiIcon.vue",
|
||||||
|
"src/ui/stores/worldTime.js",
|
||||||
|
"src/ui/views/panels/WorldTimeline.vue",
|
||||||
"src/ui/surfaceKeyboard.js"
|
"src/ui/surfaceKeyboard.js"
|
||||||
],
|
],
|
||||||
"external": ["vue", "pinia", "vue-i18n"]
|
"external": ["vue", "pinia", "vue-i18n"]
|
||||||
@@ -413,6 +417,9 @@
|
|||||||
"server/providers/cctv/catalog.js",
|
"server/providers/cctv/catalog.js",
|
||||||
"server/providers/cctv/lithuania.js",
|
"server/providers/cctv/lithuania.js",
|
||||||
"server/providers/cctv/taiwan.js",
|
"server/providers/cctv/taiwan.js",
|
||||||
|
"server/providers/cctv/quebec.js",
|
||||||
|
"server/providers/cctv/ottawa.js",
|
||||||
|
"server/providers/cctv/worldCameras.js",
|
||||||
"server/providers/cctv/constants.js",
|
"server/providers/cctv/constants.js",
|
||||||
"server/providers/cctv/media.js",
|
"server/providers/cctv/media.js",
|
||||||
"server/providers/cctv/normalize.js",
|
"server/providers/cctv/normalize.js",
|
||||||
@@ -857,6 +864,7 @@
|
|||||||
"cctv-controls": {
|
"cctv-controls": {
|
||||||
"exports": ["./ui/cctv"],
|
"exports": ["./ui/cctv"],
|
||||||
"modules": [
|
"modules": [
|
||||||
|
"src/data/iconOrientation.js",
|
||||||
"src/data/headingDegrees.js",
|
"src/data/headingDegrees.js",
|
||||||
"src/ui/cctv.js",
|
"src/ui/cctv.js",
|
||||||
"src/ui/cctvBindings.js",
|
"src/ui/cctvBindings.js",
|
||||||
@@ -865,6 +873,7 @@
|
|||||||
"src/ui/cctvFrames.js",
|
"src/ui/cctvFrames.js",
|
||||||
"src/ui/cctvVideo.js",
|
"src/ui/cctvVideo.js",
|
||||||
"src/ui/cctvPresentation.js",
|
"src/ui/cctvPresentation.js",
|
||||||
|
"src/ui/quebecCctvOverlay.js",
|
||||||
"src/i18n/index.js",
|
"src/i18n/index.js",
|
||||||
"src/i18n/locale.js",
|
"src/i18n/locale.js",
|
||||||
"src/i18n/locales/ar.json",
|
"src/i18n/locales/ar.json",
|
||||||
@@ -882,9 +891,13 @@
|
|||||||
"src/ui/vueRuntime.js",
|
"src/ui/vueRuntime.js",
|
||||||
"src/ui/stores/cctv.js",
|
"src/ui/stores/cctv.js",
|
||||||
"src/ui/stores/status.js",
|
"src/ui/stores/status.js",
|
||||||
"src/ui/i18n.js"
|
"src/ui/i18n.js",
|
||||||
|
"src/geo/vector.js",
|
||||||
|
"src/geo/ellipsoid.js",
|
||||||
|
"src/geo/horizon.js",
|
||||||
|
"src/render/rendererOf.js"
|
||||||
],
|
],
|
||||||
"external": ["vue", "pinia", "vue-i18n"]
|
"external": ["vue", "pinia", "vue-i18n", "cesium"]
|
||||||
},
|
},
|
||||||
"context-controls": {
|
"context-controls": {
|
||||||
"exports": ["./ui/context", "./ui/context/policy"],
|
"exports": ["./ui/context", "./ui/context/policy"],
|
||||||
@@ -1341,7 +1354,10 @@
|
|||||||
"src/ui/views/panels/WildlifeSightingCard.vue",
|
"src/ui/views/panels/WildlifeSightingCard.vue",
|
||||||
"src/ui/wildlifeSightingPlacement.js",
|
"src/ui/wildlifeSightingPlacement.js",
|
||||||
"src/overlays/worldOverlayChrome.js",
|
"src/overlays/worldOverlayChrome.js",
|
||||||
"src/layers/wildlifeSightings/photoText.js"
|
"src/layers/wildlifeSightings/photoText.js",
|
||||||
|
"src/data/iconOrientation.js",
|
||||||
|
"src/ui/quebecCctvOverlay.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium", "vue", "pinia", "vue-i18n"]
|
"external": ["cesium", "vue", "pinia", "vue-i18n"]
|
||||||
},
|
},
|
||||||
@@ -1359,6 +1375,7 @@
|
|||||||
"src/ui/styles/layers.css",
|
"src/ui/styles/layers.css",
|
||||||
"src/ui/styles/radio.css",
|
"src/ui/styles/radio.css",
|
||||||
"src/ui/styles/cctv.css",
|
"src/ui/styles/cctv.css",
|
||||||
|
"src/ui/styles/quebecCctvOverlay.css",
|
||||||
"src/ui/styles/scenes.css",
|
"src/ui/styles/scenes.css",
|
||||||
"src/ui/styles/bhote-koshi.css",
|
"src/ui/styles/bhote-koshi.css",
|
||||||
"src/ui/styles/recording.css",
|
"src/ui/styles/recording.css",
|
||||||
@@ -1651,7 +1668,8 @@
|
|||||||
"src/render/cesium/ctrlWheelZoom.js",
|
"src/render/cesium/ctrlWheelZoom.js",
|
||||||
"src/render/input/router.js",
|
"src/render/input/router.js",
|
||||||
"src/render/cesium/internals.js",
|
"src/render/cesium/internals.js",
|
||||||
"src/data/firmsIntensity.js"
|
"src/data/firmsIntensity.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium"]
|
"external": ["cesium"]
|
||||||
},
|
},
|
||||||
@@ -1763,7 +1781,8 @@
|
|||||||
"src/render/input/wheel.js",
|
"src/render/input/wheel.js",
|
||||||
"src/render/cesium/ctrlWheelZoom.js",
|
"src/render/cesium/ctrlWheelZoom.js",
|
||||||
"src/render/input/router.js",
|
"src/render/input/router.js",
|
||||||
"src/data/firmsIntensity.js"
|
"src/data/firmsIntensity.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium"]
|
"external": ["cesium"]
|
||||||
},
|
},
|
||||||
@@ -2183,7 +2202,8 @@
|
|||||||
"src/render/cesium/input.js",
|
"src/render/cesium/input.js",
|
||||||
"src/render/input/wheel.js",
|
"src/render/input/wheel.js",
|
||||||
"src/render/cesium/ctrlWheelZoom.js",
|
"src/render/cesium/ctrlWheelZoom.js",
|
||||||
"src/render/input/router.js"
|
"src/render/input/router.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium", "satellite.js"]
|
"external": ["cesium", "satellite.js"]
|
||||||
},
|
},
|
||||||
@@ -2275,7 +2295,8 @@
|
|||||||
"src/render/cesium/input.js",
|
"src/render/cesium/input.js",
|
||||||
"src/render/input/wheel.js",
|
"src/render/input/wheel.js",
|
||||||
"src/render/cesium/ctrlWheelZoom.js",
|
"src/render/cesium/ctrlWheelZoom.js",
|
||||||
"src/render/input/router.js"
|
"src/render/input/router.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium"]
|
"external": ["cesium"]
|
||||||
},
|
},
|
||||||
@@ -2844,7 +2865,8 @@
|
|||||||
"src/render/input/wheel.js",
|
"src/render/input/wheel.js",
|
||||||
"src/render/cesium/ctrlWheelZoom.js",
|
"src/render/cesium/ctrlWheelZoom.js",
|
||||||
"src/render/input/router.js",
|
"src/render/input/router.js",
|
||||||
"src/queries/heights.js"
|
"src/queries/heights.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium", "pbf", "@mapbox/vector-tile", "mapillary-js"]
|
"external": ["cesium", "pbf", "@mapbox/vector-tile", "mapillary-js"]
|
||||||
},
|
},
|
||||||
@@ -4440,7 +4462,10 @@
|
|||||||
"src/layers/wildlifeSightings/photoText.js",
|
"src/layers/wildlifeSightings/photoText.js",
|
||||||
"src/layers/wildlifeSightings/performance.js",
|
"src/layers/wildlifeSightings/performance.js",
|
||||||
"src/layers/wildlifeSightings/iconCollection.js",
|
"src/layers/wildlifeSightings/iconCollection.js",
|
||||||
"src/layers/wildlifeSightings/view.js"
|
"src/layers/wildlifeSightings/view.js",
|
||||||
|
"src/ui/quebecCctvOverlay.js",
|
||||||
|
"src/time/viewerClock.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": [
|
"external": [
|
||||||
"hls.js",
|
"hls.js",
|
||||||
@@ -5172,7 +5197,8 @@
|
|||||||
"src/layers/wildlifeSightings/photoText.js",
|
"src/layers/wildlifeSightings/photoText.js",
|
||||||
"src/layers/wildlifeSightings/performance.js",
|
"src/layers/wildlifeSightings/performance.js",
|
||||||
"src/layers/wildlifeSightings/view.js",
|
"src/layers/wildlifeSightings/view.js",
|
||||||
"src/layers/wildlifeSightings/iconCollection.js"
|
"src/layers/wildlifeSightings/iconCollection.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": [
|
"external": [
|
||||||
"hls.js",
|
"hls.js",
|
||||||
@@ -5435,7 +5461,8 @@
|
|||||||
"src/i18n/locales/zh-Hant.json",
|
"src/i18n/locales/zh-Hant.json",
|
||||||
"src/data/entityRecords.js",
|
"src/data/entityRecords.js",
|
||||||
"src/render/rendererOf.js",
|
"src/render/rendererOf.js",
|
||||||
"src/data/firmsIntensity.js"
|
"src/data/firmsIntensity.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": []
|
"external": []
|
||||||
},
|
},
|
||||||
@@ -6051,7 +6078,8 @@
|
|||||||
"src/render/cesium/pickMemo.js",
|
"src/render/cesium/pickMemo.js",
|
||||||
"src/render/cesium/nativeClick.js",
|
"src/render/cesium/nativeClick.js",
|
||||||
"src/data/rioRouteNames.js",
|
"src/data/rioRouteNames.js",
|
||||||
"src/overlays/worldOverlayChrome.js"
|
"src/overlays/worldOverlayChrome.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium", "egm96-universal", "pbf"]
|
"external": ["cesium", "egm96-universal", "pbf"]
|
||||||
},
|
},
|
||||||
@@ -6157,7 +6185,8 @@
|
|||||||
"src/render/cesium/internals.js",
|
"src/render/cesium/internals.js",
|
||||||
"src/render/cesium/pickMemo.js",
|
"src/render/cesium/pickMemo.js",
|
||||||
"src/render/cesium/nativeClick.js",
|
"src/render/cesium/nativeClick.js",
|
||||||
"src/data/rioRouteNames.js"
|
"src/data/rioRouteNames.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": ["cesium", "pbf"]
|
"external": ["cesium", "pbf"]
|
||||||
},
|
},
|
||||||
@@ -6304,7 +6333,8 @@
|
|||||||
"src/data/detectionPolicy.js",
|
"src/data/detectionPolicy.js",
|
||||||
"src/scopeMaskPolicy.js",
|
"src/scopeMaskPolicy.js",
|
||||||
"src/i18n/marker.js",
|
"src/i18n/marker.js",
|
||||||
"src/visualStylePolicy.js"
|
"src/visualStylePolicy.js",
|
||||||
|
"src/time/worldClock.js"
|
||||||
],
|
],
|
||||||
"external": []
|
"external": []
|
||||||
},
|
},
|
||||||
@@ -6834,5 +6864,10 @@
|
|||||||
"src/layers/wildlifeSightings/performance.js"
|
"src/layers/wildlifeSightings/performance.js"
|
||||||
],
|
],
|
||||||
"external": []
|
"external": []
|
||||||
|
},
|
||||||
|
"time": {
|
||||||
|
"exports": ["./time"],
|
||||||
|
"modules": ["src/time/worldClock.js"],
|
||||||
|
"external": []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+186
-4
@@ -1,4 +1,5 @@
|
|||||||
import { createCctvCatalog } from './cctv/catalog.js';
|
import { createCctvCatalog } from './cctv/catalog.js';
|
||||||
|
import { quebec511VideoUrl, quebecBrowserVideoEnabled } from './cctv/quebec.js';
|
||||||
import { normalizeFeedType, isVideoFeedType } from './cctv/normalize.js';
|
import { normalizeFeedType, isVideoFeedType } from './cctv/normalize.js';
|
||||||
import {
|
import {
|
||||||
buildSyntheticCctvSvg,
|
buildSyntheticCctvSvg,
|
||||||
@@ -18,6 +19,8 @@ import { sanitizeCctvRangeHeader } from './cctv/range.js';
|
|||||||
import { admitSameSiteKeyless } from './common/same-site.js';
|
import { admitSameSiteKeyless } from './common/same-site.js';
|
||||||
import { PROXY_SIGNALS } from '../../src/localRequestGate.mjs';
|
import { PROXY_SIGNALS } from '../../src/localRequestGate.mjs';
|
||||||
import { createHlsPuller } from './cctv/stream.js';
|
import { createHlsPuller } from './cctv/stream.js';
|
||||||
|
import { isMlitRiverAdjustmentImage } from './cctv/worldCameras.js';
|
||||||
|
import { ottawaAuthorizedFrameUrl } from './cctv/ottawa.js';
|
||||||
import { googleServerApiKey } from './places/google-key.js';
|
import { googleServerApiKey } from './places/google-key.js';
|
||||||
export { CCTV_FRAME_FETCH_TIMEOUT_MS, fetchCctvImageFromUpstream };
|
export { CCTV_FRAME_FETCH_TIMEOUT_MS, fetchCctvImageFromUpstream };
|
||||||
/**
|
/**
|
||||||
@@ -43,6 +46,120 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
|
|||||||
const HEALTH_MAX_ENTRIES = CCTV_MAX_SOURCES_CEILING;
|
const HEALTH_MAX_ENTRIES = CCTV_MAX_SOURCES_CEILING;
|
||||||
/** Live HLS strategies (see ./cctv/stream.js). Shared across dev and preview. */
|
/** Live HLS strategies (see ./cctv/stream.js). Shared across dev and preview. */
|
||||||
const puller = createHlsPuller();
|
const puller = createHlsPuller();
|
||||||
|
/**
|
||||||
|
* Bounded transient image reuse keeps cadence-limited providers (World
|
||||||
|
* stills, Ottawa's once-a-minute API) inside their refresh floor. The byte
|
||||||
|
* cap is the real bound; the entry cap only limits map overhead.
|
||||||
|
*/
|
||||||
|
const WORLD_FRAME_CACHE_MAX_ENTRIES = 1024;
|
||||||
|
/** Retry a failed fetch sooner than a full refresh window, never under a minute. */
|
||||||
|
const THROTTLED_FRAME_FAILURE_BACKOFF_MS = 60 * 1000;
|
||||||
|
const WORLD_FRAME_CACHE_MAX_ENTRY_BYTES = 2 * 1024 * 1024;
|
||||||
|
const WORLD_FRAME_CACHE_MAX_BYTES = 32 * 1024 * 1024;
|
||||||
|
const worldFrameCache = new Map();
|
||||||
|
const worldFrameInflight = new Map();
|
||||||
|
const worldFrameNextAllowedAt = new Map();
|
||||||
|
let worldFrameCacheBytes = 0;
|
||||||
|
|
||||||
|
function getWorldFrameCache(cameraId) {
|
||||||
|
const entry = worldFrameCache.get(cameraId);
|
||||||
|
if (!entry) return null;
|
||||||
|
worldFrameCache.delete(cameraId);
|
||||||
|
worldFrameCache.set(cameraId, entry);
|
||||||
|
return entry;
|
||||||
|
}
|
||||||
|
|
||||||
|
function storeWorldFrame(cameraId, image) {
|
||||||
|
if (
|
||||||
|
!Buffer.isBuffer(image?.body) ||
|
||||||
|
image.body.length > WORLD_FRAME_CACHE_MAX_ENTRY_BYTES
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
const previous = worldFrameCache.get(cameraId);
|
||||||
|
if (previous) worldFrameCacheBytes -= previous.body.length;
|
||||||
|
const entry = {
|
||||||
|
body: image.body,
|
||||||
|
contentType: image.contentType,
|
||||||
|
fetchedAt: Date.now(),
|
||||||
|
};
|
||||||
|
worldFrameCache.delete(cameraId);
|
||||||
|
worldFrameCache.set(cameraId, entry);
|
||||||
|
worldFrameCacheBytes += entry.body.length;
|
||||||
|
while (
|
||||||
|
worldFrameCache.size > WORLD_FRAME_CACHE_MAX_ENTRIES ||
|
||||||
|
worldFrameCacheBytes > WORLD_FRAME_CACHE_MAX_BYTES
|
||||||
|
) {
|
||||||
|
const oldestId = worldFrameCache.keys().next().value;
|
||||||
|
const oldest = worldFrameCache.get(oldestId);
|
||||||
|
worldFrameCache.delete(oldestId);
|
||||||
|
worldFrameCacheBytes -= oldest.body.length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function setNextAllowedAt(cameraId, at) {
|
||||||
|
worldFrameNextAllowedAt.delete(cameraId);
|
||||||
|
worldFrameNextAllowedAt.set(cameraId, at);
|
||||||
|
while (worldFrameNextAllowedAt.size > 4096) {
|
||||||
|
worldFrameNextAllowedAt.delete(
|
||||||
|
worldFrameNextAllowedAt.keys().next().value,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch a frame from a provider with a per-camera refresh floor. Inside the
|
||||||
|
* floor the last frame is reused; with no frame to reuse the caller gets
|
||||||
|
* `{ throttled: true }` and serves a placeholder, so a cadence-limited camera
|
||||||
|
* never falls through to the key-bearing Street View fallback. A failed
|
||||||
|
* fetch backs off for a minute (capped at the floor) instead of a full
|
||||||
|
* window.
|
||||||
|
*/
|
||||||
|
async function fetchThrottledFrame(source, cameraId, frameUrl) {
|
||||||
|
const cached = getWorldFrameCache(cameraId);
|
||||||
|
const rawRefreshMs = Number(source?.frameRefreshMs);
|
||||||
|
const refreshMs =
|
||||||
|
Number.isFinite(rawRefreshMs) && rawRefreshMs > 0
|
||||||
|
? rawRefreshMs
|
||||||
|
: 5 * 60 * 1000;
|
||||||
|
const now = Date.now();
|
||||||
|
if (cached && now - cached.fetchedAt < refreshMs) {
|
||||||
|
return { ok: true, ...cached, cached: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
const inflight = worldFrameInflight.get(cameraId);
|
||||||
|
if (inflight) return inflight;
|
||||||
|
const stale = cached
|
||||||
|
? {
|
||||||
|
ok: true,
|
||||||
|
body: cached.body,
|
||||||
|
contentType: cached.contentType,
|
||||||
|
stale: true,
|
||||||
|
}
|
||||||
|
: null;
|
||||||
|
const nextAllowedAt = worldFrameNextAllowedAt.get(cameraId) || 0;
|
||||||
|
if (now < nextAllowedAt) return stale || { ok: false, throttled: true };
|
||||||
|
if (!frameUrl) return stale;
|
||||||
|
setNextAllowedAt(cameraId, now + refreshMs);
|
||||||
|
let request;
|
||||||
|
request = fetchCctvImageFromUpstream(frameUrl)
|
||||||
|
.then((image) => {
|
||||||
|
if (image?.ok) {
|
||||||
|
storeWorldFrame(cameraId, image);
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
setNextAllowedAt(
|
||||||
|
cameraId,
|
||||||
|
Date.now() + Math.min(refreshMs, THROTTLED_FRAME_FAILURE_BACKOFF_MS),
|
||||||
|
);
|
||||||
|
return stale || image;
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
if (worldFrameInflight.get(cameraId) === request)
|
||||||
|
worldFrameInflight.delete(cameraId);
|
||||||
|
});
|
||||||
|
worldFrameInflight.set(cameraId, request);
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
/** Update the health entry for a camera, evicting the oldest entry if at capacity. */
|
/** Update the health entry for a camera, evicting the oldest entry if at capacity. */
|
||||||
const setHealth = (cameraId, patch) => {
|
const setHealth = (cameraId, patch) => {
|
||||||
@@ -153,6 +270,7 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (url.pathname === '/sources') {
|
if (url.pathname === '/sources') {
|
||||||
|
const quebecVideo = quebecBrowserVideoEnabled();
|
||||||
const body = {
|
const body = {
|
||||||
trimmedPacks: getCctvSources.trimmedPacks?.(sources) ?? [],
|
trimmedPacks: getCctvSources.trimmedPacks?.(sources) ?? [],
|
||||||
sources: sources.map((source) => ({
|
sources: sources.map((source) => ({
|
||||||
@@ -164,6 +282,7 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
|
|||||||
provider: source.provider,
|
provider: source.provider,
|
||||||
lat: source.lat,
|
lat: source.lat,
|
||||||
lon: source.lon,
|
lon: source.lon,
|
||||||
|
frameRefreshMs: source.frameRefreshMs,
|
||||||
headingDeg: source.headingDeg,
|
headingDeg: source.headingDeg,
|
||||||
headingConfidence: source.headingConfidence || '',
|
headingConfidence: source.headingConfidence || '',
|
||||||
pitchDeg: source.pitchDeg,
|
pitchDeg: source.pitchDeg,
|
||||||
@@ -174,6 +293,13 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
|
|||||||
feedType: normalizeFeedType(source.feedType),
|
feedType: normalizeFeedType(source.feedType),
|
||||||
sourceKind:
|
sourceKind:
|
||||||
source.sourceKind || (source.url ? 'configured' : 'fallback'),
|
source.sourceKind || (source.url ? 'configured' : 'fallback'),
|
||||||
|
sourceUrl: source.sourceUrl || '',
|
||||||
|
browserMediaUrl:
|
||||||
|
quebecVideo && source.sourceKind === 'quebec-511-browser'
|
||||||
|
? quebec511VideoUrl(source.id)
|
||||||
|
: '',
|
||||||
|
accuracyM: source.accuracyM,
|
||||||
|
positionSource: source.positionSource || '',
|
||||||
poseSource: source.poseSource,
|
poseSource: source.poseSource,
|
||||||
model: source.model || '',
|
model: source.model || '',
|
||||||
manufacturer: source.manufacturer || '',
|
manufacturer: source.manufacturer || '',
|
||||||
@@ -526,15 +652,71 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
|
|||||||
: '');
|
: '');
|
||||||
|
|
||||||
const upstreamImage =
|
const upstreamImage =
|
||||||
source?.sourceKind === 'txdot-its'
|
source?.pack === 'world-cameras'
|
||||||
|
? await fetchThrottledFrame(source, cameraId, upstreamCandidate)
|
||||||
|
: source?.sourceKind === 'ottawa-traffic'
|
||||||
|
? await fetchThrottledFrame(
|
||||||
|
source,
|
||||||
|
cameraId,
|
||||||
|
ottawaAuthorizedFrameUrl(upstreamCandidate),
|
||||||
|
)
|
||||||
|
: source?.sourceKind === 'txdot-its'
|
||||||
? await fetchTxdotSnapshot(upstreamCandidate)
|
? await fetchTxdotSnapshot(upstreamCandidate)
|
||||||
: await fetchCctvImageFromUpstream(upstreamCandidate);
|
: await fetchCctvImageFromUpstream(upstreamCandidate, {
|
||||||
|
allowMjpeg: source?.sourceKind === 'taiwan-highway-motc',
|
||||||
|
});
|
||||||
|
if (
|
||||||
|
source?.sourceKind === 'mlit-river' &&
|
||||||
|
isMlitRiverAdjustmentImage(upstreamImage)
|
||||||
|
) {
|
||||||
|
const svg = buildSyntheticCctvSvg({
|
||||||
|
cameraId,
|
||||||
|
label,
|
||||||
|
city,
|
||||||
|
status: 'CAMERA UNDER ADJUSTMENT',
|
||||||
|
});
|
||||||
|
setHealth(cameraId, {
|
||||||
|
status: 'degraded',
|
||||||
|
sourceKind: 'snapshot',
|
||||||
|
label: source.provider || 'MLIT river cameras',
|
||||||
|
message: 'Provider camera under adjustment',
|
||||||
|
});
|
||||||
|
res.writeHead(200, {
|
||||||
|
'Content-Type': 'image/svg+xml',
|
||||||
|
'Cache-Control': 'no-store',
|
||||||
|
'X-CCTV-Source': 'provider-maintenance',
|
||||||
|
});
|
||||||
|
res.end(svg);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (upstreamImage?.throttled) {
|
||||||
|
// Inside the provider's refresh floor with no frame to reuse: a
|
||||||
|
// placeholder, not Street View, and no health change.
|
||||||
|
res.writeHead(200, {
|
||||||
|
'Content-Type': 'image/svg+xml',
|
||||||
|
'Cache-Control': 'no-store',
|
||||||
|
'X-CCTV-Source': 'synthetic',
|
||||||
|
});
|
||||||
|
res.end(
|
||||||
|
buildSyntheticCctvSvg({
|
||||||
|
cameraId,
|
||||||
|
label,
|
||||||
|
city,
|
||||||
|
status: 'WAITING FOR NEXT FRAME',
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (upstreamImage?.ok) {
|
if (upstreamImage?.ok) {
|
||||||
setHealth(cameraId, {
|
setHealth(cameraId, {
|
||||||
status: 'ok',
|
status: upstreamImage.stale ? 'degraded' : 'ok',
|
||||||
sourceKind: 'snapshot',
|
sourceKind: 'snapshot',
|
||||||
label: source?.provider || 'Configured source',
|
label: source?.provider || 'Configured source',
|
||||||
message: 'Upstream snapshot active',
|
message: upstreamImage.stale
|
||||||
|
? 'Serving last snapshot; refresh failed'
|
||||||
|
: upstreamImage.cached
|
||||||
|
? 'Cached snapshot active'
|
||||||
|
: 'Upstream snapshot active',
|
||||||
});
|
});
|
||||||
res.writeHead(200, {
|
res.writeHead(200, {
|
||||||
'Content-Type': upstreamImage.contentType,
|
'Content-Type': upstreamImage.contentType,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
CCTV_MAX_SOURCES_CEILING,
|
CCTV_MAX_SOURCES_CEILING,
|
||||||
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
DEFAULT_CCTV_MAX_SOURCES,
|
||||||
} from './constants.js';
|
} from './constants.js';
|
||||||
|
|
||||||
@@ -23,16 +24,27 @@ export function resolveCatalogCap(raw) {
|
|||||||
* exceed the catalog cap, the cap is filled ROUND-ROBIN — one camera from
|
* exceed the catalog cap, the cap is filled ROUND-ROBIN — one camera from
|
||||||
* each pack per turn, in each pack's own order — so a lowered
|
* each pack per turn, in each pack's own order — so a lowered
|
||||||
* CCTV_MAX_SOURCES thins every region a little instead of deleting whichever
|
* CCTV_MAX_SOURCES thins every region a little instead of deleting whichever
|
||||||
* pack happened to be appended last. Duplicate ids resolve last-pack-wins so
|
* pack happened to be appended last. A pack with a `reservedCount` keeps up to
|
||||||
|
* that many rows only from the capacity ABOVE the shared floor, so a
|
||||||
|
* reservation adds room and never shrinks the other packs' round-robin
|
||||||
|
* share; at or below the floor reserved packs are ordinary lanes. Duplicate
|
||||||
|
* ids resolve last-pack-wins so
|
||||||
* file/env overrides keep replacing live records; the record is then counted
|
* file/env overrides keep replacing live records; the record is then counted
|
||||||
* against the pack that won it.
|
* against the pack that won it.
|
||||||
*
|
*
|
||||||
* @param {Array<{name:string, sources:Array<object>}>} packs - Normalized
|
* @param {Array<{name:string, sources:Array<object>}>} packs - Normalized
|
||||||
* packs in merge order (earlier packs lose duplicate ids to later ones).
|
* packs in merge order (earlier packs lose duplicate ids to later ones).
|
||||||
* @param {number} maxCount - Catalog cap.
|
* @param {number} maxCount - Catalog cap.
|
||||||
|
* @param {object} [options]
|
||||||
|
* @param {number} [options.sharedFloor=CCTV_SHARED_SOURCE_SLOTS] - Slots kept
|
||||||
|
* for the round-robin before reservations apply.
|
||||||
* @returns {{sources:Array<object>, packs:Array<{name:string, offered:number, kept:number}>}}
|
* @returns {{sources:Array<object>, packs:Array<{name:string, offered:number, kept:number}>}}
|
||||||
*/
|
*/
|
||||||
export function allocateSourceCap(packs, maxCount) {
|
export function allocateSourceCap(
|
||||||
|
packs,
|
||||||
|
maxCount,
|
||||||
|
{ sharedFloor = CCTV_SHARED_SOURCE_SLOTS } = {},
|
||||||
|
) {
|
||||||
const owner = new Map();
|
const owner = new Map();
|
||||||
for (const pack of packs) {
|
for (const pack of packs) {
|
||||||
for (const source of pack.sources) {
|
for (const source of pack.sources) {
|
||||||
@@ -40,30 +52,53 @@ export function allocateSourceCap(packs, maxCount) {
|
|||||||
owner.set(source.id, { pack: pack.name, source });
|
owner.set(source.id, { pack: pack.name, source });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const lanes = packs.map((pack) => ({
|
const lanes = packs.map((pack) => {
|
||||||
name: pack.name,
|
|
||||||
// Only the record that WON its id (the last occurrence anywhere, so also
|
// Only the record that WON its id (the last occurrence anywhere, so also
|
||||||
// the last within this pack) takes a lane slot; earlier duplicates never
|
// the last within this pack) takes a lane slot; earlier duplicates never
|
||||||
// count against the cap.
|
// count against the cap.
|
||||||
queue: pack.sources.filter(
|
const queue = pack.sources.filter(
|
||||||
(source) => source?.id && owner.get(source.id)?.source === source,
|
(source) => source?.id && owner.get(source.id)?.source === source,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
name: pack.name,
|
||||||
|
queue,
|
||||||
|
reserved: Math.max(
|
||||||
|
0,
|
||||||
|
Math.min(queue.length, Math.floor(Number(pack.reservedCount) || 0)),
|
||||||
),
|
),
|
||||||
next: 0,
|
next: 0,
|
||||||
kept: 0,
|
kept: 0,
|
||||||
}));
|
};
|
||||||
|
});
|
||||||
const total = lanes.reduce((sum, lane) => sum + lane.queue.length, 0);
|
const total = lanes.reduce((sum, lane) => sum + lane.queue.length, 0);
|
||||||
const limit = Math.min(total, Math.max(0, Math.floor(maxCount)));
|
const limit = Math.min(total, Math.max(0, Math.floor(maxCount)));
|
||||||
|
|
||||||
const sources = [];
|
const sources = [];
|
||||||
|
const reservedSources = [];
|
||||||
if (limit >= total) {
|
if (limit >= total) {
|
||||||
for (const lane of lanes) {
|
for (const lane of lanes) {
|
||||||
sources.push(...lane.queue);
|
sources.push(...lane.queue);
|
||||||
lane.kept = lane.queue.length;
|
lane.kept = lane.queue.length;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
while (sources.length < limit) {
|
// Reserved packs draw only on the capacity above the shared floor, then
|
||||||
|
// every lane (reserved ones included) shares the rest round-robin.
|
||||||
|
const reserveBudget = Math.max(0, limit - Math.max(0, sharedFloor));
|
||||||
|
while (reservedSources.length < reserveBudget) {
|
||||||
|
let tookReserved = false;
|
||||||
for (const lane of lanes) {
|
for (const lane of lanes) {
|
||||||
if (sources.length >= limit) break;
|
if (reservedSources.length >= reserveBudget) break;
|
||||||
|
if (lane.kept >= lane.reserved) continue;
|
||||||
|
reservedSources.push(lane.queue[lane.next]);
|
||||||
|
lane.next += 1;
|
||||||
|
lane.kept += 1;
|
||||||
|
tookReserved = true;
|
||||||
|
}
|
||||||
|
if (!tookReserved) break;
|
||||||
|
}
|
||||||
|
while (sources.length + reservedSources.length < limit) {
|
||||||
|
for (const lane of lanes) {
|
||||||
|
if (sources.length + reservedSources.length >= limit) break;
|
||||||
if (lane.next >= lane.queue.length) continue;
|
if (lane.next >= lane.queue.length) continue;
|
||||||
sources.push(lane.queue[lane.next]);
|
sources.push(lane.queue[lane.next]);
|
||||||
lane.next += 1;
|
lane.next += 1;
|
||||||
@@ -72,7 +107,9 @@ export function allocateSourceCap(packs, maxCount) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
sources,
|
// Keep the shared round-robin sequence first so the default active camera
|
||||||
|
// remains in its established region; guaranteed regional rows follow it.
|
||||||
|
sources: [...sources, ...reservedSources],
|
||||||
packs: lanes.map((lane) => ({
|
packs: lanes.map((lane) => ({
|
||||||
name: lane.name,
|
name: lane.name,
|
||||||
offered: lane.queue.length,
|
offered: lane.queue.length,
|
||||||
|
|||||||
@@ -1,11 +1,18 @@
|
|||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
import { DEFAULT_CCTV_SOURCE_FILE, CCTV_SOURCE_CACHE_MS } from './constants.js';
|
import {
|
||||||
|
DEFAULT_CCTV_SOURCE_FILE,
|
||||||
|
CCTV_SOURCE_CACHE_MS,
|
||||||
|
WORLD_CCTV_SOURCE_COUNT,
|
||||||
|
} from './constants.js';
|
||||||
import { allocateSourceCap, resolveCatalogCap } from './cap.js';
|
import { allocateSourceCap, resolveCatalogCap } from './cap.js';
|
||||||
import { loadGroundHeights, joinGroundHeights } from './groundHeights.js';
|
import { loadGroundHeights, joinGroundHeights } from './groundHeights.js';
|
||||||
import { cameraRegion, normalizeSourceItem } from './normalize.js';
|
import { cameraRegion, normalizeSourceItem } from './normalize.js';
|
||||||
import { loadLithuaniaSources } from './lithuania.js';
|
import { loadLithuaniaSources } from './lithuania.js';
|
||||||
|
import { loadOttawaSourcesFromOpenData } from './ottawa.js';
|
||||||
|
import { loadQuebecSources, QUEBEC_CAMERA_SOURCE_COUNT } from './quebec.js';
|
||||||
import { loadTaiwanSources } from './taiwan.js';
|
import { loadTaiwanSources } from './taiwan.js';
|
||||||
|
import { loadWorldCameraSources } from './worldCameras.js';
|
||||||
import {
|
import {
|
||||||
loadAustinSourcesFromOpenData,
|
loadAustinSourcesFromOpenData,
|
||||||
loadCaltransSourcesFromOpenData,
|
loadCaltransSourcesFromOpenData,
|
||||||
@@ -20,6 +27,7 @@ import {
|
|||||||
loadNswSourcesFromOpenData,
|
loadNswSourcesFromOpenData,
|
||||||
loadCalgarySourcesFromOpenData,
|
loadCalgarySourcesFromOpenData,
|
||||||
loadCataloniaSourcesFromOpenData,
|
loadCataloniaSourcesFromOpenData,
|
||||||
|
loadIcelandSourcesFromOpenData,
|
||||||
loadHkSourcesFromOpenData,
|
loadHkSourcesFromOpenData,
|
||||||
loadDelDOTSourcesFromOpenData,
|
loadDelDOTSourcesFromOpenData,
|
||||||
loadKingCountySourcesFromOpenData,
|
loadKingCountySourcesFromOpenData,
|
||||||
@@ -75,6 +83,11 @@ const LIVE_PACKS = [
|
|||||||
enabled: () => envEnabled('CCTV_DRIVEBC_ENABLED'),
|
enabled: () => envEnabled('CCTV_DRIVEBC_ENABLED'),
|
||||||
load: loadDriveBcSourcesFromOpenData,
|
load: loadDriveBcSourcesFromOpenData,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'ottawa',
|
||||||
|
enabled: () => envEnabled('CCTV_OTTAWA_ENABLED'),
|
||||||
|
load: loadOttawaSourcesFromOpenData,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'txdot',
|
name: 'txdot',
|
||||||
enabled: () => envEnabled('CCTV_TXDOT_ENABLED'),
|
enabled: () => envEnabled('CCTV_TXDOT_ENABLED'),
|
||||||
@@ -110,6 +123,11 @@ const LIVE_PACKS = [
|
|||||||
enabled: () => envEnabled('CCTV_CATALONIA_ENABLED'),
|
enabled: () => envEnabled('CCTV_CATALONIA_ENABLED'),
|
||||||
load: loadCataloniaSourcesFromOpenData,
|
load: loadCataloniaSourcesFromOpenData,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'iceland',
|
||||||
|
enabled: () => envEnabled('CCTV_ICELAND_ENABLED'),
|
||||||
|
load: loadIcelandSourcesFromOpenData,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'hk',
|
name: 'hk',
|
||||||
enabled: () => envEnabled('CCTV_HK_ENABLED'),
|
enabled: () => envEnabled('CCTV_HK_ENABLED'),
|
||||||
@@ -172,6 +190,18 @@ const LIVE_PACKS = [
|
|||||||
enabled: () => envOptIn('CCTV_HOUSTON_ENABLED'),
|
enabled: () => envOptIn('CCTV_HOUSTON_ENABLED'),
|
||||||
load: loadHoustonSourcesFromOpenData,
|
load: loadHoustonSourcesFromOpenData,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'quebec',
|
||||||
|
enabled: () => envEnabled('CCTV_QUEBEC_ENABLED'),
|
||||||
|
load: loadQuebecSources,
|
||||||
|
reservedCount: QUEBEC_CAMERA_SOURCE_COUNT,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'world-cameras',
|
||||||
|
enabled: () => envEnabled('CCTV_WORLD_CAMERAS_ENABLED'),
|
||||||
|
load: loadWorldCameraSources,
|
||||||
|
reservedCount: WORLD_CCTV_SOURCE_COUNT,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'a22',
|
name: 'a22',
|
||||||
enabled: () => envEnabled('CCTV_A22_ENABLED'),
|
enabled: () => envEnabled('CCTV_A22_ENABLED'),
|
||||||
@@ -316,7 +346,7 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
|
|||||||
: [];
|
: [];
|
||||||
// Live packs first so file/env overrides win on duplicate IDs; each pack
|
// Live packs first so file/env overrides win on duplicate IDs; each pack
|
||||||
// keeps its own priority order and the catalog cap is shared fairly.
|
// keeps its own priority order and the catalog cap is shared fairly.
|
||||||
const normalizePack = (name, items) => ({
|
const normalizePack = (name, items, reservedCount = 0) => ({
|
||||||
name,
|
name,
|
||||||
sources: items
|
sources: items
|
||||||
.filter((item) => item && typeof item === 'object')
|
.filter((item) => item && typeof item === 'object')
|
||||||
@@ -326,6 +356,7 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
|
|||||||
? items.available
|
? items.available
|
||||||
: items.length,
|
: items.length,
|
||||||
region: items.region ?? null,
|
region: items.region ?? null,
|
||||||
|
reservedCount,
|
||||||
});
|
});
|
||||||
const packs = [
|
const packs = [
|
||||||
...LIVE_PACKS.map((pack, index) =>
|
...LIVE_PACKS.map((pack, index) =>
|
||||||
@@ -334,6 +365,7 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
|
|||||||
liveResults[index]?.status === 'fulfilled'
|
liveResults[index]?.status === 'fulfilled'
|
||||||
? liveResults[index].value
|
? liveResults[index].value
|
||||||
: [],
|
: [],
|
||||||
|
pack.reservedCount,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
normalizePack('file', fromFile),
|
normalizePack('file', fromFile),
|
||||||
|
|||||||
@@ -5,15 +5,18 @@ export const DEFAULT_AUSTIN_ROWS_URL =
|
|||||||
/** Default cap on Austin cameras after distance-based prioritization. */
|
/** Default cap on Austin cameras after distance-based prioritization. */
|
||||||
export const DEFAULT_AUSTIN_MAX_SOURCES = 250;
|
export const DEFAULT_AUSTIN_MAX_SOURCES = 250;
|
||||||
/**
|
/**
|
||||||
* Catalog-wide safety ceiling on served cameras. Each pack already caps
|
* Slots every pack shares round-robin before any reservation applies. A
|
||||||
* itself (nearest-to-anchor first); this bound only matters when the packs
|
* reserved pack (Québec, World) only takes capacity above this floor, so a
|
||||||
* together exceed it, and it is then filled round-robin across packs (see
|
* cap at or below it thins every region evenly (see cap.js).
|
||||||
* cap.js) so no region is silently dropped. The default per-pack caps
|
|
||||||
* together can exceed it, so a default install may be thinned evenly here.
|
|
||||||
*/
|
*/
|
||||||
export const DEFAULT_CCTV_MAX_SOURCES = 4000;
|
export const CCTV_SHARED_SOURCE_SLOTS = 4000;
|
||||||
|
/**
|
||||||
|
* Catalog-wide default: the 4,000 shared slots plus room reserved for the
|
||||||
|
* 1,120 Québec and 2,230 World image locations.
|
||||||
|
*/
|
||||||
|
export const DEFAULT_CCTV_MAX_SOURCES = 7350;
|
||||||
/** Hard upper bound for CCTV_MAX_SOURCES; also sizes the health map. */
|
/** Hard upper bound for CCTV_MAX_SOURCES; also sizes the health map. */
|
||||||
export const CCTV_MAX_SOURCES_CEILING = 5000;
|
export const CCTV_MAX_SOURCES_CEILING = 8000;
|
||||||
/** Reference point for Austin camera prioritization (Congress & 6th). */
|
/** Reference point for Austin camera prioritization (Congress & 6th). */
|
||||||
export const AUSTIN_DOWNTOWN = { lat: 30.2672, lon: -97.7431 };
|
export const AUSTIN_DOWNTOWN = { lat: 30.2672, lon: -97.7431 };
|
||||||
/** Caltrans CCTV: one JSON feed per district, identical schema statewide. */
|
/** Caltrans CCTV: one JSON feed per district, identical schema statewide. */
|
||||||
@@ -197,6 +200,39 @@ export const DRIVEBC_ANCHORS = [
|
|||||||
{ lat: 49.2827, lon: -123.1207 }, // Vancouver
|
{ lat: 49.2827, lon: -123.1207 }, // Vancouver
|
||||||
{ lat: 48.4284, lon: -123.3656 }, // Victoria
|
{ lat: 48.4284, lon: -123.3656 }, // Victoria
|
||||||
];
|
];
|
||||||
|
/** City of Ottawa traffic cameras: documented JSON list (keyless). */
|
||||||
|
export const OTTAWA_CAMERAS_URL =
|
||||||
|
'https://traffic.ottawa.ca/map/service/camera';
|
||||||
|
/**
|
||||||
|
* Keyless canonical frame URL for one camera number. The city's Traffic Camera
|
||||||
|
* Images API needs a certificate (OTTAWA_CAMERA_CERTIFICATE), which the frame
|
||||||
|
* proxy adds at request time so it never appears in a catalog response.
|
||||||
|
*/
|
||||||
|
export const OTTAWA_IMAGE_URL = (cameraNumber) =>
|
||||||
|
`https://traffic.ottawa.ca/opendata/camera?c=${encodeURIComponent(cameraNumber)}`;
|
||||||
|
/** Pinned frame directory, for redirect containment in the media proxy. */
|
||||||
|
export const OTTAWA_IMAGE_ORIGIN = 'https://traffic.ottawa.ca/opendata/';
|
||||||
|
/** The API lets one certificate and user id fetch a camera once a minute. */
|
||||||
|
export const OTTAWA_FRAME_REFRESH_MS = 60 * 1000;
|
||||||
|
/** Alphanumeric user id this server sends with its certificate. */
|
||||||
|
export const OTTAWA_API_USER_ID = 'gev';
|
||||||
|
export const DEFAULT_OTTAWA_MAX_SOURCES = 250;
|
||||||
|
/** Prioritization anchor: downtown Ottawa (Parliament Hill). */
|
||||||
|
export const OTTAWA_ANCHORS = [{ lat: 45.4215, lon: -75.6972 }];
|
||||||
|
/**
|
||||||
|
* Taiwan Highway Bureau MJPEG servers. Each camera is one root path segment,
|
||||||
|
* so the pin is the host root: a redirect must stay on the same server.
|
||||||
|
*/
|
||||||
|
export const TAIWAN_HIGHWAY_IMAGE_ORIGINS = Object.freeze(
|
||||||
|
[1, 2, 3, 4, 5, 6, 7, 8].map((n) => `https://cctv-ss0${n}.thb.gov.tw/`),
|
||||||
|
);
|
||||||
|
/** Direct still-image directories from the World cams add-on's eligible packs. */
|
||||||
|
export const TRIPCHECK_IMAGE_ORIGIN =
|
||||||
|
'https://www.tripcheck.com/roadcams/cams/';
|
||||||
|
export const MLIT_RIVER_IMAGE_ORIGIN = 'https://cam.river.go.jp/cam/now/';
|
||||||
|
export const DEFAULT_WORLD_CCTV_SOURCE_FILE =
|
||||||
|
'config/cctv_sources.world-image-cameras.json';
|
||||||
|
export const WORLD_CCTV_SOURCE_COUNT = 2230;
|
||||||
/** Tallinn intersection cameras: curated catalog + public stills on ristmikud.tallinn.ee. */
|
/** Tallinn intersection cameras: curated catalog + public stills on ristmikud.tallinn.ee. */
|
||||||
export const DEFAULT_TALLINN_SOURCE_FILE = 'config/cctv_sources.tallinn.json';
|
export const DEFAULT_TALLINN_SOURCE_FILE = 'config/cctv_sources.tallinn.json';
|
||||||
export const DEFAULT_TALLINN_MAX_SOURCES = 255;
|
export const DEFAULT_TALLINN_MAX_SOURCES = 255;
|
||||||
@@ -309,6 +345,37 @@ export const CATALONIA_ANCHORS = [
|
|||||||
{ lat: 41.5636, lon: 2.0111 }, // Terrassa
|
{ lat: 41.5636, lon: 2.0111 }, // Terrassa
|
||||||
];
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Icelandic Road and Coastal Administration (Vegagerðin, IRCA) road cameras:
|
||||||
|
* one keyless JSON list, one row per camera view (about 500 views at roughly
|
||||||
|
* 170 stations, verified 2026-11-06). Frames are stills on the IRCA host, each
|
||||||
|
* rewritten by the publisher every few minutes. Camera images are published
|
||||||
|
* under CC BY 4.0 (IRCA terms of use, "Open data" section).
|
||||||
|
*/
|
||||||
|
export const ICELAND_CAMERAS_URL =
|
||||||
|
'https://gagnaveita.vegagerdin.is/api/vefmyndavelar2014_1';
|
||||||
|
/** The only directory Iceland camera frames may come from. */
|
||||||
|
export const ICELAND_IMAGE_ORIGIN =
|
||||||
|
'https://www.vegagerdin.is/vgdata/vefmyndavelar/';
|
||||||
|
/** Byte ceiling for the Iceland catalog read (~150 KB observed 2026-11-06). */
|
||||||
|
export const ICELAND_MAX_CATALOG_BYTES = 2 * 1024 * 1024;
|
||||||
|
/** Ground-elevation prior in metres: the feed carries none, and the country
|
||||||
|
* runs from sea level to highland passes. The client's ground snap corrects
|
||||||
|
* this on 3D-tile stacks. */
|
||||||
|
export const ICELAND_GROUND_ELEVATION_M = 60;
|
||||||
|
/** The feed lists about 500 views; the default keeps half so the shared
|
||||||
|
* catalog cap still leaves room for denser regions. */
|
||||||
|
export const DEFAULT_ICELAND_MAX_SOURCES = 250;
|
||||||
|
/** Prioritization anchors: Reykjavík and the regional centres, so a cap keeps
|
||||||
|
* every region's nearest cameras instead of only the capital's. */
|
||||||
|
export const ICELAND_ANCHORS = [
|
||||||
|
{ lat: 64.1466, lon: -21.9426 }, // Reykjavík
|
||||||
|
{ lat: 65.6885, lon: -18.1262 }, // Akureyri
|
||||||
|
{ lat: 65.2639, lon: -14.3948 }, // Egilsstaðir
|
||||||
|
{ lat: 66.0749, lon: -23.1351 }, // Ísafjörður
|
||||||
|
{ lat: 63.9331, lon: -20.9971 }, // Selfoss
|
||||||
|
];
|
||||||
|
|
||||||
/** Hong Kong Transport Department traffic snapshot cameras: keyless English
|
/** Hong Kong Transport Department traffic snapshot cameras: keyless English
|
||||||
* locations XML on DATA.GOV.HK; frames are stills on the TD CCTV host. */
|
* locations XML on DATA.GOV.HK; frames are stills on the TD CCTV host. */
|
||||||
export const DEFAULT_HK_CAMERAS_URL =
|
export const DEFAULT_HK_CAMERAS_URL =
|
||||||
|
|||||||
@@ -10,10 +10,15 @@ import {
|
|||||||
CCTV_MEDIA_MAX_BODY_BYTES,
|
CCTV_MEDIA_MAX_BODY_BYTES,
|
||||||
HK_IMAGE_ORIGIN,
|
HK_IMAGE_ORIGIN,
|
||||||
KING_COUNTY_IMAGE_ORIGIN,
|
KING_COUNTY_IMAGE_ORIGIN,
|
||||||
|
MLIT_RIVER_IMAGE_ORIGIN,
|
||||||
|
TRIPCHECK_IMAGE_ORIGIN,
|
||||||
NSW_IMAGE_ORIGIN,
|
NSW_IMAGE_ORIGIN,
|
||||||
NSW_IMAGE_USER_AGENT,
|
NSW_IMAGE_USER_AGENT,
|
||||||
|
OTTAWA_IMAGE_ORIGIN,
|
||||||
TALLINN_IMAGE_ORIGIN,
|
TALLINN_IMAGE_ORIGIN,
|
||||||
TARKTEE_IMAGE_ORIGIN,
|
TARKTEE_IMAGE_ORIGIN,
|
||||||
|
ICELAND_IMAGE_ORIGIN,
|
||||||
|
TAIWAN_HIGHWAY_IMAGE_ORIGINS,
|
||||||
TFL_IMAGE_ORIGIN,
|
TFL_IMAGE_ORIGIN,
|
||||||
WARENDORF_IMAGE_ORIGINS,
|
WARENDORF_IMAGE_ORIGINS,
|
||||||
WSDOT_IMAGE_ORIGIN,
|
WSDOT_IMAGE_ORIGIN,
|
||||||
@@ -523,13 +528,18 @@ for (const prefix of [
|
|||||||
TFL_IMAGE_ORIGIN,
|
TFL_IMAGE_ORIGIN,
|
||||||
TALLINN_IMAGE_ORIGIN,
|
TALLINN_IMAGE_ORIGIN,
|
||||||
TARKTEE_IMAGE_ORIGIN,
|
TARKTEE_IMAGE_ORIGIN,
|
||||||
|
ICELAND_IMAGE_ORIGIN,
|
||||||
...WARENDORF_IMAGE_ORIGINS,
|
...WARENDORF_IMAGE_ORIGINS,
|
||||||
NSW_IMAGE_ORIGIN,
|
NSW_IMAGE_ORIGIN,
|
||||||
|
OTTAWA_IMAGE_ORIGIN,
|
||||||
CALGARY_IMAGE_ORIGIN,
|
CALGARY_IMAGE_ORIGIN,
|
||||||
HK_IMAGE_ORIGIN,
|
HK_IMAGE_ORIGIN,
|
||||||
KING_COUNTY_IMAGE_ORIGIN,
|
KING_COUNTY_IMAGE_ORIGIN,
|
||||||
WSDOT_IMAGE_ORIGIN,
|
WSDOT_IMAGE_ORIGIN,
|
||||||
A22_IMAGE_ORIGIN,
|
A22_IMAGE_ORIGIN,
|
||||||
|
TRIPCHECK_IMAGE_ORIGIN,
|
||||||
|
MLIT_RIVER_IMAGE_ORIGIN,
|
||||||
|
...TAIWAN_HIGHWAY_IMAGE_ORIGINS,
|
||||||
]) {
|
]) {
|
||||||
const host = new URL(prefix).hostname;
|
const host = new URL(prefix).hostname;
|
||||||
CCTV_PINNED_PREFIXES_BY_HOST.set(host, [
|
CCTV_PINNED_PREFIXES_BY_HOST.set(host, [
|
||||||
@@ -621,6 +631,216 @@ export function cctvUpstreamUserAgent(url) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Largest single JPEG the MJPEG first-frame reader will buffer. */
|
||||||
|
export const CCTV_MJPEG_FRAME_MAX_BYTES = 2 * 1024 * 1024;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read one bounded JPEG part from an open MJPEG response, then stop the stream.
|
||||||
|
*
|
||||||
|
* The first part may follow a CRLF preamble, and its delimiter may be written
|
||||||
|
* as `--<boundary>` or, when the declared boundary already starts with `--`,
|
||||||
|
* as the boundary itself. A part with Content-Length is read to that length;
|
||||||
|
* a part without one ends at the next delimiter, so a JPEG end marker inside
|
||||||
|
* the image (an EXIF thumbnail) never truncates it. Bytes are copied once
|
||||||
|
* into a preallocated buffer and every search resumes where it stopped, so a
|
||||||
|
* trickling upstream costs linear time.
|
||||||
|
*/
|
||||||
|
async function readFirstMjpegFrame(upstream, maxBytes) {
|
||||||
|
const mediaType = cctvLiveMediaType(
|
||||||
|
'mjpeg',
|
||||||
|
upstream.headers.get('content-type'),
|
||||||
|
);
|
||||||
|
const boundary = parseMediaType(mediaType)?.params.get('boundary') || '';
|
||||||
|
const frameMax = Math.min(maxBytes, CCTV_MJPEG_FRAME_MAX_BYTES);
|
||||||
|
if (
|
||||||
|
!boundary ||
|
||||||
|
!upstream.body ||
|
||||||
|
!Number.isSafeInteger(frameMax) ||
|
||||||
|
frameMax < 4
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
await upstream.body?.cancel();
|
||||||
|
} catch {
|
||||||
|
/* no-op */
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const delimiters = [Buffer.from('--' + boundary, 'latin1')];
|
||||||
|
if (boundary.startsWith('--') && boundary.length > 2)
|
||||||
|
delimiters.push(Buffer.from(boundary, 'latin1'));
|
||||||
|
const lineEnd = Buffer.from('\r\n', 'ascii');
|
||||||
|
const headerTerminator = Buffer.from('\r\n\r\n', 'ascii');
|
||||||
|
const jpegStart = Buffer.from([0xff, 0xd8]);
|
||||||
|
const jpegEnd = Buffer.from([0xff, 0xd9]);
|
||||||
|
const maxPreambleBytes = 64;
|
||||||
|
const maxHeaderBytes = 8 * 1024;
|
||||||
|
const maxBufferedBytes =
|
||||||
|
maxPreambleBytes +
|
||||||
|
delimiters[0].length +
|
||||||
|
lineEnd.length +
|
||||||
|
maxHeaderBytes +
|
||||||
|
headerTerminator.length +
|
||||||
|
frameMax +
|
||||||
|
lineEnd.length +
|
||||||
|
delimiters[0].length;
|
||||||
|
const buffer = Buffer.allocUnsafe(maxBufferedBytes);
|
||||||
|
let length = 0;
|
||||||
|
let reader;
|
||||||
|
let headerStart = -1;
|
||||||
|
let delimiter = null;
|
||||||
|
let headerScanFrom = 0;
|
||||||
|
let bodyStart = -1;
|
||||||
|
let declaredLength = null;
|
||||||
|
let boundaryScanFrom = -1;
|
||||||
|
|
||||||
|
/** Match the opening delimiter after an optional CRLF preamble. */
|
||||||
|
function findOpening() {
|
||||||
|
let at = 0;
|
||||||
|
while (at < length && (buffer[at] === 0x0d || buffer[at] === 0x0a)) at++;
|
||||||
|
if (at > maxPreambleBytes) return { failed: true };
|
||||||
|
for (const candidate of delimiters) {
|
||||||
|
const line = Buffer.concat([candidate, lineEnd]);
|
||||||
|
const need = at + line.length;
|
||||||
|
if (length < need) {
|
||||||
|
const seen = buffer.subarray(at, length);
|
||||||
|
if (line.subarray(0, seen.length).equals(seen))
|
||||||
|
return { pending: true };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (buffer.subarray(at, need).equals(line))
|
||||||
|
return { start: need, delimiter: candidate };
|
||||||
|
}
|
||||||
|
return { failed: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Parse the part headers; false rejects the stream. */
|
||||||
|
function parseHeaders(headerEnd) {
|
||||||
|
const headerText = buffer
|
||||||
|
.subarray(headerStart, headerEnd)
|
||||||
|
.toString('latin1');
|
||||||
|
const headers = new Map();
|
||||||
|
for (const line of headerText.split('\r\n')) {
|
||||||
|
const colon = line.indexOf(':');
|
||||||
|
if (colon <= 0) return false;
|
||||||
|
const name = line.slice(0, colon).trim().toLowerCase();
|
||||||
|
if (!name || headers.has(name)) return false;
|
||||||
|
headers.set(name, line.slice(colon + 1).trim());
|
||||||
|
}
|
||||||
|
if (cctvRasterImageType(headers.get('content-type')) !== 'image/jpeg')
|
||||||
|
return false;
|
||||||
|
const declared = headers.get('content-length');
|
||||||
|
if (declared !== undefined) {
|
||||||
|
if (!/^\d+$/.test(declared)) return false;
|
||||||
|
declaredLength = Number(declared);
|
||||||
|
if (
|
||||||
|
!Number.isSafeInteger(declaredLength) ||
|
||||||
|
declaredLength < jpegStart.length + jpegEnd.length ||
|
||||||
|
declaredLength > frameMax
|
||||||
|
)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A complete JPEG body, or null. */
|
||||||
|
function asJpeg(frame) {
|
||||||
|
return frame.length >= jpegStart.length + jpegEnd.length &&
|
||||||
|
frame.subarray(0, jpegStart.length).equals(jpegStart) &&
|
||||||
|
frame.subarray(-jpegEnd.length).equals(jpegEnd)
|
||||||
|
? Buffer.from(frame)
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
reader = upstream.body.getReader();
|
||||||
|
for (;;) {
|
||||||
|
const { done, value } = await reader.read();
|
||||||
|
if (done) return null;
|
||||||
|
|
||||||
|
const chunk = Buffer.from(value);
|
||||||
|
const room = maxBufferedBytes - length;
|
||||||
|
const included = Math.min(room, chunk.length);
|
||||||
|
chunk.copy(buffer, length, 0, included);
|
||||||
|
length += included;
|
||||||
|
const overflow = included < chunk.length;
|
||||||
|
|
||||||
|
if (headerStart < 0) {
|
||||||
|
const opening = findOpening();
|
||||||
|
if (opening.failed) return null;
|
||||||
|
if (opening.pending) {
|
||||||
|
if (overflow) return null;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
headerStart = opening.start;
|
||||||
|
delimiter = opening.delimiter;
|
||||||
|
headerScanFrom = headerStart;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bodyStart < 0) {
|
||||||
|
const headerEnd = buffer
|
||||||
|
.subarray(0, length)
|
||||||
|
.indexOf(headerTerminator, headerScanFrom);
|
||||||
|
if (headerEnd < 0) {
|
||||||
|
if (length - headerStart > maxHeaderBytes || overflow) return null;
|
||||||
|
headerScanFrom = Math.max(
|
||||||
|
headerStart,
|
||||||
|
length - headerTerminator.length + 1,
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (headerEnd - headerStart > maxHeaderBytes) return null;
|
||||||
|
if (!parseHeaders(headerEnd)) return null;
|
||||||
|
bodyStart = headerEnd + headerTerminator.length;
|
||||||
|
boundaryScanFrom = bodyStart;
|
||||||
|
}
|
||||||
|
|
||||||
|
const available = length - bodyStart;
|
||||||
|
if (available >= jpegStart.length) {
|
||||||
|
if (
|
||||||
|
!buffer
|
||||||
|
.subarray(bodyStart, bodyStart + jpegStart.length)
|
||||||
|
.equals(jpegStart)
|
||||||
|
)
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const nextDelimiter = Buffer.concat([lineEnd, delimiter]);
|
||||||
|
const nextPart = buffer
|
||||||
|
.subarray(0, length)
|
||||||
|
.indexOf(nextDelimiter, boundaryScanFrom);
|
||||||
|
if (declaredLength !== null) {
|
||||||
|
if (nextPart >= bodyStart && nextPart - bodyStart < declaredLength)
|
||||||
|
return null;
|
||||||
|
if (available >= declaredLength)
|
||||||
|
return asJpeg(buffer.subarray(bodyStart, bodyStart + declaredLength));
|
||||||
|
} else if (nextPart >= bodyStart) {
|
||||||
|
const frame = buffer.subarray(bodyStart, nextPart);
|
||||||
|
return frame.length > frameMax ? null : asJpeg(frame);
|
||||||
|
} else if (available > frameMax) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (nextPart < 0)
|
||||||
|
boundaryScanFrom = Math.max(
|
||||||
|
bodyStart,
|
||||||
|
length - nextDelimiter.length + 1,
|
||||||
|
);
|
||||||
|
if (overflow) return null;
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (reader) {
|
||||||
|
try {
|
||||||
|
await reader.cancel();
|
||||||
|
} catch {
|
||||||
|
/* already closed or aborted */
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
reader.releaseLock();
|
||||||
|
} catch {
|
||||||
|
/* already released */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Fetch one upstream CCTV image within the frame-refresh budget.
|
* Fetch one upstream CCTV image within the frame-refresh budget.
|
||||||
*
|
*
|
||||||
@@ -633,6 +853,10 @@ export function cctvUpstreamUserAgent(url) {
|
|||||||
* @param {typeof fetch} [options.fetchImpl=fetch] - Fetch implementation.
|
* @param {typeof fetch} [options.fetchImpl=fetch] - Fetch implementation.
|
||||||
* @param {number} [options.timeoutMs=CCTV_FRAME_FETCH_TIMEOUT_MS] - Abort timeout.
|
* @param {number} [options.timeoutMs=CCTV_FRAME_FETCH_TIMEOUT_MS] - Abort timeout.
|
||||||
* @param {number} [options.maxBytes=CCTV_FRAME_MAX_BODY_BYTES] - Snapshot byte cap.
|
* @param {number} [options.maxBytes=CCTV_FRAME_MAX_BODY_BYTES] - Snapshot byte cap.
|
||||||
|
* @param {boolean} [options.allowMjpeg=false] - Accept a multipart MJPEG
|
||||||
|
* answer and keep its first JPEG. Only sources registered as MJPEG stills
|
||||||
|
* (the Taiwan Highway Bureau feeds) set it; any other host answering
|
||||||
|
* multipart falls through to the next fallback.
|
||||||
* @returns {Promise<{ok:true,body:Buffer,contentType:string}|null>}
|
* @returns {Promise<{ok:true,body:Buffer,contentType:string}|null>}
|
||||||
*/
|
*/
|
||||||
export async function fetchCctvImageFromUpstream(
|
export async function fetchCctvImageFromUpstream(
|
||||||
@@ -641,6 +865,7 @@ export async function fetchCctvImageFromUpstream(
|
|||||||
fetchImpl = fetch,
|
fetchImpl = fetch,
|
||||||
timeoutMs = CCTV_FRAME_FETCH_TIMEOUT_MS,
|
timeoutMs = CCTV_FRAME_FETCH_TIMEOUT_MS,
|
||||||
maxBytes = CCTV_FRAME_MAX_BODY_BYTES,
|
maxBytes = CCTV_FRAME_MAX_BODY_BYTES,
|
||||||
|
allowMjpeg = false,
|
||||||
} = {},
|
} = {},
|
||||||
) {
|
) {
|
||||||
if (!url || !/^https?:\/\//i.test(url)) return null;
|
if (!url || !/^https?:\/\//i.test(url)) return null;
|
||||||
@@ -660,10 +885,7 @@ export async function fetchCctvImageFromUpstream(
|
|||||||
fetchImpl,
|
fetchImpl,
|
||||||
);
|
);
|
||||||
if (!upstream) return null;
|
if (!upstream) return null;
|
||||||
const contentType = cctvRasterImageType(
|
if (!upstream.ok) {
|
||||||
upstream.headers.get('content-type'),
|
|
||||||
);
|
|
||||||
if (!upstream.ok || !contentType) {
|
|
||||||
try {
|
try {
|
||||||
await upstream.body?.cancel();
|
await upstream.body?.cancel();
|
||||||
} catch {
|
} catch {
|
||||||
@@ -671,9 +893,24 @@ export async function fetchCctvImageFromUpstream(
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
const upstreamType = upstream.headers.get('content-type');
|
||||||
|
const contentType = cctvRasterImageType(upstreamType);
|
||||||
|
if (contentType) {
|
||||||
const body = await readCappedResponseBytes(upstream, maxBytes);
|
const body = await readCappedResponseBytes(upstream, maxBytes);
|
||||||
if (!body) return null;
|
if (!body) return null;
|
||||||
return { ok: true, body, contentType };
|
return { ok: true, body, contentType };
|
||||||
|
}
|
||||||
|
if (!allowMjpeg || !cctvLiveMediaType('mjpeg', upstreamType)) {
|
||||||
|
try {
|
||||||
|
await upstream.body?.cancel();
|
||||||
|
} catch {
|
||||||
|
/* no-op */
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const body = await readFirstMjpegFrame(upstream, maxBytes);
|
||||||
|
if (!body) return null;
|
||||||
|
return { ok: true, body, contentType: 'image/jpeg' };
|
||||||
} catch {
|
} catch {
|
||||||
return null;
|
return null;
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -460,6 +460,17 @@ export function isLikelyCataloniaCoordinate(lat, lon) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Iceland bounding box (mainland and nearby islands, with a margin). */
|
||||||
|
export function isLikelyIcelandCoordinate(lat, lon) {
|
||||||
|
return (
|
||||||
|
isPlausibleLatLon(lat, lon) &&
|
||||||
|
lat >= 63.0 &&
|
||||||
|
lat <= 66.7 &&
|
||||||
|
lon >= -25.0 &&
|
||||||
|
lon <= -13.0
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decode numeric HTML character references, decimal ("í") and hex
|
* Decode numeric HTML character references, decimal ("í") and hex
|
||||||
* ("í") alike, the entity form the Catalonia feed uses for accented
|
* ("í") alike, the entity form the Catalonia feed uses for accented
|
||||||
@@ -639,6 +650,10 @@ export function normalizeSourceItem(item) {
|
|||||||
feedType: normalizeFeedType(item.feedType || item.type || ''),
|
feedType: normalizeFeedType(item.feedType || item.type || ''),
|
||||||
url: typeof item.url === 'string' ? item.url : '',
|
url: typeof item.url === 'string' ? item.url : '',
|
||||||
snapshotUrl: typeof item.snapshotUrl === 'string' ? item.snapshotUrl : '',
|
snapshotUrl: typeof item.snapshotUrl === 'string' ? item.snapshotUrl : '',
|
||||||
|
frameRefreshMs: toFiniteNumber(item.frameRefreshMs),
|
||||||
|
sourceUrl: typeof item.sourceUrl === 'string' ? item.sourceUrl : '',
|
||||||
|
accuracyM: toFiniteNumber(item.accuracyM),
|
||||||
|
positionSource: String(item.positionSource || ''),
|
||||||
license: String(item.license || item.licenseNote || ''),
|
license: String(item.license || item.licenseNote || ''),
|
||||||
// Per-camera attribution for feeds a partner supplies inside a pack
|
// Per-camera attribution for feeds a partner supplies inside a pack
|
||||||
// (DriveBC: TransLink, city cameras). Shown beside the provider.
|
// (DriveBC: TransLink, city cameras). Shown beside the provider.
|
||||||
|
|||||||
@@ -0,0 +1,185 @@
|
|||||||
|
import {
|
||||||
|
CCTV_SOURCE_FETCH_TIMEOUT_MS,
|
||||||
|
DEFAULT_OTTAWA_MAX_SOURCES,
|
||||||
|
OTTAWA_ANCHORS,
|
||||||
|
OTTAWA_API_USER_ID,
|
||||||
|
OTTAWA_CAMERAS_URL,
|
||||||
|
OTTAWA_FRAME_REFRESH_MS,
|
||||||
|
OTTAWA_IMAGE_ORIGIN,
|
||||||
|
OTTAWA_IMAGE_URL,
|
||||||
|
} from './constants.js';
|
||||||
|
import {
|
||||||
|
fallbackHeadingFromId,
|
||||||
|
pinnedCameraUrl,
|
||||||
|
prioritizeSources,
|
||||||
|
toFiniteNumber,
|
||||||
|
} from './normalize.js';
|
||||||
|
|
||||||
|
let ottawaCertificateMissingLogged = false;
|
||||||
|
|
||||||
|
/** Test hook: let the next missing-certificate skip log again. */
|
||||||
|
export function _resetOttawaCertificateWarningForTest() {
|
||||||
|
ottawaCertificateMissingLogged = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The operator's Traffic Camera Images API certificate, trimmed. */
|
||||||
|
function ottawaCertificate(env = process.env) {
|
||||||
|
return String(env.OTTAWA_CAMERA_CERTIFICATE ?? '').trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add the operator's certificate to a registered keyless Ottawa frame URL.
|
||||||
|
* Only a URL inside the pinned `/opendata/` directory with a numeric camera
|
||||||
|
* number is signed, so the certificate never goes to any other path or host.
|
||||||
|
*
|
||||||
|
* @param {string} url - Canonical frame URL from the catalog.
|
||||||
|
* @param {Record<string,string|undefined>} [env]
|
||||||
|
* @returns {string} The signed URL, or '' when there is no certificate or the
|
||||||
|
* URL is not a registered Ottawa frame.
|
||||||
|
*/
|
||||||
|
export function ottawaAuthorizedFrameUrl(url, env = process.env) {
|
||||||
|
const certificate = ottawaCertificate(env);
|
||||||
|
const pinned = pinnedCameraUrl(url, OTTAWA_IMAGE_ORIGIN);
|
||||||
|
if (!certificate || !pinned) return '';
|
||||||
|
const parsed = new URL(pinned);
|
||||||
|
const cameraNumber = parsed.searchParams.get('c') || '';
|
||||||
|
if (parsed.pathname !== '/opendata/camera' || !/^\d+$/.test(cameraNumber))
|
||||||
|
return '';
|
||||||
|
const signed = new URL(OTTAWA_IMAGE_URL(cameraNumber));
|
||||||
|
signed.searchParams.set('certificate', certificate);
|
||||||
|
signed.searchParams.set('id', OTTAWA_API_USER_ID);
|
||||||
|
return signed.href;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* City of Ottawa envelope: Kanata to Orléans, Barrhaven to the river, with
|
||||||
|
* slack for the MTO cameras on the 416/417 that the city feed also carries.
|
||||||
|
*/
|
||||||
|
const OTTAWA_BOUNDS = Object.freeze({
|
||||||
|
minLat: 45.1,
|
||||||
|
maxLat: 45.65,
|
||||||
|
minLon: -76.2,
|
||||||
|
maxLon: -75.1,
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Whether a point is inside the city feed's service area. */
|
||||||
|
function isOttawaCoordinate(lat, lon) {
|
||||||
|
return (
|
||||||
|
Number.isFinite(lat) &&
|
||||||
|
Number.isFinite(lon) &&
|
||||||
|
lat >= OTTAWA_BOUNDS.minLat &&
|
||||||
|
lat <= OTTAWA_BOUNDS.maxLat &&
|
||||||
|
lon >= OTTAWA_BOUNDS.minLon &&
|
||||||
|
lon <= OTTAWA_BOUNDS.maxLon
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load the City of Ottawa's traffic cameras.
|
||||||
|
*
|
||||||
|
* Camera images come from the city's Traffic Camera Images API, which needs a
|
||||||
|
* certificate from the city's registration form (OTTAWA_CAMERA_CERTIFICATE)
|
||||||
|
* and allows one fetch per camera per minute for a certificate and user id.
|
||||||
|
* Without a certificate the pack is skipped, with no request and one log line.
|
||||||
|
* The camera list is the documented `map/service/camera` JSON: a camera
|
||||||
|
* number, English and French names, coordinates and the owner (CITY or MTO).
|
||||||
|
* The feed carries no bearing, no elevation and no status field, so headings
|
||||||
|
* use the same deterministic low-confidence fallback as the other
|
||||||
|
* heading-less packs and the client's ground snap refines the elevation
|
||||||
|
* prior.
|
||||||
|
*
|
||||||
|
* @param {object} [_options]
|
||||||
|
* @param {Record<string,string|undefined>} [env]
|
||||||
|
* @returns {Promise<Array<object>>} Cameras nearest downtown first, or [] on
|
||||||
|
* a missing certificate or any upstream or payload failure.
|
||||||
|
*/
|
||||||
|
export async function loadOttawaSourcesFromOpenData(
|
||||||
|
_options = {},
|
||||||
|
env = process.env,
|
||||||
|
) {
|
||||||
|
if (!ottawaCertificate(env)) {
|
||||||
|
if (!ottawaCertificateMissingLogged) {
|
||||||
|
ottawaCertificateMissingLogged = true;
|
||||||
|
console.warn(
|
||||||
|
'[CCTV] Ottawa cameras skipped: the city camera image API needs a certificate (set OTTAWA_CAMERA_CERTIFICATE)',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const resp = await fetch(OTTAWA_CAMERAS_URL, {
|
||||||
|
headers: { Accept: 'application/json' },
|
||||||
|
signal: AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS),
|
||||||
|
});
|
||||||
|
if (!resp.ok) {
|
||||||
|
console.warn('[CCTV] Ottawa camera download failed:', resp.status);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
const payload = await resp.json();
|
||||||
|
const rows = Array.isArray(payload?.cameras) ? payload.cameras : null;
|
||||||
|
if (!rows) return [];
|
||||||
|
|
||||||
|
const cameras = [];
|
||||||
|
const seen = new Set();
|
||||||
|
for (const row of rows) {
|
||||||
|
const number = toFiniteNumber(row?.camera_number);
|
||||||
|
if (!Number.isSafeInteger(number) || number <= 0 || seen.has(number))
|
||||||
|
continue;
|
||||||
|
const lat = toFiniteNumber(row?.latitude);
|
||||||
|
const lon = toFiniteNumber(row?.longitude);
|
||||||
|
if (!isOttawaCoordinate(lat, lon)) continue;
|
||||||
|
seen.add(number);
|
||||||
|
|
||||||
|
const cameraId = `ottawa-${number}`;
|
||||||
|
const imageUrl = OTTAWA_IMAGE_URL(number);
|
||||||
|
// The docs name the field camera_owner; the live feed sends cameraOwner.
|
||||||
|
const owner = String(row?.camera_owner || row?.cameraOwner || '')
|
||||||
|
.trim()
|
||||||
|
.toUpperCase();
|
||||||
|
cameras.push({
|
||||||
|
id: cameraId,
|
||||||
|
name: String(row?.name || '').trim() || `Ottawa camera ${number}`,
|
||||||
|
city: 'Ottawa',
|
||||||
|
cityId: 'ottawa',
|
||||||
|
provider: 'City of Ottawa',
|
||||||
|
lat,
|
||||||
|
lon,
|
||||||
|
headingDeg: fallbackHeadingFromId(cameraId),
|
||||||
|
headingConfidence: 'low',
|
||||||
|
pitchDeg: -18,
|
||||||
|
fovDeg: 44,
|
||||||
|
rangeM: 145,
|
||||||
|
mountHeightM: 8,
|
||||||
|
groundElevationM: 0,
|
||||||
|
feedType: 'image',
|
||||||
|
url: imageUrl,
|
||||||
|
snapshotUrl: imageUrl,
|
||||||
|
frameRefreshMs: OTTAWA_FRAME_REFRESH_MS,
|
||||||
|
sourceKind: 'ottawa-traffic',
|
||||||
|
license: 'City of Ottawa Traffic Camera Images API (registered access)',
|
||||||
|
credit:
|
||||||
|
owner === 'MTO'
|
||||||
|
? 'Ministry of Transportation of Ontario (MTO) camera'
|
||||||
|
: '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const maxRaw = Number(
|
||||||
|
process.env.CCTV_OTTAWA_MAX_SOURCES || DEFAULT_OTTAWA_MAX_SOURCES,
|
||||||
|
);
|
||||||
|
const maxCount = Number.isFinite(maxRaw)
|
||||||
|
? Math.max(8, Math.min(500, Math.floor(maxRaw)))
|
||||||
|
: DEFAULT_OTTAWA_MAX_SOURCES;
|
||||||
|
const prioritized = prioritizeSources(cameras, maxCount, OTTAWA_ANCHORS);
|
||||||
|
console.log(
|
||||||
|
`[CCTV] Loaded Ottawa camera sources: ${cameras.length} published (using nearest ${prioritized.length})`,
|
||||||
|
);
|
||||||
|
return prioritized;
|
||||||
|
} catch (error) {
|
||||||
|
console.warn(
|
||||||
|
'[CCTV] Ottawa camera download error:',
|
||||||
|
error?.message || error,
|
||||||
|
);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
import fs from 'node:fs';
|
||||||
|
import path from 'node:path';
|
||||||
|
import { cameraDisplayCode, fallbackHeadingFromId } from './normalize.js';
|
||||||
|
|
||||||
|
const QUEBEC_CATALOG_PATH = 'public/quebec-cameras.json';
|
||||||
|
export const QUEBEC_CAMERA_SOURCE_COUNT = 1120;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the operator opted in to the browser-direct Québec 511 video. Off by
|
||||||
|
* default: the camera locations are CC BY 4.0, but whether Québec 511's
|
||||||
|
* service terms allow another site to embed its clips is unconfirmed, so an
|
||||||
|
* unset flag lists the cameras with a link to the 511 viewer page only.
|
||||||
|
*/
|
||||||
|
export function quebecBrowserVideoEnabled(env = process.env) {
|
||||||
|
return String(env.CCTV_QUEBEC_VIDEO_ENABLED || '').trim() === '1';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Build the direct browser-only MP4 URL for one namespaced MTQ camera id. */
|
||||||
|
export function quebec511VideoUrl(cameraId) {
|
||||||
|
const match = /^qc-511-(\d+)$/.exec(String(cameraId || ''));
|
||||||
|
return match
|
||||||
|
? `https://www.quebec511.info/Carte/Fenetres/camera.ashx?id=${match[1]}&format=mp4`
|
||||||
|
: '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeViewerUrl(value) {
|
||||||
|
try {
|
||||||
|
const url = new URL(String(value || ''));
|
||||||
|
return url.protocol === 'https:' && !url.username && !url.password
|
||||||
|
? url.href
|
||||||
|
: '';
|
||||||
|
} catch {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function sourceId(camera) {
|
||||||
|
const id = String(camera?.id || '').trim();
|
||||||
|
if (camera?.kind === 'traffic' && /^\d+$/.test(id)) return `qc-511-${id}`;
|
||||||
|
if (camera?.kind === 'montreal' && /^mtl-\d+(?:-\d+)*$/.test(id))
|
||||||
|
return `qc-mtl-${id.slice(4)}`;
|
||||||
|
if (camera?.kind === 'webcam' && /^web-\d+$/.test(id))
|
||||||
|
return `qc-web-${id.slice(4)}`;
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read the checked-in, no-key Québec location catalog and adapt it to the
|
||||||
|
* regular CCTV source schema. MTQ video stays browser-only; other rows link to
|
||||||
|
* their operator page because this dataset has no direct image URL for them.
|
||||||
|
*/
|
||||||
|
export function loadQuebecSources({ sourceRoot = process.cwd() } = {}) {
|
||||||
|
const filename = path.resolve(sourceRoot, QUEBEC_CATALOG_PATH);
|
||||||
|
let cameras;
|
||||||
|
try {
|
||||||
|
const payload = JSON.parse(fs.readFileSync(filename, 'utf8'));
|
||||||
|
cameras = Array.isArray(payload?.cameras) ? payload.cameras : [];
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('[CCTV] Québec camera catalog unavailable:', error?.message);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
const sources = [];
|
||||||
|
const seen = new Set();
|
||||||
|
for (const camera of cameras) {
|
||||||
|
const id = sourceId(camera);
|
||||||
|
const lat = Number(camera.lat);
|
||||||
|
const lon = Number(camera.lon);
|
||||||
|
if (
|
||||||
|
!id ||
|
||||||
|
seen.has(id) ||
|
||||||
|
!Number.isFinite(lat) ||
|
||||||
|
!Number.isFinite(lon) ||
|
||||||
|
lat < 44.9 ||
|
||||||
|
lat > 62.6 ||
|
||||||
|
lon < -79.9 ||
|
||||||
|
lon > -57.1
|
||||||
|
)
|
||||||
|
continue;
|
||||||
|
seen.add(id);
|
||||||
|
|
||||||
|
const name = String(camera.nameEn || camera.name || id).trim();
|
||||||
|
const isTraffic = camera.kind === 'traffic';
|
||||||
|
const isMontreal = camera.kind === 'montreal';
|
||||||
|
const sourceKind = isTraffic
|
||||||
|
? 'quebec-511-browser'
|
||||||
|
: isMontreal
|
||||||
|
? 'quebec-montreal-osm'
|
||||||
|
: 'quebec-webcam-link';
|
||||||
|
const provider = isTraffic
|
||||||
|
? 'Québec 511 / MTQ'
|
||||||
|
: isMontreal
|
||||||
|
? 'Ville de Montréal / OpenStreetMap'
|
||||||
|
: String(camera.operator || 'Québec webcam');
|
||||||
|
|
||||||
|
sources.push({
|
||||||
|
id,
|
||||||
|
name: name.slice(0, 180),
|
||||||
|
city: String(camera.region || 'Québec'),
|
||||||
|
cityId: 'quebec',
|
||||||
|
provider,
|
||||||
|
lat,
|
||||||
|
lon,
|
||||||
|
headingDeg: fallbackHeadingFromId(id),
|
||||||
|
headingConfidence: 'low',
|
||||||
|
pitchDeg: -18,
|
||||||
|
fovDeg: 74,
|
||||||
|
rangeM: 400,
|
||||||
|
mountHeightM: 8,
|
||||||
|
groundElevationM: 0,
|
||||||
|
feedType: 'image',
|
||||||
|
// No frame URL is registered: the server never fetches 511 media. With
|
||||||
|
// CCTV_QUEBEC_VIDEO_ENABLED=1 the browser plays the 511 MP4 in the DOM
|
||||||
|
// overlay after a play click; otherwise the camera links to 511.
|
||||||
|
url: '',
|
||||||
|
snapshotUrl: '',
|
||||||
|
sourceKind,
|
||||||
|
sourceUrl: safeViewerUrl(camera.viewerUrl),
|
||||||
|
accuracyM: Number.isFinite(Number(camera.accuracyM))
|
||||||
|
? Number(camera.accuracyM)
|
||||||
|
: null,
|
||||||
|
positionSource: String(camera.positionSource || ''),
|
||||||
|
license: isTraffic
|
||||||
|
? 'Locations: Données Québec / MTQ, CC BY 4.0. Video: hosted by Québec 511 under its terms of use'
|
||||||
|
: isMontreal
|
||||||
|
? 'OpenStreetMap contributors, ODbL 1.0'
|
||||||
|
: 'Operator terms apply; location provenance shown per camera',
|
||||||
|
credit: isTraffic
|
||||||
|
? 'Locations: MTQ · CC BY 4.0 · Video: Québec 511'
|
||||||
|
: isMontreal
|
||||||
|
? 'OpenStreetMap contributors · ODbL'
|
||||||
|
: provider,
|
||||||
|
code: cameraDisplayCode(name.toUpperCase()),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return sources;
|
||||||
|
}
|
||||||
@@ -134,6 +134,12 @@ import {
|
|||||||
HOUSTON_MAX_CATALOG_BYTES,
|
HOUSTON_MAX_CATALOG_BYTES,
|
||||||
HOUSTON_GROUND_ELEVATION_M,
|
HOUSTON_GROUND_ELEVATION_M,
|
||||||
HOUSTON_ANCHORS,
|
HOUSTON_ANCHORS,
|
||||||
|
ICELAND_CAMERAS_URL,
|
||||||
|
ICELAND_IMAGE_ORIGIN,
|
||||||
|
ICELAND_MAX_CATALOG_BYTES,
|
||||||
|
ICELAND_GROUND_ELEVATION_M,
|
||||||
|
DEFAULT_ICELAND_MAX_SOURCES,
|
||||||
|
ICELAND_ANCHORS,
|
||||||
} from './constants.js';
|
} from './constants.js';
|
||||||
import {
|
import {
|
||||||
toFiniteNumber,
|
toFiniteNumber,
|
||||||
@@ -152,6 +158,7 @@ import {
|
|||||||
isLikelyCalgaryCoordinate,
|
isLikelyCalgaryCoordinate,
|
||||||
isLikelyFloridaCoordinate,
|
isLikelyFloridaCoordinate,
|
||||||
isLikelyCataloniaCoordinate,
|
isLikelyCataloniaCoordinate,
|
||||||
|
isLikelyIcelandCoordinate,
|
||||||
decodeNumericEntities,
|
decodeNumericEntities,
|
||||||
isLikelyNycCoordinate,
|
isLikelyNycCoordinate,
|
||||||
isLikelyHoustonCoordinate,
|
isLikelyHoustonCoordinate,
|
||||||
@@ -2029,6 +2036,174 @@ export async function loadCataloniaSourcesFromOpenData() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compass headings for Icelandic direction words, as they appear after "til"
|
||||||
|
* (genitive: "til vesturs"), "í" (accusative: "í vestur") or "séð" ("seen",
|
||||||
|
* as in "séð austur").
|
||||||
|
*/
|
||||||
|
const ICELAND_DIRECTION_HEADINGS = {
|
||||||
|
norður: 0,
|
||||||
|
norðaustur: 45,
|
||||||
|
austur: 90,
|
||||||
|
suðaustur: 135,
|
||||||
|
suður: 180,
|
||||||
|
suðvestur: 225,
|
||||||
|
vestur: 270,
|
||||||
|
norðvestur: 315,
|
||||||
|
};
|
||||||
|
const ICELAND_DIRECTION_WORD =
|
||||||
|
'(norðaustur|norðvestur|suðaustur|suðvestur|norður|suður|austur|vestur)s?';
|
||||||
|
/** A facing, plus a second one joined by "og" ("til austurs og vesturs"). */
|
||||||
|
const ICELAND_DIRECTION_RE = new RegExp(
|
||||||
|
`(?<![\\p{L}])(?:til|í|séð)\\s+${ICELAND_DIRECTION_WORD}` +
|
||||||
|
`(?:\\s+og\\s+(?:til\\s+|í\\s+)?${ICELAND_DIRECTION_WORD})?(?![\\p{L}])`,
|
||||||
|
'gu',
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The compass heading an Icelandic view description states, or NaN. Only an
|
||||||
|
* explicit "til <átt>", "í <átt>" or "séð <átt>" counts: a bare place name or
|
||||||
|
* a road direction ("Miklabraut austur") is not a facing. A description naming
|
||||||
|
* two different directions ("til norðurs og til suðurs", "til austurs og
|
||||||
|
* vesturs") is ambiguous and yields NaN, and "niður á veg" (down onto the
|
||||||
|
* road) states none.
|
||||||
|
*
|
||||||
|
* @param {string} text - The feed's `Skyring` field.
|
||||||
|
* @returns {number} Heading in degrees [0..360), or NaN.
|
||||||
|
*/
|
||||||
|
export function icelandHeadingFromDescription(text) {
|
||||||
|
const headings = new Set();
|
||||||
|
for (const match of String(text || '')
|
||||||
|
.toLowerCase()
|
||||||
|
.matchAll(ICELAND_DIRECTION_RE)) {
|
||||||
|
for (const word of [match[1], match[2]]) {
|
||||||
|
if (word) headings.add(ICELAND_DIRECTION_HEADINGS[word]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return headings.size === 1 ? headings.values().next().value : NaN;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One Vegagerðin camera row -> one catalog source, or null. A row is one camera
|
||||||
|
* view; a station (`Maelist_nr`) carries several. The id comes from the frame
|
||||||
|
* file name, which is unique per view in the live feed.
|
||||||
|
*
|
||||||
|
* @param {object} row - Element of the `vefmyndavelar2014_1` array.
|
||||||
|
* @returns {?object}
|
||||||
|
*/
|
||||||
|
export function icelandCameraToSource(row) {
|
||||||
|
const url = pinnedCameraUrl(row?.Slod, ICELAND_IMAGE_ORIGIN);
|
||||||
|
if (!url || !/\.jpe?g$/i.test(new URL(url).pathname)) return null;
|
||||||
|
// Numbers only: Number(null) and Number('') are 0.
|
||||||
|
const lat = typeof row.Breidd === 'number' ? row.Breidd : NaN;
|
||||||
|
const lon = typeof row.Lengd === 'number' ? row.Lengd : NaN;
|
||||||
|
if (!isLikelyIcelandCoordinate(lat, lon)) return null;
|
||||||
|
const stem = new URL(url).pathname
|
||||||
|
.slice(new URL(ICELAND_IMAGE_ORIGIN).pathname.length)
|
||||||
|
.replace(/\.jpe?g$/i, '')
|
||||||
|
.toLowerCase();
|
||||||
|
if (!/^[a-z0-9_-]+$/.test(stem)) return null;
|
||||||
|
const cameraId = `is-vegagerdin-${stem}`;
|
||||||
|
const description = String(row.Skyring || '')
|
||||||
|
.replace(/\s+/g, ' ')
|
||||||
|
// Letter lookarounds, not \b: \b is ASCII-only and would join "Þverá
|
||||||
|
// Árnessýslu" while missing "séð séð".
|
||||||
|
.replace(/(?<!\p{L})(\p{L}+) \1(?!\p{L})/giu, '$1')
|
||||||
|
.trim();
|
||||||
|
const station = String(row.Myndavel || '').trim();
|
||||||
|
const heading = icelandHeadingFromDescription(description);
|
||||||
|
const hasHeading = Number.isFinite(heading);
|
||||||
|
return {
|
||||||
|
id: cameraId,
|
||||||
|
name: description || station || `Vegagerðin ${row.Maelist_nr ?? stem}`,
|
||||||
|
city: 'Iceland',
|
||||||
|
cityId: 'iceland',
|
||||||
|
provider: 'Vegagerðin (IRCA)',
|
||||||
|
lat,
|
||||||
|
lon,
|
||||||
|
headingDeg: hasHeading ? heading : fallbackHeadingFromId(cameraId),
|
||||||
|
headingConfidence: hasHeading ? 'high' : 'low',
|
||||||
|
pitchDeg: hasHeading ? -24 : -18,
|
||||||
|
fovDeg: hasHeading ? 56 : 44,
|
||||||
|
rangeM: hasHeading ? 210 : 145,
|
||||||
|
mountHeightM: hasHeading ? 10 : 8,
|
||||||
|
groundElevationM: ICELAND_GROUND_ELEVATION_M,
|
||||||
|
feedType: 'image',
|
||||||
|
url,
|
||||||
|
snapshotUrl: url,
|
||||||
|
sourceKind: 'iceland-vegagerdin',
|
||||||
|
license:
|
||||||
|
'Icelandic Road and Coastal Administration (IRCA) — road camera images, CC BY 4.0',
|
||||||
|
code: cameraDisplayCode(station.toUpperCase() || description),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch Icelandic road cameras (Vegagerðin / IRCA), keyless: one JSON list.
|
||||||
|
* Frames are stills on the IRCA host and the loader registers only links
|
||||||
|
* inside that host's camera directory (ICELAND_IMAGE_ORIGIN). The list decides
|
||||||
|
* ids, coordinates, labels and which frame path is proxied, so it is fetched
|
||||||
|
* over https, redirects are refused and the body read is capped at
|
||||||
|
* ICELAND_MAX_CATALOG_BYTES.
|
||||||
|
*
|
||||||
|
* @returns {Promise<Array<object>>} Normalized camera source objects.
|
||||||
|
*/
|
||||||
|
export async function loadIcelandSourcesFromOpenData() {
|
||||||
|
try {
|
||||||
|
const resp = await fetch(ICELAND_CAMERAS_URL, {
|
||||||
|
headers: {
|
||||||
|
Accept: 'application/json',
|
||||||
|
'User-Agent': 'gods-eye-view-cctv-proxy/1.0',
|
||||||
|
},
|
||||||
|
redirect: 'manual',
|
||||||
|
signal: AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS),
|
||||||
|
});
|
||||||
|
// A response this loader will not read still owns its transport until the
|
||||||
|
// body is released, so every rejection path cancels before returning.
|
||||||
|
const discard = async () => {
|
||||||
|
try {
|
||||||
|
await resp.body?.cancel();
|
||||||
|
} catch {
|
||||||
|
/* no-op */
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
};
|
||||||
|
if (resp.status >= 300 && resp.status < 400) {
|
||||||
|
console.warn(
|
||||||
|
'[CCTV] Iceland catalog redirected; redirects are not followed',
|
||||||
|
);
|
||||||
|
return discard();
|
||||||
|
}
|
||||||
|
if (!resp.ok) {
|
||||||
|
console.warn('[CCTV] Iceland camera download failed:', resp.status);
|
||||||
|
return discard();
|
||||||
|
}
|
||||||
|
const body = await readResponseJsonCapped(resp, ICELAND_MAX_CATALOG_BYTES);
|
||||||
|
const rows = Array.isArray(body) ? body : [];
|
||||||
|
const cameras = rows.map(icelandCameraToSource).filter(Boolean);
|
||||||
|
const unique = Array.from(
|
||||||
|
new Map(cameras.map((camera) => [camera.id, camera])).values(),
|
||||||
|
);
|
||||||
|
const maxRaw = Number(
|
||||||
|
process.env.CCTV_ICELAND_MAX_SOURCES || DEFAULT_ICELAND_MAX_SOURCES,
|
||||||
|
);
|
||||||
|
const maxCount = Number.isFinite(maxRaw)
|
||||||
|
? Math.max(8, Math.min(600, Math.floor(maxRaw)))
|
||||||
|
: DEFAULT_ICELAND_MAX_SOURCES;
|
||||||
|
const prioritized = prioritizeSources(unique, maxCount, ICELAND_ANCHORS);
|
||||||
|
console.log(
|
||||||
|
`[CCTV] Loaded Iceland camera sources: ${unique.length} (using nearest ${prioritized.length})`,
|
||||||
|
);
|
||||||
|
return prioritized;
|
||||||
|
} catch (error) {
|
||||||
|
console.warn(
|
||||||
|
'[CCTV] Iceland camera download error:',
|
||||||
|
error?.message || error,
|
||||||
|
);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read one XML child tag's text from an `<image>` block.
|
* Read one XML child tag's text from an `<image>` block.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -5,7 +5,9 @@ export const HLS_LIMITS = Object.freeze({
|
|||||||
sessions: 2,
|
sessions: 2,
|
||||||
leasesPerSession: 8,
|
leasesPerSession: 8,
|
||||||
playlistBytes: 256 * 1024,
|
playlistBytes: 256 * 1024,
|
||||||
segmentBytes: 4 * 1024 * 1024,
|
// High-resolution cameras can exceed 4 MiB in a single ten-second TS segment.
|
||||||
|
// Retained data still shares the independent 24 MiB session budget below.
|
||||||
|
segmentBytes: 8 * 1024 * 1024,
|
||||||
sessionBytes: 24 * 1024 * 1024,
|
sessionBytes: 24 * 1024 * 1024,
|
||||||
segments: 12,
|
segments: 12,
|
||||||
pollMs: 2000,
|
pollMs: 2000,
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
import { CCTV_SOURCE_FETCH_TIMEOUT_MS } from './constants.js';
|
import {
|
||||||
|
CCTV_SOURCE_FETCH_TIMEOUT_MS,
|
||||||
|
TAIWAN_HIGHWAY_IMAGE_ORIGINS,
|
||||||
|
} from './constants.js';
|
||||||
import {
|
import {
|
||||||
cameraDisplayCode,
|
cameraDisplayCode,
|
||||||
fallbackHeadingFromId,
|
fallbackHeadingFromId,
|
||||||
@@ -10,6 +13,8 @@ import { readResponseTextCapped } from '../common/http.js';
|
|||||||
* standard, published keyless and refreshed daily (~1,800 cameras). */
|
* standard, published keyless and refreshed daily (~1,800 cameras). */
|
||||||
export const TAIWAN_FREEWAY_CCTV_URL =
|
export const TAIWAN_FREEWAY_CCTV_URL =
|
||||||
'https://tisvcloud.freeway.gov.tw/history/motc20/CCTV.xml';
|
'https://tisvcloud.freeway.gov.tw/history/motc20/CCTV.xml';
|
||||||
|
export const TAIWAN_HIGHWAY_CCTV_URL =
|
||||||
|
'https://cctv-maintain.thb.gov.tw/opendataCCTVs.xml';
|
||||||
/** The whole network is ~1.2 MB. */
|
/** The whole network is ~1.2 MB. */
|
||||||
export const TAIWAN_MAX_CATALOG_BYTES = 6 * 1024 * 1024;
|
export const TAIWAN_MAX_CATALOG_BYTES = 6 * 1024 * 1024;
|
||||||
const DEFAULT_TAIWAN_MAX_SOURCES = 600;
|
const DEFAULT_TAIWAN_MAX_SOURCES = 600;
|
||||||
@@ -35,6 +40,9 @@ const STREAM_TO_FRAME = new Map([
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
const DIRECTIONS = { N: 'N', S: 'S', E: 'E', W: 'W' };
|
const DIRECTIONS = { N: 'N', S: 'S', E: 'E', W: 'W' };
|
||||||
|
const TAIWAN_HIGHWAY_CAMERA_HOSTS = new Set(
|
||||||
|
TAIWAN_HIGHWAY_IMAGE_ORIGINS.map((origin) => new URL(origin).hostname),
|
||||||
|
);
|
||||||
|
|
||||||
/** Prioritization anchors, north to south, so a cap keeps the whole island
|
/** Prioritization anchors, north to south, so a cap keeps the whole island
|
||||||
* rather than only greater Taipei. */
|
* rather than only greater Taipei. */
|
||||||
@@ -211,6 +219,74 @@ export function taiwanCameraToSource(row) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One Highway Bureau row -> a source whose first MJPEG frame is served as a
|
||||||
|
* snapshot by the existing camera-frame proxy.
|
||||||
|
*
|
||||||
|
* @param {object} row - Output of parseTaiwanCctvXml.
|
||||||
|
* @returns {?object}
|
||||||
|
*/
|
||||||
|
export function taiwanHighwayCameraToSource(row) {
|
||||||
|
if (!row || typeof row !== 'object') return null;
|
||||||
|
const { lat, lon } = row;
|
||||||
|
if (!isLikelyTaiwanCoordinate(lat, lon)) return null;
|
||||||
|
|
||||||
|
let url;
|
||||||
|
try {
|
||||||
|
url = new URL(String(row.streamUrl ?? ''));
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
url.protocol !== 'https:' ||
|
||||||
|
url.username ||
|
||||||
|
url.password ||
|
||||||
|
url.port ||
|
||||||
|
url.search ||
|
||||||
|
url.hash ||
|
||||||
|
!TAIWAN_HIGHWAY_CAMERA_HOSTS.has(url.hostname) ||
|
||||||
|
!/^\/[A-Za-z0-9._+~-]{1,100}$/.test(url.pathname) ||
|
||||||
|
url.pathname.includes('..')
|
||||||
|
)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
const rawId = String(row.cctvId ?? '').trim();
|
||||||
|
if (!/^[A-Za-z0-9-]{1,80}$/.test(rawId)) return null;
|
||||||
|
const cameraId = 'tw-thb-' + rawId.toLowerCase();
|
||||||
|
const road = String(row.roadName ?? '').trim();
|
||||||
|
const direction = DIRECTIONS[String(row.direction ?? '').trim()] || '';
|
||||||
|
const mile = String(row.mile ?? '').trim();
|
||||||
|
const section = [row.sectionStart, row.sectionEnd]
|
||||||
|
.map((part) => String(part ?? '').trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('→');
|
||||||
|
const name =
|
||||||
|
(road || mile || section
|
||||||
|
? [road, direction, mile, section].filter(Boolean).join(' ')
|
||||||
|
: '') || rawId;
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: cameraId,
|
||||||
|
name: name.slice(0, 160),
|
||||||
|
city: 'Taiwan / 臺灣',
|
||||||
|
cityId: 'taiwan',
|
||||||
|
provider: 'Highway Bureau, MOTC',
|
||||||
|
lat,
|
||||||
|
lon,
|
||||||
|
headingDeg: fallbackHeadingFromId(cameraId),
|
||||||
|
headingConfidence: 'low',
|
||||||
|
pitchDeg: -18,
|
||||||
|
fovDeg: 44,
|
||||||
|
rangeM: 145,
|
||||||
|
mountHeightM: 8,
|
||||||
|
feedType: 'mjpeg',
|
||||||
|
url: url.href,
|
||||||
|
snapshotUrl: url.href,
|
||||||
|
sourceKind: 'taiwan-highway-motc',
|
||||||
|
license: 'Highway Bureau, MOTC open data',
|
||||||
|
code: cameraDisplayCode((road + ' ' + mile).trim().toUpperCase() || rawId),
|
||||||
|
};
|
||||||
|
}
|
||||||
let lastGood = null;
|
let lastGood = null;
|
||||||
let lastGoodAt = 0;
|
let lastGoodAt = 0;
|
||||||
let retryAfter = 0;
|
let retryAfter = 0;
|
||||||
@@ -237,6 +313,49 @@ function taiwanSourceCap() {
|
|||||||
: DEFAULT_TAIWAN_MAX_SOURCES;
|
: DEFAULT_TAIWAN_MAX_SOURCES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Fetch the public provincial-road CCTV table as a no-key fallback. */
|
||||||
|
async function loadTaiwanHighwaySources() {
|
||||||
|
const signal = AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS);
|
||||||
|
const response = await fetch(TAIWAN_HIGHWAY_CCTV_URL, {
|
||||||
|
headers: { Accept: 'application/xml,text/xml' },
|
||||||
|
redirect: 'manual',
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
await response.body?.cancel().catch(() => {});
|
||||||
|
throw new Error(
|
||||||
|
response.status >= 300 && response.status < 400
|
||||||
|
? 'Highway Bureau catalog redirected; redirects are not followed'
|
||||||
|
: 'Highway Bureau catalog HTTP ' + response.status,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const xml = await readResponseTextCapped(
|
||||||
|
response,
|
||||||
|
TAIWAN_MAX_CATALOG_BYTES,
|
||||||
|
signal,
|
||||||
|
);
|
||||||
|
const cameras = new Map();
|
||||||
|
for (const row of parseTaiwanCctvXml(xml)) {
|
||||||
|
const camera = taiwanHighwayCameraToSource(row);
|
||||||
|
if (camera && !cameras.has(camera.id)) cameras.set(camera.id, camera);
|
||||||
|
}
|
||||||
|
if (!cameras.size)
|
||||||
|
throw new Error('no usable Highway Bureau cameras in the table');
|
||||||
|
const sources = prioritizeSources(
|
||||||
|
[...cameras.values()],
|
||||||
|
taiwanSourceCap(),
|
||||||
|
ANCHORS,
|
||||||
|
);
|
||||||
|
console.log(
|
||||||
|
'[CCTV] Loaded Taiwan Highway Bureau fallback: ' +
|
||||||
|
cameras.size +
|
||||||
|
' (using ' +
|
||||||
|
sources.length +
|
||||||
|
')',
|
||||||
|
);
|
||||||
|
return sources;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch Taiwan Freeway Bureau cameras from the keyless MOTC 2.0 XML table.
|
* Fetch Taiwan Freeway Bureau cameras from the keyless MOTC 2.0 XML table.
|
||||||
* One bounded request per shared catalog refresh. A failed download serves the
|
* One bounded request per shared catalog refresh. A failed download serves the
|
||||||
@@ -262,7 +381,7 @@ export async function loadTaiwanSources() {
|
|||||||
throw new Error(
|
throw new Error(
|
||||||
response.status >= 300 && response.status < 400
|
response.status >= 300 && response.status < 400
|
||||||
? 'catalog redirected; redirects are not followed'
|
? 'catalog redirected; redirects are not followed'
|
||||||
: `HTTP ${response.status}`,
|
: 'HTTP ' + response.status,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
const xml = await readResponseTextCapped(
|
const xml = await readResponseTextCapped(
|
||||||
@@ -282,7 +401,11 @@ export async function loadTaiwanSources() {
|
|||||||
ANCHORS,
|
ANCHORS,
|
||||||
);
|
);
|
||||||
console.log(
|
console.log(
|
||||||
`[CCTV] Loaded Taiwan camera sources: ${cameras.size} (using ${sources.length})`,
|
'[CCTV] Loaded Taiwan camera sources: ' +
|
||||||
|
cameras.size +
|
||||||
|
' (using ' +
|
||||||
|
sources.length +
|
||||||
|
')',
|
||||||
);
|
);
|
||||||
lastGood = sources;
|
lastGood = sources;
|
||||||
lastGoodAt = Date.now();
|
lastGoodAt = Date.now();
|
||||||
@@ -291,13 +414,37 @@ export async function loadTaiwanSources() {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
retryAfter = Date.now() + TAIWAN_RETRY_AFTER_FAILURE_MS;
|
retryAfter = Date.now() + TAIWAN_RETRY_AFTER_FAILURE_MS;
|
||||||
const fallback = fallbackSources();
|
const fallback = fallbackSources();
|
||||||
|
if (fallback.length) {
|
||||||
console.warn(
|
console.warn(
|
||||||
`[CCTV] Taiwan camera download failed (${error?.message || error}); ` +
|
'[CCTV] Taiwan Freeway camera download failed (' +
|
||||||
(fallback.length
|
(error?.message || error) +
|
||||||
? `serving the last good ${fallback.length} cameras`
|
'); serving the last good ' +
|
||||||
: 'no Taiwan cameras') +
|
fallback.length +
|
||||||
', next attempt in 1 h',
|
' cameras, next attempt in 1 h',
|
||||||
);
|
);
|
||||||
return fallback;
|
return fallback;
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
const sources = await loadTaiwanHighwaySources();
|
||||||
|
lastGood = sources;
|
||||||
|
lastGoodAt = Date.now();
|
||||||
|
console.warn(
|
||||||
|
'[CCTV] Taiwan Freeway camera download failed (' +
|
||||||
|
(error?.message || error) +
|
||||||
|
'); using ' +
|
||||||
|
sources.length +
|
||||||
|
' Highway Bureau cameras as fallback, next attempt in 1 h',
|
||||||
|
);
|
||||||
|
return sources;
|
||||||
|
} catch (fallbackError) {
|
||||||
|
console.warn(
|
||||||
|
'[CCTV] Taiwan Freeway camera download failed (' +
|
||||||
|
(error?.message || error) +
|
||||||
|
'); Highway Bureau fallback failed (' +
|
||||||
|
(fallbackError?.message || fallbackError) +
|
||||||
|
'); no Taiwan cameras, next attempt in 1 h',
|
||||||
|
);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
import { createHash } from 'node:crypto';
|
||||||
|
import fs from 'node:fs';
|
||||||
|
import path from 'node:path';
|
||||||
|
import {
|
||||||
|
DEFAULT_WORLD_CCTV_SOURCE_FILE,
|
||||||
|
MLIT_RIVER_IMAGE_ORIGIN,
|
||||||
|
TRIPCHECK_IMAGE_ORIGIN,
|
||||||
|
WORLD_CCTV_SOURCE_COUNT,
|
||||||
|
} from './constants.js';
|
||||||
|
import { pinnedCameraUrl } from './normalize.js';
|
||||||
|
|
||||||
|
const SOURCE_POLICIES = Object.freeze({
|
||||||
|
'tripcheck-odot': {
|
||||||
|
idPrefix: 'world-or-',
|
||||||
|
origin: TRIPCHECK_IMAGE_ORIGIN,
|
||||||
|
bounds: [41, 47, -125, -116],
|
||||||
|
filename: /^\/roadcams\/cams\/[^/]+\.jpe?g$/i,
|
||||||
|
frameRefreshMs: 5 * 60 * 1000,
|
||||||
|
},
|
||||||
|
'mlit-river': {
|
||||||
|
idPrefix: 'world-jp-river-',
|
||||||
|
origin: MLIT_RIVER_IMAGE_ORIGIN,
|
||||||
|
bounds: [24, 46, 122, 154],
|
||||||
|
filename: /^\/cam\/now\/\d+\.jpg$/i,
|
||||||
|
// The provider asks clients to avoid frequent repeated image collection.
|
||||||
|
frameRefreshMs: 10 * 60 * 1000,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// MLIT currently serves this fixed JPEG on cameras whose images are paused
|
||||||
|
// for maintenance (verified against two Yamagata cameras on 2026-11-02).
|
||||||
|
const MLIT_ADJUSTMENT_IMAGE_SHA256 =
|
||||||
|
'dbd2c3790eb75edf9ca44162f7979f2a3799090e23f2c5142f63211a035cb191';
|
||||||
|
|
||||||
|
export function isMlitRiverAdjustmentImage(image) {
|
||||||
|
return (
|
||||||
|
image?.ok === true &&
|
||||||
|
Buffer.isBuffer(image.body) &&
|
||||||
|
createHash('sha256').update(image.body).digest('hex') ===
|
||||||
|
MLIT_ADJUSTMENT_IMAGE_SHA256
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeFrameUrl(value, policy) {
|
||||||
|
const normalized = pinnedCameraUrl(value, policy.origin);
|
||||||
|
if (!normalized) return '';
|
||||||
|
const url = new URL(normalized);
|
||||||
|
return !url.search && !url.hash && policy.filename.test(url.pathname)
|
||||||
|
? url.href
|
||||||
|
: '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function inBounds(lat, lon, [minLat, maxLat, minLon, maxLon]) {
|
||||||
|
return (
|
||||||
|
Number.isFinite(lat) &&
|
||||||
|
Number.isFinite(lon) &&
|
||||||
|
lat >= minLat &&
|
||||||
|
lat <= maxLat &&
|
||||||
|
lon >= minLon &&
|
||||||
|
lon <= maxLon
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load only the new image-backed networks from the add-on export. Existing
|
||||||
|
* Canadian networks, Québec entries, JMA placeholder images, and NZTA's
|
||||||
|
* scraped Journey Planner rows are deliberately excluded. Vegagerðin (Iceland)
|
||||||
|
* rows are excluded too: the Iceland pack loads the full live list of those
|
||||||
|
* cameras, so a World copy would draw each one twice.
|
||||||
|
*/
|
||||||
|
export function loadWorldCameraSources({ sourceRoot = process.cwd() } = {}) {
|
||||||
|
const filename = path.resolve(sourceRoot, DEFAULT_WORLD_CCTV_SOURCE_FILE);
|
||||||
|
let rows;
|
||||||
|
try {
|
||||||
|
const payload = JSON.parse(fs.readFileSync(filename, 'utf8'));
|
||||||
|
rows = Array.isArray(payload) ? payload : [];
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('[CCTV] World camera catalog unavailable:', error?.message);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
const seen = new Set();
|
||||||
|
const sources = [];
|
||||||
|
for (const row of rows) {
|
||||||
|
const sourceKind = String(row?.sourceKind || '');
|
||||||
|
const policy = SOURCE_POLICIES[sourceKind];
|
||||||
|
if (!policy) continue;
|
||||||
|
|
||||||
|
const id = String(row.id || '').trim();
|
||||||
|
const lat = Number(row.lat);
|
||||||
|
const lon = Number(row.lon);
|
||||||
|
const url = safeFrameUrl(row.url || row.snapshotUrl, policy);
|
||||||
|
const snapshotUrl = safeFrameUrl(row.snapshotUrl || row.url, policy);
|
||||||
|
if (
|
||||||
|
!id.startsWith(policy.idPrefix) ||
|
||||||
|
seen.has(id) ||
|
||||||
|
!inBounds(lat, lon, policy.bounds) ||
|
||||||
|
!url ||
|
||||||
|
!snapshotUrl ||
|
||||||
|
url !== snapshotUrl
|
||||||
|
)
|
||||||
|
continue;
|
||||||
|
seen.add(id);
|
||||||
|
sources.push({
|
||||||
|
id,
|
||||||
|
name: String(row.name || id)
|
||||||
|
.trim()
|
||||||
|
.slice(0, 180),
|
||||||
|
city: String(row.city || row.country || 'World'),
|
||||||
|
cityId: String(row.cityId || ''),
|
||||||
|
provider: String(row.provider || 'World traffic camera'),
|
||||||
|
lat,
|
||||||
|
lon,
|
||||||
|
headingDeg: Number.isFinite(Number(row.headingDeg))
|
||||||
|
? Number(row.headingDeg)
|
||||||
|
: undefined,
|
||||||
|
headingConfidence: String(row.headingConfidence || 'low'),
|
||||||
|
feedType: 'image',
|
||||||
|
sourceKind,
|
||||||
|
url,
|
||||||
|
snapshotUrl,
|
||||||
|
frameRefreshMs: policy.frameRefreshMs,
|
||||||
|
license: String(row.license || ''),
|
||||||
|
credit: String(row.credit || row.provider || ''),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`[CCTV] Loaded World camera image sources: ${sources.length}/${WORLD_CCTV_SOURCE_COUNT}`,
|
||||||
|
);
|
||||||
|
return sources;
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { resolveCatalogSources } from './sourceComposition.js';
|
import { resolveCatalogSources } from './sourceComposition.js';
|
||||||
import { createWeatherClock } from '../layers/weather/clock.js';
|
import { createWeatherClock } from '../layers/weather/clock.js';
|
||||||
|
import { worldClock } from '../time/worldClock.js';
|
||||||
import { createWeatherLayer } from '../layers/weather/index.js';
|
import { createWeatherLayer } from '../layers/weather/index.js';
|
||||||
import { createApplicationCyclones } from './layers/cyclones.js';
|
import { createApplicationCyclones } from './layers/cyclones.js';
|
||||||
import { createWindLayer } from '../layers/wind/index.js';
|
import { createWindLayer } from '../layers/wind/index.js';
|
||||||
@@ -78,7 +79,7 @@ export function createApplicationCatalog({
|
|||||||
const sourceComposition = resolveCatalogSources(sources);
|
const sourceComposition = resolveCatalogSources(sources);
|
||||||
sources = sourceComposition.sources;
|
sources = sourceComposition.sources;
|
||||||
const militaryRegistry = createMilitaryRegistry();
|
const militaryRegistry = createMilitaryRegistry();
|
||||||
const weatherClock = createWeatherClock();
|
const weatherClock = createWeatherClock({ world: worldClock });
|
||||||
const dispose = () => {
|
const dispose = () => {
|
||||||
signal.removeEventListener('abort', dispose);
|
signal.removeEventListener('abort', dispose);
|
||||||
militaryRegistry.dispose();
|
militaryRegistry.dispose();
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
import { createGnssIntegrityLayer } from '../../layers/gnss/index.js';
|
import { createGnssIntegrityLayer } from '../../layers/gnss/index.js';
|
||||||
|
import { worldTimeFor } from '../../time/worldClock.js';
|
||||||
|
|
||||||
/** Wire the adsb.lol GNSS navigation-integrity layer into the application catalog. */
|
/** Wire the adsb.lol GNSS navigation-integrity layer into the application catalog. */
|
||||||
export function createApplicationGnssIntegrity(options) {
|
export function createApplicationGnssIntegrity(options) {
|
||||||
return createGnssIntegrityLayer(options);
|
return createGnssIntegrityLayer({
|
||||||
|
worldNow: worldTimeFor('gnss-integrity'),
|
||||||
|
...options,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
@@ -2,6 +2,9 @@ import { createRecentImageryLayer } from '../../layers/recentImagery/index.js';
|
|||||||
import { createRecentImageryRenderer } from '../../layers/recentImagery/rendering.js';
|
import { createRecentImageryRenderer } from '../../layers/recentImagery/rendering.js';
|
||||||
import { createThumbnailLoader } from '../../layers/recentImagery/thumbnails.js';
|
import { createThumbnailLoader } from '../../layers/recentImagery/thumbnails.js';
|
||||||
import { governorRequestRender } from '../../renderGovernor.js';
|
import { governorRequestRender } from '../../renderGovernor.js';
|
||||||
|
import { worldTimeFor } from '../../time/worldClock.js';
|
||||||
|
|
||||||
|
const imageryTime = worldTimeFor('recent-imagery');
|
||||||
|
|
||||||
/** Construct imagery presentation over one explicitly supplied acquisition source. */
|
/** Construct imagery presentation over one explicitly supplied acquisition source. */
|
||||||
export function createApplicationRecentImagery({ source }) {
|
export function createApplicationRecentImagery({ source }) {
|
||||||
@@ -15,5 +18,6 @@ export function createApplicationRecentImagery({ source }) {
|
|||||||
thumbnails: createThumbnailLoader({
|
thumbnails: createThumbnailLoader({
|
||||||
requestThumbnail: (...args) => source.getThumbnail(...args),
|
requestThumbnail: (...args) => source.getThumbnail(...args),
|
||||||
}),
|
}),
|
||||||
|
now: () => new Date(imageryTime()),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -22,6 +22,8 @@ import {
|
|||||||
} from '../renderGovernor.js';
|
} from '../renderGovernor.js';
|
||||||
import { describeError } from './errors.js';
|
import { describeError } from './errors.js';
|
||||||
import { FREE_LOOK_MAX_HEIGHT_METERS } from '../globeInView.js';
|
import { FREE_LOOK_MAX_HEIGHT_METERS } from '../globeInView.js';
|
||||||
|
import { worldClock, worldTimeFor } from '../time/worldClock.js';
|
||||||
|
import { followWorldTime } from '../time/viewerClock.js';
|
||||||
import { onLocaleChange, t } from '../i18n/index.js';
|
import { onLocaleChange, t } from '../i18n/index.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -93,6 +95,12 @@ export async function createApplicationScene({
|
|||||||
defer(() => input.destroy());
|
defer(() => input.destroy());
|
||||||
// Ctrl+wheel and trackpad pinches zoom the globe, not the page.
|
// Ctrl+wheel and trackpad pinches zoom the globe, not the page.
|
||||||
renderer.input.ctrlWheelZoom = true;
|
renderer.input.ctrlWheelZoom = true;
|
||||||
|
defer(
|
||||||
|
followWorldTime(viewer, worldTimeFor('sky'), {
|
||||||
|
subscribe: worldClock.subscribe,
|
||||||
|
requestRender: () => governorRequestRender('world-time'),
|
||||||
|
}),
|
||||||
|
);
|
||||||
// What the adapter hands the application about its viewer; free look is
|
// What the adapter hands the application about its viewer; free look is
|
||||||
// limited to low heights from the start.
|
// limited to low heights from the start.
|
||||||
const viewerHooks = applicationViewerHooks(viewer);
|
const viewerHooks = applicationViewerHooks(viewer);
|
||||||
|
|||||||
+22
-1
@@ -20,6 +20,10 @@ import {
|
|||||||
PI_OVER_TWO,
|
PI_OVER_TWO,
|
||||||
toRadians,
|
toRadians,
|
||||||
} from './geo/vector.js';
|
} from './geo/vector.js';
|
||||||
|
import { worldClock, worldTimeFor } from './time/worldClock.js';
|
||||||
|
|
||||||
|
// The ring shows the sun and moon at the time the sky is drawn.
|
||||||
|
const skyTime = worldTimeFor('sky');
|
||||||
|
|
||||||
/** Outer edge of the existing NVG/FLIR keyhole in normalized shader space. */
|
/** Outer edge of the existing NVG/FLIR keyhole in normalized shader space. */
|
||||||
export const KEYHOLE_OUTER_RADIUS = 1.05;
|
export const KEYHOLE_OUTER_RADIUS = 1.05;
|
||||||
@@ -48,6 +52,9 @@ export const KEYHOLE_LABEL_FEATHER_MAX_RATIO = 0.4;
|
|||||||
*/
|
*/
|
||||||
export const KEYHOLE_OUTSIDE_OPACITY_DEFAULT = 0.01;
|
export const KEYHOLE_OUTSIDE_OPACITY_DEFAULT = 0.01;
|
||||||
|
|
||||||
|
// How far the world time moves before the sun and moon move with it: a
|
||||||
|
// minute moves the sun a quarter of a degree.
|
||||||
|
const EPHEMERIS_WORLD_STEP_MS = 60_000;
|
||||||
const RING_INSET_PX = 11;
|
const RING_INSET_PX = 11;
|
||||||
const MARKER_INSET_PX = 36;
|
const MARKER_INSET_PX = 36;
|
||||||
const COLLIDING_MARKER_EXTRA_INSET_PX = 32;
|
const COLLIDING_MARKER_EXTRA_INSET_PX = 32;
|
||||||
@@ -476,6 +483,18 @@ export class CelestialRing {
|
|||||||
if (typeof document !== 'undefined' && document.hidden) return;
|
if (typeof document !== 'undefined' && document.hidden) return;
|
||||||
governorRequestRender('celestial-ephemeris');
|
governorRequestRender('celestial-ephemeris');
|
||||||
}, 60_000);
|
}, 60_000);
|
||||||
|
// A jump in the world time moves the sun and moon at once.
|
||||||
|
// Played through, the sky moves on each minute of world time it passes.
|
||||||
|
this._ephemerisWorldMs = null;
|
||||||
|
this._unsubscribeWorldTime = worldClock.subscribe(({ timeMs }) => {
|
||||||
|
if (
|
||||||
|
this._ephemerisWorldMs !== null &&
|
||||||
|
Math.abs(timeMs - this._ephemerisWorldMs) < EPHEMERIS_WORLD_STEP_MS
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
this._ephemerisWorldMs = timeMs;
|
||||||
|
this._ephemerisDirty = true;
|
||||||
|
});
|
||||||
this.setEnabled(this.enabled);
|
this.setEnabled(this.enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -822,7 +841,7 @@ export class CelestialRing {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this._updateEphemeris(Date.now())) return;
|
if (!this._updateEphemeris(skyTime())) return;
|
||||||
this._present({ ephemerisUpdates: String(this._ephemerisUpdateCount) });
|
this._present({ ephemerisUpdates: String(this._ephemerisUpdateCount) });
|
||||||
const pose = cameraOf(this.viewer).pose();
|
const pose = cameraOf(this.viewer).pose();
|
||||||
const sunProjection = celestialScreenAngle(
|
const sunProjection = celestialScreenAngle(
|
||||||
@@ -910,6 +929,8 @@ export class CelestialRing {
|
|||||||
clearInterval(this._ephemerisTimer);
|
clearInterval(this._ephemerisTimer);
|
||||||
this._ephemerisTimer = null;
|
this._ephemerisTimer = null;
|
||||||
}
|
}
|
||||||
|
this._unsubscribeWorldTime?.();
|
||||||
|
this._unsubscribeWorldTime = null;
|
||||||
if (this._removePostRender) this._removePostRender();
|
if (this._removePostRender) this._removePostRender();
|
||||||
this._removePostRender = null;
|
this._removePostRender = null;
|
||||||
if (this._shown()) {
|
if (this._shown()) {
|
||||||
|
|||||||
@@ -229,13 +229,30 @@ const GUARDED_PROPS = new Set([
|
|||||||
|
|
||||||
// Custom properties allowed inside a modelled offset. Each is a pinned-tray
|
// Custom properties allowed inside a modelled offset. Each is a pinned-tray
|
||||||
// stack height, proven non-negative below, so evaluating them at 0 is a
|
// stack height, proven non-negative below, so evaluating them at 0 is a
|
||||||
// conservative floor rather than a guess.
|
// conservative floor rather than a guess. The world timeline's lift raises
|
||||||
|
// the dock, its trays and the credit together, so it moves no gap either.
|
||||||
const VETTED_VARS = new Set([
|
const VETTED_VARS = new Set([
|
||||||
'--dock-pinned-stack-height',
|
'--dock-pinned-stack-height',
|
||||||
'--dock-lower-pinned-height',
|
'--dock-lower-pinned-height',
|
||||||
'--dock-location-pinned-height',
|
'--dock-location-pinned-height',
|
||||||
'--dock-presets-pinned-height',
|
'--dock-presets-pinned-height',
|
||||||
|
'--world-timeline-lift',
|
||||||
]);
|
]);
|
||||||
|
// Custom properties CSS sets to a fixed length besides their 0 default. The
|
||||||
|
// clearance checks run at each length CSS gives them, not only at 0.
|
||||||
|
const FIXED_LENGTH_VARS = new Set(['--world-timeline-lift']);
|
||||||
|
const LIFTS_PX = [0, 66, 80];
|
||||||
|
let liftPx = 0;
|
||||||
|
function eachLift(check) {
|
||||||
|
for (const lift of LIFTS_PX) {
|
||||||
|
liftPx = lift;
|
||||||
|
try {
|
||||||
|
check(lift);
|
||||||
|
} finally {
|
||||||
|
liftPx = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Rules whose final compound targets a modelled element (pseudo-elements aside). */
|
/** Rules whose final compound targets a modelled element (pseudo-elements aside). */
|
||||||
function ownBoxEntries() {
|
function ownBoxEntries() {
|
||||||
@@ -315,6 +332,7 @@ function toPx(value, viewportHeight, where) {
|
|||||||
if (term.startsWith('var(')) {
|
if (term.startsWith('var(')) {
|
||||||
const name = term.slice(4, term.lastIndexOf(')')).split(',')[0].trim();
|
const name = term.slice(4, term.lastIndexOf(')')).split(',')[0].trim();
|
||||||
assert.ok(VETTED_VARS.has(name), `unvetted custom property ${name} in ${where}: "${value}"`);
|
assert.ok(VETTED_VARS.has(name), `unvetted custom property ${name} in ${where}: "${value}"`);
|
||||||
|
if (name === '--world-timeline-lift') total += liftPx;
|
||||||
continue; // proven non-negative; 0 is the conservative floor
|
continue; // proven non-negative; 0 is the conservative floor
|
||||||
}
|
}
|
||||||
assert.match(term, /^-?[\d.]+(px|rem|vh)$/, `unmodelled length term "${term}" in ${where}: "${value}"`);
|
assert.match(term, /^-?[\d.]+(px|rem|vh)$/, `unmodelled length term "${term}" in ${where}: "${value}"`);
|
||||||
@@ -444,7 +462,8 @@ test('custom properties inside modelled offsets are provably non-negative', () =
|
|||||||
assert.ok(declared.length >= VETTED_VARS.size, 'every vetted custom property needs a CSS default');
|
assert.ok(declared.length >= VETTED_VARS.size, 'every vetted custom property needs a CSS default');
|
||||||
for (const decl of declared) {
|
for (const decl of declared) {
|
||||||
assert.doesNotMatch(decl.value, /-\s*\d/, `${decl.prop} has a negative CSS default: ${decl.value}`);
|
assert.doesNotMatch(decl.value, /-\s*\d/, `${decl.prop} has a negative CSS default: ${decl.value}`);
|
||||||
assert.match(decl.value, /^(0|0px)$/, `${decl.prop} default is not a vetted shape: ${decl.value}`);
|
const shape = FIXED_LENGTH_VARS.has(decl.prop) ? /^(0|\d+px)$/ : /^(0|0px)$/;
|
||||||
|
assert.match(decl.value, shape, `${decl.prop} default is not a vetted shape: ${decl.value}`);
|
||||||
}
|
}
|
||||||
const layout = fs.readFileSync(new URL('./ui/panelLayoutController.js', import.meta.url), 'utf8');
|
const layout = fs.readFileSync(new URL('./ui/panelLayoutController.js', import.meta.url), 'utf8');
|
||||||
const start = layout.indexOf('_updateCommandDockTrayStack() {');
|
const start = layout.indexOf('_updateCommandDockTrayStack() {');
|
||||||
@@ -517,16 +536,18 @@ test('every open dock tray clears the required credit at every modelled viewport
|
|||||||
// number: the dock is anchored at 2vh down to 721px and re-anchors to a flat
|
// number: the dock is anchored at 2vh down to 721px and re-anchors to a flat
|
||||||
// 8px at 720px, while the credit keeps its 2vh base throughout.
|
// 8px at 720px, while the credit keeps its 2vh base throughout.
|
||||||
const failures = [];
|
const failures = [];
|
||||||
|
eachLift((lift) => {
|
||||||
for (const scenario of TRAY_SCENARIOS) {
|
for (const scenario of TRAY_SCENARIOS) {
|
||||||
for (const width of WIDTHS.filter((w) => w <= 900)) {
|
for (const width of WIDTHS.filter((w) => w <= 900)) {
|
||||||
for (const height of HEIGHTS) {
|
for (const height of HEIGHTS) {
|
||||||
const clearance = trayBottomPx(scenario, width, height) - creditTopPx(width, height);
|
const clearance = trayBottomPx(scenario, width, height) - creditTopPx(width, height);
|
||||||
if (clearance < MIN_CLEARANCE_PX) {
|
if (clearance < MIN_CLEARANCE_PX) {
|
||||||
failures.push(`${scenario.name} @ ${width}x${height}: ${clearance.toFixed(1)}px`);
|
failures.push(`${scenario.name} @ ${width}x${height} lift ${lift}: ${clearance.toFixed(1)}px`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
assert.deepEqual(failures, [], `a dock tray re-enters the credit band:\n ${failures.join('\n ')}\n`);
|
assert.deepEqual(failures, [], `a dock tray re-enters the credit band:\n ${failures.join('\n ')}\n`);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -566,21 +587,24 @@ test('the full-width context rail clears the required credit at every modelled v
|
|||||||
'none',
|
'none',
|
||||||
`at ${width}px the rail is height-capped, so its bottom anchor no longer decides its floor`,
|
`at ${width}px the rail is height-capped, so its bottom anchor no longer decides its floor`,
|
||||||
);
|
);
|
||||||
|
eachLift((lift) => {
|
||||||
for (const height of HEIGHTS) {
|
for (const height of HEIGHTS) {
|
||||||
const rail = resolve(['#right-context-rail'], 'bottom', width, 'context rail');
|
const rail = resolve(['#right-context-rail'], 'bottom', width, 'context rail');
|
||||||
const clearance = toPx(rail.decl.value, height, 'rail bottom') - creditTopPx(width, height);
|
const clearance = toPx(rail.decl.value, height, 'rail bottom') - creditTopPx(width, height);
|
||||||
if (clearance < MIN_CLEARANCE_PX) failures.push(`${width}x${height}: ${clearance.toFixed(1)}px`);
|
if (clearance < MIN_CLEARANCE_PX) failures.push(`${width}x${height} lift ${lift}: ${clearance.toFixed(1)}px`);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
assert.deepEqual(failures, [], `context rail re-enters the credit band at ${failures.join(', ')}`);
|
assert.deepEqual(failures, [], `context rail re-enters the credit band at ${failures.join(', ')}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the dock anchor changes at 720px — the 2vh cancellation is band-limited', () => {
|
test('the dock anchor changes at 720px — the 2vh cancellation is band-limited', () => {
|
||||||
assert.equal(resolve(['#command-dock'], 'bottom', 800, 'dock').decl.value, '2vh');
|
const lift = 'var(--world-timeline-lift, 0px)';
|
||||||
assert.equal(resolve(['#command-dock'], 'bottom', 720, 'dock').decl.value, '8px');
|
assert.equal(resolve(['#command-dock'], 'bottom', 800, 'dock').decl.value, `calc(2vh + ${lift})`);
|
||||||
|
assert.equal(resolve(['#command-dock'], 'bottom', 720, 'dock').decl.value, `calc(8px + ${lift})`);
|
||||||
assert.equal(
|
assert.equal(
|
||||||
resolve(CREDIT_SELECTORS, 'bottom', 720, 'credit').decl.value,
|
resolve(CREDIT_SELECTORS, 'bottom', 720, 'credit').decl.value,
|
||||||
'calc(2vh + 5rem)',
|
`calc(2vh + 5rem + ${lift})`,
|
||||||
'the credit keeps its 2vh base below 720px — that asymmetry is the whole hazard',
|
'the credit keeps its 2vh base below 720px — that asymmetry is the whole hazard',
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ export const _setCctvCoverageStateForTest = layer._setCctvCoverageStateForTest;
|
|||||||
export const _cctvIconsForTest = layer._cctvIconsForTest;
|
export const _cctvIconsForTest = layer._cctvIconsForTest;
|
||||||
export const focusCctvRecord = layer.focusCctvRecord;
|
export const focusCctvRecord = layer.focusCctvRecord;
|
||||||
export const maybeAutoHop = layer.maybeAutoHop;
|
export const maybeAutoHop = layer.maybeAutoHop;
|
||||||
|
export const openingCameraId = layer.openingCameraId;
|
||||||
|
export const reopenNearestCamera = layer.reopenNearestCamera;
|
||||||
export const cctvCycleIndex = layer.cctvCycleIndex;
|
export const cctvCycleIndex = layer.cctvCycleIndex;
|
||||||
export {
|
export {
|
||||||
CCTV_CALIBRATION_STORAGE_KEY_V1,
|
CCTV_CALIBRATION_STORAGE_KEY_V1,
|
||||||
|
|||||||
+111
-2
@@ -63,6 +63,8 @@ import cctvLayer, {
|
|||||||
materializeCctvActiveCoverageEntities,
|
materializeCctvActiveCoverageEntities,
|
||||||
materializeCctvVisibleCoverageEntities,
|
materializeCctvVisibleCoverageEntities,
|
||||||
maybeAutoHop,
|
maybeAutoHop,
|
||||||
|
openingCameraId,
|
||||||
|
reopenNearestCamera,
|
||||||
prioritizeActiveCctvGeometryRecord,
|
prioritizeActiveCctvGeometryRecord,
|
||||||
processCctvGeometryDrainBatch,
|
processCctvGeometryDrainBatch,
|
||||||
processCctvGeometryQueueBatch,
|
processCctvGeometryQueueBatch,
|
||||||
@@ -1042,8 +1044,14 @@ function makeDeselectViewer() {
|
|||||||
requestRender() {},
|
requestRender() {},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
// The layer's lines and plane draw through this.
|
// The layer's lines and plane draw through this. The eye has a pose only
|
||||||
viewer.draw = bindFakeDraw(viewer).draw;
|
// once a test places it (`viewer.eye`, degrees and metres).
|
||||||
|
viewer.draw = bindFakeDraw(viewer, {
|
||||||
|
camera: {
|
||||||
|
pose: () => (viewer.eye ? { ...viewer.eye } : undefined),
|
||||||
|
on: () => () => {},
|
||||||
|
},
|
||||||
|
}).draw;
|
||||||
return viewer;
|
return viewer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1334,6 +1342,107 @@ test('CCTV null-active coverage, auto-hop, cycling, and panel targets stay hones
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('CCTV opens on the camera nearest the viewer, not the first in the catalog', () => {
|
||||||
|
// QA 2026-11-05: at King's Cross, turning CCTV on showed a Sydney camera,
|
||||||
|
// the first catalog record, instead of the TfL camera 0.3 km away.
|
||||||
|
const viewer = makeDeselectViewer();
|
||||||
|
viewer.eye = { lon: -0.1209, lat: 51.5295, height: 187 };
|
||||||
|
const sydney = makeDeselectRecord('au-sydney');
|
||||||
|
sydney.camera = { ...sydney.camera, lat: -34.03, lon: 151.11 };
|
||||||
|
const london = makeDeselectRecord('gb-kings-cross');
|
||||||
|
london.camera = { ...london.camera, lat: 51.5318, lon: -0.1209 };
|
||||||
|
try {
|
||||||
|
_setCctvCoverageStateForTest({
|
||||||
|
viewer,
|
||||||
|
records: [sydney, london],
|
||||||
|
activeCameraId: null,
|
||||||
|
enabled: false,
|
||||||
|
});
|
||||||
|
assert.equal(openingCameraId(), 'gb-kings-cross');
|
||||||
|
_setCctvCoverageStateForTest({
|
||||||
|
viewer: null,
|
||||||
|
records: [sydney, london],
|
||||||
|
activeCameraId: null,
|
||||||
|
enabled: false,
|
||||||
|
});
|
||||||
|
assert.equal(
|
||||||
|
openingCameraId(),
|
||||||
|
'au-sydney',
|
||||||
|
'with no viewer position the first record is the fallback',
|
||||||
|
);
|
||||||
|
_setCctvCoverageStateForTest({ viewer, records: [], enabled: false });
|
||||||
|
assert.equal(openingCameraId(), null);
|
||||||
|
} finally {
|
||||||
|
_setCctvCoverageStateForTest({ enabled: false });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the opening camera follows a shared view that lands after CCTV turned on, until someone picks one', () => {
|
||||||
|
// A share link turns CCTV on before its flight lands, so enable() picks
|
||||||
|
// from the startup view; the flight's settled move re-picks near London.
|
||||||
|
const viewer = makeDeselectViewer();
|
||||||
|
viewer.eye = { lon: -0.1209, lat: 51.5295, height: 187 };
|
||||||
|
const sydney = makeDeselectRecord('au-sydney');
|
||||||
|
sydney.camera = { ...sydney.camera, lat: -34.03, lon: 151.11 };
|
||||||
|
const london = makeDeselectRecord('gb-kings-cross');
|
||||||
|
london.camera = { ...london.camera, lat: 51.5318, lon: -0.1209 };
|
||||||
|
for (const record of [sydney, london])
|
||||||
|
Object.assign(record, {
|
||||||
|
groundResolved: {},
|
||||||
|
groundSamples: {},
|
||||||
|
groundPrior: 0,
|
||||||
|
frustumGeometry: null,
|
||||||
|
frustumPositions: null,
|
||||||
|
probeClampRangeM: null,
|
||||||
|
});
|
||||||
|
_setCctvOverlayHostForTest({
|
||||||
|
setEntries() {},
|
||||||
|
setVisible() {},
|
||||||
|
clearSource() {},
|
||||||
|
});
|
||||||
|
// Activation builds the projection canvas and frame image.
|
||||||
|
const originalDocument = globalThis.document;
|
||||||
|
const originalImage = globalThis.Image;
|
||||||
|
globalThis.document = {
|
||||||
|
createElement: () => ({ getContext: () => null }),
|
||||||
|
};
|
||||||
|
globalThis.Image = class {};
|
||||||
|
try {
|
||||||
|
_setCctvCoverageStateForTest({
|
||||||
|
viewer,
|
||||||
|
records: [sydney, london],
|
||||||
|
activeCameraId: 'au-sydney',
|
||||||
|
enabled: true,
|
||||||
|
openingCameraProvisional: true,
|
||||||
|
});
|
||||||
|
assert.equal(reopenNearestCamera(), true);
|
||||||
|
assert.equal(cctvLayer.getUIState().activeCameraId, 'gb-kings-cross');
|
||||||
|
assert.equal(reopenNearestCamera(), false, 'already the nearest');
|
||||||
|
|
||||||
|
// Someone chooses a camera: settled moves leave it alone.
|
||||||
|
setActiveCamera('au-sydney');
|
||||||
|
assert.equal(reopenNearestCamera(), false);
|
||||||
|
assert.equal(cctvLayer.getUIState().activeCameraId, 'au-sydney');
|
||||||
|
|
||||||
|
// A deselect is a choice too.
|
||||||
|
_setCctvCoverageStateForTest({
|
||||||
|
viewer,
|
||||||
|
records: [sydney, london],
|
||||||
|
activeCameraId: 'au-sydney',
|
||||||
|
enabled: true,
|
||||||
|
openingCameraProvisional: true,
|
||||||
|
});
|
||||||
|
deactivateActiveCamera();
|
||||||
|
assert.equal(reopenNearestCamera(), false);
|
||||||
|
assert.equal(cctvLayer.getUIState().activeCameraId, null);
|
||||||
|
} finally {
|
||||||
|
globalThis.document = originalDocument;
|
||||||
|
globalThis.Image = originalImage;
|
||||||
|
_setCctvOverlayHostForTest();
|
||||||
|
_setCctvCoverageStateForTest({ enabled: false });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('CCTV disable clears and hides its shared-host source through the real layer lifecycle', () => {
|
test('CCTV disable clears and hides its shared-host source through the real layer lifecycle', () => {
|
||||||
const calls = [];
|
const calls = [];
|
||||||
_setCctvOverlayHostForTest({
|
_setCctvOverlayHostForTest({
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import {
|
|||||||
CALGARY_IMAGE_ORIGIN,
|
CALGARY_IMAGE_ORIGIN,
|
||||||
CALGARY_MAX_CATALOG_BYTES,
|
CALGARY_MAX_CATALOG_BYTES,
|
||||||
DEFAULT_CALGARY_ROWS_URL,
|
DEFAULT_CALGARY_ROWS_URL,
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
} from '../../server/providers/cctv/constants.js';
|
} from '../../server/providers/cctv/constants.js';
|
||||||
import { CAMERA_CODE_MAX_CHARS } from '../../server/providers/cctv/normalize.js';
|
import { CAMERA_CODE_MAX_CHARS } from '../../server/providers/cctv/normalize.js';
|
||||||
import { allocateSourceCap } from '../../server/providers/cctv/cap.js';
|
import { allocateSourceCap } from '../../server/providers/cctv/cap.js';
|
||||||
@@ -384,6 +384,6 @@ test('CCTV_CALGARY_ENABLED=0 keeps the lane from being loaded at all', async (t)
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the shipped catalog ceiling is not raised to make room for this pack', () => {
|
test('the shared catalog slots are not raised to make room for this pack', () => {
|
||||||
assert.equal(DEFAULT_CCTV_MAX_SOURCES, 4000);
|
assert.equal(CCTV_SHARED_SOURCE_SLOTS, 4000);
|
||||||
});
|
});
|
||||||
@@ -6,9 +6,12 @@ import {
|
|||||||
} from '../../server/providers/cctv/cap.js';
|
} from '../../server/providers/cctv/cap.js';
|
||||||
import {
|
import {
|
||||||
CCTV_MAX_SOURCES_CEILING,
|
CCTV_MAX_SOURCES_CEILING,
|
||||||
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
CCTV_SOURCE_CACHE_MS,
|
CCTV_SOURCE_CACHE_MS,
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
DEFAULT_CCTV_MAX_SOURCES,
|
||||||
|
WORLD_CCTV_SOURCE_COUNT,
|
||||||
} from '../../server/providers/cctv/constants.js';
|
} from '../../server/providers/cctv/constants.js';
|
||||||
|
import { QUEBEC_CAMERA_SOURCE_COUNT } from '../../server/providers/cctv/quebec.js';
|
||||||
import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
|
import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
|
||||||
|
|
||||||
const pack = (name, count, prefix = name) => ({
|
const pack = (name, count, prefix = name) => ({
|
||||||
@@ -99,6 +102,68 @@ test('duplicate ids resolve last-pack-wins and count against the winning pack',
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/** Shared packs plus two reserved ones, shaped like the default catalog. */
|
||||||
|
const reservedFixture = () => [
|
||||||
|
...Array.from({ length: 20 }, (_, i) => pack(`shared${i}`, 250)),
|
||||||
|
{ ...pack('quebec', 1120), reservedCount: 1120 },
|
||||||
|
{ ...pack('world', 2230), reservedCount: 2230 },
|
||||||
|
];
|
||||||
|
const keptByName = (packs) =>
|
||||||
|
Object.fromEntries(packs.map(({ name, kept }) => [name, kept]));
|
||||||
|
|
||||||
|
test('the default cap is the shared floor plus the reserved Québec and World packs', () => {
|
||||||
|
assert.equal(
|
||||||
|
DEFAULT_CCTV_MAX_SOURCES,
|
||||||
|
CCTV_SHARED_SOURCE_SLOTS +
|
||||||
|
QUEBEC_CAMERA_SOURCE_COUNT +
|
||||||
|
WORLD_CCTV_SOURCE_COUNT,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('at the default cap reserved packs are whole and shared packs keep the floor', () => {
|
||||||
|
const { sources, packs } = allocateSourceCap(
|
||||||
|
reservedFixture(),
|
||||||
|
DEFAULT_CCTV_MAX_SOURCES,
|
||||||
|
);
|
||||||
|
const kept = keptByName(packs);
|
||||||
|
assert.equal(sources.length, DEFAULT_CCTV_MAX_SOURCES);
|
||||||
|
assert.equal(kept.quebec, 1120);
|
||||||
|
assert.equal(kept.world, 2230);
|
||||||
|
for (let i = 0; i < 20; i++) assert.equal(kept[`shared${i}`], 200);
|
||||||
|
assert.match(
|
||||||
|
sources[0].id,
|
||||||
|
/^shared0-/,
|
||||||
|
'the first camera stays in a shared pack',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a cap at the shared floor reserves nothing and thins every pack evenly', () => {
|
||||||
|
const { packs } = allocateSourceCap(reservedFixture(), 4000);
|
||||||
|
const kept = keptByName(packs);
|
||||||
|
// 22 lanes share 4,000 round-robin: nobody is wiped out by the reservation.
|
||||||
|
for (const count of Object.values(kept))
|
||||||
|
assert.ok(count >= 181 && count <= 182);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a small cap (dev-secure 48) still reaches the shared packs first', () => {
|
||||||
|
const { sources, packs } = allocateSourceCap(reservedFixture(), 48);
|
||||||
|
const kept = keptByName(packs);
|
||||||
|
assert.equal(sources.length, 48);
|
||||||
|
for (let i = 0; i < 20; i++) assert.ok(kept[`shared${i}`] >= 2);
|
||||||
|
assert.match(sources[0].id, /^shared0-/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('reservations fill only the room above the floor, round-robin between reserved packs', () => {
|
||||||
|
const { packs } = allocateSourceCap(reservedFixture(), 4100);
|
||||||
|
const kept = keptByName(packs);
|
||||||
|
const shared = Object.entries(kept)
|
||||||
|
.filter(([name]) => name.startsWith('shared'))
|
||||||
|
.reduce((sum, [, count]) => sum + count, 0);
|
||||||
|
// 100 reserved slots split between Québec and World, then 4,000 round-robin.
|
||||||
|
assert.ok(shared >= 4000 - 2 * 182, `shared packs kept ${shared}`);
|
||||||
|
assert.equal(shared + kept.quebec + kept.world, 4100);
|
||||||
|
});
|
||||||
|
|
||||||
test('resolveCatalogCap bounds the env value and falls back to the default', () => {
|
test('resolveCatalogCap bounds the env value and falls back to the default', () => {
|
||||||
assert.equal(resolveCatalogCap(undefined), DEFAULT_CCTV_MAX_SOURCES);
|
assert.equal(resolveCatalogCap(undefined), DEFAULT_CCTV_MAX_SOURCES);
|
||||||
assert.equal(resolveCatalogCap('nonsense'), DEFAULT_CCTV_MAX_SOURCES);
|
assert.equal(resolveCatalogCap('nonsense'), DEFAULT_CCTV_MAX_SOURCES);
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ import {
|
|||||||
DEFAULT_ONTARIO_MAX_SOURCES,
|
DEFAULT_ONTARIO_MAX_SOURCES,
|
||||||
DEFAULT_FINTRAFFIC_MAX_SOURCES,
|
DEFAULT_FINTRAFFIC_MAX_SOURCES,
|
||||||
DEFAULT_TXDOT_MAX_SOURCES,
|
DEFAULT_TXDOT_MAX_SOURCES,
|
||||||
|
DEFAULT_OTTAWA_MAX_SOURCES,
|
||||||
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
DEFAULT_TALLINN_MAX_SOURCES,
|
DEFAULT_TALLINN_MAX_SOURCES,
|
||||||
DEFAULT_TARKTEE_MAX_SOURCES,
|
DEFAULT_TARKTEE_MAX_SOURCES,
|
||||||
DEFAULT_NSW_MAX_SOURCES,
|
DEFAULT_NSW_MAX_SOURCES,
|
||||||
@@ -222,7 +224,7 @@ test('CCTV catalog merges DriveBC cameras and CCTV_DRIVEBC_ENABLED=0 skips the r
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('default caps of the original packs fit inside the default catalog cap', () => {
|
test('default caps of the original packs fit inside the shared catalog slots', () => {
|
||||||
// Every default pack at its own cap (Warendorf ships 1 curated camera).
|
// Every default pack at its own cap (Warendorf ships 1 curated camera).
|
||||||
const packs =
|
const packs =
|
||||||
DEFAULT_AUSTIN_MAX_SOURCES +
|
DEFAULT_AUSTIN_MAX_SOURCES +
|
||||||
@@ -231,15 +233,18 @@ test('default caps of the original packs fit inside the default catalog cap', ()
|
|||||||
DEFAULT_ONTARIO_MAX_SOURCES +
|
DEFAULT_ONTARIO_MAX_SOURCES +
|
||||||
DEFAULT_FINTRAFFIC_MAX_SOURCES +
|
DEFAULT_FINTRAFFIC_MAX_SOURCES +
|
||||||
DEFAULT_DRIVEBC_MAX_SOURCES +
|
DEFAULT_DRIVEBC_MAX_SOURCES +
|
||||||
|
DEFAULT_OTTAWA_MAX_SOURCES +
|
||||||
DEFAULT_TXDOT_MAX_SOURCES +
|
DEFAULT_TXDOT_MAX_SOURCES +
|
||||||
DEFAULT_TALLINN_MAX_SOURCES +
|
DEFAULT_TALLINN_MAX_SOURCES +
|
||||||
DEFAULT_TARKTEE_MAX_SOURCES +
|
DEFAULT_TARKTEE_MAX_SOURCES +
|
||||||
DEFAULT_NSW_MAX_SOURCES +
|
DEFAULT_NSW_MAX_SOURCES +
|
||||||
DEFAULT_CATALONIA_MAX_SOURCES +
|
DEFAULT_CATALONIA_MAX_SOURCES +
|
||||||
1;
|
1;
|
||||||
|
// The reserved Québec and World packs sit above the shared floor, so the
|
||||||
|
// shared packs must fit the floor itself, not the whole default cap.
|
||||||
assert.ok(
|
assert.ok(
|
||||||
packs <= DEFAULT_CCTV_MAX_SOURCES,
|
packs <= CCTV_SHARED_SOURCE_SLOTS,
|
||||||
`default packs (${packs}) would be thinned by the catalog cap (${DEFAULT_CCTV_MAX_SOURCES})`,
|
`default packs (${packs}) would be thinned by the shared slots (${CCTV_SHARED_SOURCE_SLOTS})`,
|
||||||
);
|
);
|
||||||
assert.ok(
|
assert.ok(
|
||||||
DEFAULT_CCTV_MAX_SOURCES <= CCTV_MAX_SOURCES_CEILING,
|
DEFAULT_CCTV_MAX_SOURCES <= CCTV_MAX_SOURCES_CEILING,
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import {
|
|||||||
parseHkCameraLocationsXml,
|
parseHkCameraLocationsXml,
|
||||||
} from '../../server/providers/cctv/sources.js';
|
} from '../../server/providers/cctv/sources.js';
|
||||||
import {
|
import {
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
DEFAULT_HK_CAMERAS_URL,
|
DEFAULT_HK_CAMERAS_URL,
|
||||||
DEFAULT_HK_MAX_SOURCES,
|
DEFAULT_HK_MAX_SOURCES,
|
||||||
HK_ANCHORS,
|
HK_ANCHORS,
|
||||||
@@ -396,8 +396,8 @@ test('CCTV_HK_ENABLED=0 keeps the lane from being loaded at all', async (t) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the shipped catalog ceiling is not raised to make room for this pack', () => {
|
test('the shared catalog slots are not raised to make room for this pack', () => {
|
||||||
assert.equal(DEFAULT_CCTV_MAX_SOURCES, 4000);
|
assert.equal(CCTV_SHARED_SOURCE_SLOTS, 4000);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the HK pack default sits above the full TD catalog and anchors the New Territories', () => {
|
test('the HK pack default sits above the full TD catalog and anchors the New Territories', () => {
|
||||||
@@ -406,7 +406,7 @@ test('the HK pack default sits above the full TD catalog and anchors the New Ter
|
|||||||
'default cap should keep nearly all published TD cameras',
|
'default cap should keep nearly all published TD cameras',
|
||||||
);
|
);
|
||||||
assert.ok(
|
assert.ok(
|
||||||
DEFAULT_HK_MAX_SOURCES <= DEFAULT_CCTV_MAX_SOURCES,
|
DEFAULT_HK_MAX_SOURCES <= CCTV_SHARED_SOURCE_SLOTS,
|
||||||
'a single pack must not outgrow the catalog-wide ceiling alone',
|
'a single pack must not outgrow the catalog-wide ceiling alone',
|
||||||
);
|
);
|
||||||
const places = HK_ANCHORS.map(
|
const places = HK_ANCHORS.map(
|
||||||
|
|||||||
@@ -10,6 +10,77 @@ const playlist =
|
|||||||
'#EXTM3U\n#EXT-X-MEDIA-SEQUENCE:12\n#EXTINF:2,\na.ts\n#EXTINF:2,\nb.ts\n#EXTINF:2,\nc.ts\n';
|
'#EXTM3U\n#EXT-X-MEDIA-SEQUENCE:12\n#EXTINF:2,\na.ts\n#EXTINF:2,\nb.ts\n#EXTINF:2,\nc.ts\n';
|
||||||
const base = 'https://camera.example/live/list.m3u8';
|
const base = 'https://camera.example/live/list.m3u8';
|
||||||
|
|
||||||
|
test('high-resolution HLS segments play while the retained session cache stays bounded', async (t) => {
|
||||||
|
// Giroc publishes roughly ten-second TS segments; one measured 6,437,120
|
||||||
|
// bytes. The former 4 MiB download cap rejected it before playback began.
|
||||||
|
const segmentBytes = 6_437_120;
|
||||||
|
const master =
|
||||||
|
'#EXTM3U\n#EXT-X-STREAM-INF:BANDWIDTH=4570000\ntracks-v1a1/mono.m3u8\n';
|
||||||
|
const media =
|
||||||
|
'#EXTM3U\n#EXT-X-MEDIA-SEQUENCE:100\n' +
|
||||||
|
[0, 1, 2, 3, 4].map((i) => `#EXTINF:10.272,\n${i}.ts\n`).join('');
|
||||||
|
const manager = createHlsPuller({
|
||||||
|
limits: { ...HLS_LIMITS, pollMs: 100000 },
|
||||||
|
fetchImpl: async (url) => {
|
||||||
|
if (url === base) return new Response(master);
|
||||||
|
if (url === 'https://camera.example/live/tracks-v1a1/mono.m3u8')
|
||||||
|
return new Response(media);
|
||||||
|
const match =
|
||||||
|
/^https:\/\/camera\.example\/live\/tracks-v1a1\/([0-4])\.ts$/.exec(url);
|
||||||
|
if (!match) throw new Error('Unexpected playlist reference');
|
||||||
|
// No Content-Length: the actual streamed bytes must also be accepted.
|
||||||
|
return new Response(Buffer.alloc(segmentBytes, Number(match[1])));
|
||||||
|
},
|
||||||
|
});
|
||||||
|
t.after(() => manager.shutdown());
|
||||||
|
const entry = await manager.ensure('giroc', base);
|
||||||
|
await entry.polling;
|
||||||
|
const result = await manager.buildPlaylist(entry, 'giroc');
|
||||||
|
assert.ok(result, 'large valid segments should produce a playable playlist');
|
||||||
|
assert.match(result, /#EXT-X-MEDIA-SEQUENCE:2\n/);
|
||||||
|
assert.equal(manager.getSegment('giroc', entry.token, 0), null);
|
||||||
|
const newest = manager.getSegment('giroc', entry.token, 4);
|
||||||
|
assert.equal(newest.length, segmentBytes);
|
||||||
|
assert.equal(newest[0], 4);
|
||||||
|
assert.deepEqual(manager.stats(), { sessions: 1, bytes: 19_311_360 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('HLS downloads still reject declared and chunked bodies above 8 MiB', async () => {
|
||||||
|
for (const declared of [true, false]) {
|
||||||
|
let chunks = 0;
|
||||||
|
let cancelled = false;
|
||||||
|
await assert.rejects(
|
||||||
|
fetchHlsBytes(base, {
|
||||||
|
maxBytes: HLS_LIMITS.segmentBytes,
|
||||||
|
fetchImpl: async () =>
|
||||||
|
new Response(
|
||||||
|
declared
|
||||||
|
? 'small body'
|
||||||
|
: new ReadableStream({
|
||||||
|
pull(controller) {
|
||||||
|
// Each chunk fits on its own; only their cumulative size
|
||||||
|
// crosses the cap. Leave it open to verify cancellation.
|
||||||
|
controller.enqueue(
|
||||||
|
Buffer.alloc(4 * 1024 * 1024 + (++chunks === 2 ? 1 : 0)),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
cancelled = true;
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
headers: declared
|
||||||
|
? { 'content-length': String(8 * 1024 * 1024 + 1) }
|
||||||
|
: {},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
/HLS response too large/,
|
||||||
|
);
|
||||||
|
if (!declared) assert.equal(cancelled, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('playlist parser uses sequence, refuses escaping and unsupported references', () => {
|
test('playlist parser uses sequence, refuses escaping and unsupported references', () => {
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
parseHlsMedia(playlist, base).map((s) => s.seq),
|
parseHlsMedia(playlist, base).map((s) => s.seq),
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
loadHoustonSourcesFromOpenData,
|
loadHoustonSourcesFromOpenData,
|
||||||
} from '../../server/providers/cctv/sources.js';
|
} from '../../server/providers/cctv/sources.js';
|
||||||
import {
|
import {
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
DEFAULT_HOUSTON_MAX_SOURCES,
|
DEFAULT_HOUSTON_MAX_SOURCES,
|
||||||
HOUSTON_CAMERAS_URL,
|
HOUSTON_CAMERAS_URL,
|
||||||
HOUSTON_GROUND_ELEVATION_M,
|
HOUSTON_GROUND_ELEVATION_M,
|
||||||
@@ -387,8 +387,8 @@ test('Houston stays unloaded unless CCTV_HOUSTON_ENABLED=1', async (t) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the shipped catalog ceiling is not raised to make room for this pack', () => {
|
test('the shared catalog slots are not raised to make room for this pack', () => {
|
||||||
assert.equal(DEFAULT_CCTV_MAX_SOURCES, 4000);
|
assert.equal(CCTV_SHARED_SOURCE_SLOTS, 4000);
|
||||||
assert.equal(DEFAULT_HOUSTON_MAX_SOURCES, 250);
|
assert.equal(DEFAULT_HOUSTON_MAX_SOURCES, 250);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,429 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import fs from 'node:fs';
|
||||||
|
import os from 'node:os';
|
||||||
|
import path from 'node:path';
|
||||||
|
import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
|
||||||
|
import {
|
||||||
|
DEFAULT_ICELAND_MAX_SOURCES,
|
||||||
|
ICELAND_CAMERAS_URL,
|
||||||
|
ICELAND_IMAGE_ORIGIN,
|
||||||
|
ICELAND_MAX_CATALOG_BYTES,
|
||||||
|
} from '../../server/providers/cctv/constants.js';
|
||||||
|
import { fetchWithinHost } from '../../server/providers/cctv/media.js';
|
||||||
|
import { isLikelyIcelandCoordinate } from '../../server/providers/cctv/normalize.js';
|
||||||
|
import {
|
||||||
|
icelandCameraToSource,
|
||||||
|
icelandHeadingFromDescription,
|
||||||
|
loadIcelandSourcesFromOpenData,
|
||||||
|
} from '../../server/providers/cctv/sources.js';
|
||||||
|
|
||||||
|
/** Set (or, for `undefined`, delete) environment variables for one test. */
|
||||||
|
function withEnv(t, env) {
|
||||||
|
for (const [name, value] of Object.entries(env)) {
|
||||||
|
const previous = process.env[name];
|
||||||
|
t.after(() => {
|
||||||
|
if (previous === undefined) delete process.env[name];
|
||||||
|
else process.env[name] = previous;
|
||||||
|
});
|
||||||
|
if (value === undefined) delete process.env[name];
|
||||||
|
else process.env[name] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One row shaped like the live `vefmyndavelar2014_1` payload. */
|
||||||
|
const row = (over = {}) => ({
|
||||||
|
Maelist_nr: 7001,
|
||||||
|
Myndavel: 'Hellisheiði',
|
||||||
|
Vegheiti: 'Hringvegur',
|
||||||
|
NrVegur: '1',
|
||||||
|
Skyring: 'Hellisheiði séð til vesturs',
|
||||||
|
Slod: `${ICELAND_IMAGE_ORIGIN}hellisheidi_1.jpg`,
|
||||||
|
PntX: 395000,
|
||||||
|
PntY: 390000,
|
||||||
|
Breidd: 64.0136,
|
||||||
|
Lengd: -21.4,
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
|
/** A live response body plus a flag that flips when the stream is cancelled. */
|
||||||
|
const streamingResponse = (init = {}) => {
|
||||||
|
const state = { cancelled: false };
|
||||||
|
const body = new ReadableStream({
|
||||||
|
start(controller) {
|
||||||
|
controller.enqueue(new TextEncoder().encode('['));
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
state.cancelled = true;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { response: new Response(body, init), state };
|
||||||
|
};
|
||||||
|
|
||||||
|
const json = (value) =>
|
||||||
|
new Response(JSON.stringify(value), {
|
||||||
|
status: 200,
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
});
|
||||||
|
|
||||||
|
test('an Iceland row maps to a source on the pinned frame directory', () => {
|
||||||
|
const source = icelandCameraToSource(row());
|
||||||
|
assert.equal(source.id, 'is-vegagerdin-hellisheidi_1');
|
||||||
|
assert.equal(source.name, 'Hellisheiði séð til vesturs');
|
||||||
|
assert.equal(source.city, 'Iceland');
|
||||||
|
assert.equal(source.cityId, 'iceland');
|
||||||
|
assert.equal(source.provider, 'Vegagerðin (IRCA)');
|
||||||
|
assert.equal(source.lat, 64.0136);
|
||||||
|
assert.equal(source.lon, -21.4);
|
||||||
|
assert.equal(source.headingDeg, 270);
|
||||||
|
assert.equal(source.headingConfidence, 'high');
|
||||||
|
assert.equal(source.pitchDeg, -24);
|
||||||
|
assert.equal(source.fovDeg, 56);
|
||||||
|
assert.equal(source.rangeM, 210);
|
||||||
|
assert.equal(source.mountHeightM, 10);
|
||||||
|
assert.equal(source.feedType, 'image');
|
||||||
|
assert.equal(source.sourceKind, 'iceland-vegagerdin');
|
||||||
|
assert.equal(source.code, 'HELLISHEIÐI');
|
||||||
|
assert.match(source.license, /CC BY 4\.0/);
|
||||||
|
assert.ok(source.url.startsWith(ICELAND_IMAGE_ORIGIN));
|
||||||
|
assert.equal(source.snapshotUrl, source.url);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a view that states no facing takes the low-confidence id-hash pose', () => {
|
||||||
|
const source = icelandCameraToSource(
|
||||||
|
row({
|
||||||
|
Skyring: 'Hellisheiði séð niður á veg',
|
||||||
|
Slod: `${ICELAND_IMAGE_ORIGIN}hellisheidi_2.jpg`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
assert.equal(source.headingConfidence, 'low');
|
||||||
|
assert.equal(source.headingDeg % 22.5, 0);
|
||||||
|
assert.equal(
|
||||||
|
source.headingDeg,
|
||||||
|
icelandCameraToSource(
|
||||||
|
row({ Slod: `${ICELAND_IMAGE_ORIGIN}hellisheidi_2.jpg` }),
|
||||||
|
).headingDeg,
|
||||||
|
'the fallback depends on the id, not on the text',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the label collapses the feed’s doubled spaces and repeated words', () => {
|
||||||
|
assert.equal(
|
||||||
|
icelandCameraToSource(
|
||||||
|
row({ Skyring: 'Strandarheiði séð niður á veg til til austurs' }),
|
||||||
|
).name,
|
||||||
|
'Strandarheiði séð niður á veg til austurs',
|
||||||
|
);
|
||||||
|
const label = (Skyring) => icelandCameraToSource(row({ Skyring })).name;
|
||||||
|
// Repeats of words with Icelandic letters collapse too.
|
||||||
|
assert.equal(
|
||||||
|
label('Hellisheiði séð séð til austurs'),
|
||||||
|
'Hellisheiði séð til austurs',
|
||||||
|
);
|
||||||
|
assert.equal(label('Brú á á Jökulsá'), 'Brú á Jökulsá');
|
||||||
|
// A word ending in a letter the next word starts with is not a repeat.
|
||||||
|
for (const text of [
|
||||||
|
'Þverá Árnessýslu',
|
||||||
|
'brú Úlfarsá',
|
||||||
|
'Vesturlandsvegur við Elliðaá Ártúnsbrekku',
|
||||||
|
])
|
||||||
|
assert.equal(label(text), text);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a row with no label, station or station number is named by its frame', () => {
|
||||||
|
const source = icelandCameraToSource(
|
||||||
|
row({ Skyring: '', Myndavel: '', Maelist_nr: undefined }),
|
||||||
|
);
|
||||||
|
assert.equal(source.name, 'Vegagerðin hellisheidi_1');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('only an explicit facing sets a heading', () => {
|
||||||
|
const cases = [
|
||||||
|
['Hellisheiði séð til vesturs', 270],
|
||||||
|
['Holtavörðuheiði til norðurs', 0],
|
||||||
|
['Klettsháls í suður', 180],
|
||||||
|
['Arnarneshæð séð austur', 90],
|
||||||
|
['Bústaðabrú séð norður Kringlumýrarbraut', 0],
|
||||||
|
['Staður séð til norðausturs', 45],
|
||||||
|
['Staður séð til suðausturs', 135],
|
||||||
|
['Staður séð í suðvestur', 225],
|
||||||
|
['Staður séð til norðvesturs', 315],
|
||||||
|
['STAÐUR SÉÐ TIL VESTURS', 270],
|
||||||
|
['Brú séð til austurs og Selfoss', 90], // "og" then a place, not a facing
|
||||||
|
['Staður séð til austurs og Vesturlandsvegur', 90],
|
||||||
|
];
|
||||||
|
for (const [text, heading] of cases) {
|
||||||
|
assert.equal(icelandHeadingFromDescription(text), heading, text);
|
||||||
|
}
|
||||||
|
for (const text of [
|
||||||
|
'',
|
||||||
|
null,
|
||||||
|
'Gautsdalur niður á veg',
|
||||||
|
'Miklabraut austur', // a road direction, not a facing
|
||||||
|
'Biskupsháls - norður',
|
||||||
|
'Hringtorg norðan Selfoss',
|
||||||
|
'Norðurárdalur niður á veg', // a place name that contains a cardinal
|
||||||
|
'Staður séð til suðurlands', // a longer word, not "suður"
|
||||||
|
'Staður séð til norðurs og til suðurs', // two facings: ambiguous
|
||||||
|
'Staður séð til austurs og vesturs', // the second facing shares "til"
|
||||||
|
'Staður séð í norður og suður',
|
||||||
|
'Staður séð í norður og í suður',
|
||||||
|
'Norðfjarðargöng séð til Eskifjarðar',
|
||||||
|
]) {
|
||||||
|
assert.ok(Number.isNaN(icelandHeadingFromDescription(text)), String(text));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('rows off the pinned directory, or with unusable frames or places, are dropped', () => {
|
||||||
|
const bad = [
|
||||||
|
{ Slod: 'https://example.com/vgdata/vefmyndavelar/a_1.jpg' },
|
||||||
|
{ Slod: 'http://www.vegagerdin.is/vgdata/vefmyndavelar/a_1.jpg' },
|
||||||
|
{ Slod: 'https://user:[email protected]/vgdata/vefmyndavelar/a_1.jpg' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is:8443/vgdata/vefmyndavelar/a_1.jpg' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/other/a_1.jpg' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/../x/a_1.jpg' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/a%2Fb_1.jpg' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/a_1.php' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/a_1' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/' },
|
||||||
|
{ Slod: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/a b_1.jpg' },
|
||||||
|
{ Slod: '' },
|
||||||
|
{ Slod: null },
|
||||||
|
{ Breidd: 0, Lengd: 0 },
|
||||||
|
{ Breidd: null, Lengd: null },
|
||||||
|
{ Breidd: '64.01', Lengd: '-21.4' },
|
||||||
|
{ Breidd: '64.01' }, // each coordinate must be a number on its own
|
||||||
|
{ Lengd: '-21.4' },
|
||||||
|
{ Breidd: 59.9, Lengd: 10.7 }, // Oslo
|
||||||
|
{ Breidd: 64.01, Lengd: 21.4 }, // wrong hemisphere
|
||||||
|
];
|
||||||
|
for (const over of bad) {
|
||||||
|
assert.equal(icelandCameraToSource(row(over)), null, JSON.stringify(over));
|
||||||
|
}
|
||||||
|
assert.equal(icelandCameraToSource(null), null);
|
||||||
|
assert.equal(icelandCameraToSource({}), null);
|
||||||
|
assert.equal(isLikelyIcelandCoordinate(64.1466, -21.9426), true);
|
||||||
|
assert.equal(isLikelyIcelandCoordinate(66.3, -14.0), true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the Iceland loader reads the list with redirects refused and keeps the nearest cameras', async (t) => {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
withEnv(t, { CCTV_ICELAND_MAX_SOURCES: '8' });
|
||||||
|
const rows = Array.from({ length: 12 }, (_, i) =>
|
||||||
|
row({
|
||||||
|
Maelist_nr: 8000 + i,
|
||||||
|
Slod: `${ICELAND_IMAGE_ORIGIN}far_${i}.jpg`,
|
||||||
|
Skyring: `Far ${i}`,
|
||||||
|
Breidd: 66.2,
|
||||||
|
Lengd: -15.9 + i * 0.01,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
// Reykjavík cameras come last in the feed but first in the priority order.
|
||||||
|
// A frame the feed repeats keeps its last row, as the other packs do.
|
||||||
|
rows.push(row({ Slod: `${ICELAND_IMAGE_ORIGIN}rvk_1.jpg`, Skyring: 'Old' }));
|
||||||
|
rows.push(
|
||||||
|
row({
|
||||||
|
Slod: `${ICELAND_IMAGE_ORIGIN}rvk_1.jpg`,
|
||||||
|
Skyring: 'Kringlumýrarbraut',
|
||||||
|
Breidd: 64.1466,
|
||||||
|
Lengd: -21.9426,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const seen = [];
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url, init) => {
|
||||||
|
seen.push([String(url), init.redirect]);
|
||||||
|
return json(rows);
|
||||||
|
});
|
||||||
|
const sources = await loadIcelandSourcesFromOpenData();
|
||||||
|
assert.deepEqual(seen, [[ICELAND_CAMERAS_URL, 'manual']]);
|
||||||
|
assert.equal(sources.length, 8);
|
||||||
|
assert.equal(sources[0].id, 'is-vegagerdin-rvk_1');
|
||||||
|
assert.equal(sources[0].name, 'Kringlumýrarbraut');
|
||||||
|
assert.equal(sources[0].lat, 64.1466);
|
||||||
|
assert.equal(
|
||||||
|
new Set(sources.map((s) => s.id)).size,
|
||||||
|
sources.length,
|
||||||
|
'a frame the feed repeats collapses to one camera',
|
||||||
|
);
|
||||||
|
assert.equal(sources.available, 13);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the default Iceland cap is DEFAULT_ICELAND_MAX_SOURCES', async (t) => {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
withEnv(t, { CCTV_ICELAND_MAX_SOURCES: undefined });
|
||||||
|
const rows = Array.from(
|
||||||
|
{ length: DEFAULT_ICELAND_MAX_SOURCES + 40 },
|
||||||
|
(_, i) => row({ Slod: `${ICELAND_IMAGE_ORIGIN}cam_${i}.jpg` }),
|
||||||
|
);
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => json(rows));
|
||||||
|
assert.equal(
|
||||||
|
(await loadIcelandSourcesFromOpenData()).length,
|
||||||
|
DEFAULT_ICELAND_MAX_SOURCES,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV_ICELAND_MAX_SOURCES is clamped to 8..600 and ignored when not a number', async (t) => {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
withEnv(t, { CCTV_ICELAND_MAX_SOURCES: undefined });
|
||||||
|
const rows = Array.from({ length: 650 }, (_, i) =>
|
||||||
|
row({ Slod: `${ICELAND_IMAGE_ORIGIN}cam_${i}.jpg` }),
|
||||||
|
);
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => json(rows));
|
||||||
|
for (const [value, expected] of [
|
||||||
|
['0', 8],
|
||||||
|
['3', 8],
|
||||||
|
['1000', 600],
|
||||||
|
['abc', DEFAULT_ICELAND_MAX_SOURCES],
|
||||||
|
]) {
|
||||||
|
process.env.CCTV_ICELAND_MAX_SOURCES = value;
|
||||||
|
assert.equal(
|
||||||
|
(await loadIcelandSourcesFromOpenData()).length,
|
||||||
|
expected,
|
||||||
|
value,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a redirect on the Iceland frame host stays inside vefmyndavelar/', async () => {
|
||||||
|
const frame = `${ICELAND_IMAGE_ORIGIN}hellisheidi_1.jpg`;
|
||||||
|
const redirectTo = (location) => async (url) =>
|
||||||
|
url === frame
|
||||||
|
? new Response(null, { status: 302, headers: { location } })
|
||||||
|
: new Response('frame', { headers: { 'content-type': 'image/jpeg' } });
|
||||||
|
for (const location of [
|
||||||
|
'/vgdata/other/x.jpg',
|
||||||
|
'/vgdata/vefmyndavelar/../x.jpg',
|
||||||
|
'/',
|
||||||
|
])
|
||||||
|
assert.equal(
|
||||||
|
await fetchWithinHost(frame, {}, redirectTo(location)),
|
||||||
|
null,
|
||||||
|
location,
|
||||||
|
);
|
||||||
|
const followed = await fetchWithinHost(
|
||||||
|
frame,
|
||||||
|
{},
|
||||||
|
redirectTo('/vgdata/vefmyndavelar/hellisheidi_1b.jpg'),
|
||||||
|
);
|
||||||
|
assert.equal(await followed.text(), 'frame');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the Iceland loader fails soft on HTTP errors, bad payloads and network errors', async (t) => {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
t.mock.method(
|
||||||
|
globalThis,
|
||||||
|
'fetch',
|
||||||
|
async () => new Response('x', { status: 503 }),
|
||||||
|
);
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
t.mock.restoreAll();
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => json({ rows: [] }));
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
t.mock.method(
|
||||||
|
globalThis,
|
||||||
|
'fetch',
|
||||||
|
async () => new Response('<html>', { status: 200 }),
|
||||||
|
);
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => {
|
||||||
|
throw new Error('network down');
|
||||||
|
});
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the Iceland catalog fetch refuses redirects and oversized bodies', async (t) => {
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
const redirected = streamingResponse({
|
||||||
|
status: 302,
|
||||||
|
headers: {
|
||||||
|
location: 'http://gagnaveita.vegagerdin.is/api/vefmyndavelar2014_1',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => redirected.response);
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
assert.equal(
|
||||||
|
redirected.state.cancelled,
|
||||||
|
true,
|
||||||
|
'the redirect body is cancelled',
|
||||||
|
);
|
||||||
|
|
||||||
|
t.mock.restoreAll();
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
const failed = streamingResponse({ status: 500 });
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => failed.response);
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
assert.equal(failed.state.cancelled, true, 'the error body is cancelled');
|
||||||
|
|
||||||
|
const valid = JSON.stringify([row()]);
|
||||||
|
t.mock.restoreAll();
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => {
|
||||||
|
return new Response(valid, {
|
||||||
|
headers: { 'content-length': String(ICELAND_MAX_CATALOG_BYTES + 1) },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
|
||||||
|
t.mock.restoreAll();
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => {
|
||||||
|
const padded = valid + ' '.repeat(ICELAND_MAX_CATALOG_BYTES + 1024);
|
||||||
|
return new Response(
|
||||||
|
new ReadableStream({
|
||||||
|
start(controller) {
|
||||||
|
controller.enqueue(new TextEncoder().encode(padded));
|
||||||
|
controller.close();
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
assert.deepEqual(await loadIcelandSourcesFromOpenData(), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV catalog merges Iceland cameras and CCTV_ICELAND_ENABLED=0 skips the request', async (t) => {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
const sourceRoot = fs.mkdtempSync(
|
||||||
|
path.join(os.tmpdir(), 'gev-cctv-catalog-iceland-'),
|
||||||
|
);
|
||||||
|
t.after(() => fs.rmSync(sourceRoot, { recursive: true, force: true }));
|
||||||
|
withEnv(t, {
|
||||||
|
CCTV_SOURCES_FILE: undefined,
|
||||||
|
CCTV_SOURCES_JSON: undefined,
|
||||||
|
CCTV_FORCE_AUSTIN: undefined,
|
||||||
|
CCTV_PREFER_AUSTIN: undefined,
|
||||||
|
CCTV_MAX_SOURCES: undefined,
|
||||||
|
CCTV_CALTRANS_DISTRICTS: undefined,
|
||||||
|
CCTV_TFL_ENABLED: undefined,
|
||||||
|
CCTV_ICELAND_ENABLED: undefined,
|
||||||
|
CCTV_ICELAND_MAX_SOURCES: undefined,
|
||||||
|
});
|
||||||
|
const requested = [];
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url, init) => {
|
||||||
|
requested.push([String(url), init.redirect]);
|
||||||
|
if (String(url) !== ICELAND_CAMERAS_URL) {
|
||||||
|
return new Response('unavailable', { status: 503 });
|
||||||
|
}
|
||||||
|
return json([row()]);
|
||||||
|
});
|
||||||
|
|
||||||
|
const sources = await createCctvCatalog({ sourceRoot })();
|
||||||
|
assert.deepEqual(
|
||||||
|
sources.map((source) => source.id),
|
||||||
|
['is-vegagerdin-hellisheidi_1'],
|
||||||
|
);
|
||||||
|
|
||||||
|
process.env.CCTV_ICELAND_ENABLED = '0';
|
||||||
|
requested.length = 0;
|
||||||
|
assert.deepEqual(await createCctvCatalog({ sourceRoot })(), []);
|
||||||
|
assert.ok(requested.length > 0, 'the other live packs still load');
|
||||||
|
assert.equal(
|
||||||
|
requested.some(([url]) => url === ICELAND_CAMERAS_URL),
|
||||||
|
false,
|
||||||
|
'a disabled pack makes no request',
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
nycCameraToSource,
|
nycCameraToSource,
|
||||||
} from '../../server/providers/cctv/sources.js';
|
} from '../../server/providers/cctv/sources.js';
|
||||||
import {
|
import {
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
DEFAULT_NYC_MAX_SOURCES,
|
DEFAULT_NYC_MAX_SOURCES,
|
||||||
NYC_CAMERAS_URL,
|
NYC_CAMERAS_URL,
|
||||||
NYC_GROUND_ELEVATION_M,
|
NYC_GROUND_ELEVATION_M,
|
||||||
@@ -375,8 +375,8 @@ for (const [label, flag] of [
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
test('the shipped catalog ceiling is not raised to make room for this pack', () => {
|
test('the shared catalog slots are not raised to make room for this pack', () => {
|
||||||
assert.equal(DEFAULT_CCTV_MAX_SOURCES, 4000);
|
assert.equal(CCTV_SHARED_SOURCE_SLOTS, 4000);
|
||||||
assert.equal(DEFAULT_NYC_MAX_SOURCES, 250);
|
assert.equal(DEFAULT_NYC_MAX_SOURCES, 250);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,255 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import fs from 'node:fs';
|
||||||
|
import os from 'node:os';
|
||||||
|
import path from 'node:path';
|
||||||
|
import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
|
||||||
|
import {
|
||||||
|
OTTAWA_CAMERAS_URL,
|
||||||
|
OTTAWA_IMAGE_ORIGIN,
|
||||||
|
} from '../../server/providers/cctv/constants.js';
|
||||||
|
import {
|
||||||
|
fallbackHeadingFromId,
|
||||||
|
pinnedCameraUrl,
|
||||||
|
} from '../../server/providers/cctv/normalize.js';
|
||||||
|
import {
|
||||||
|
_resetOttawaCertificateWarningForTest,
|
||||||
|
loadOttawaSourcesFromOpenData,
|
||||||
|
ottawaAuthorizedFrameUrl,
|
||||||
|
} from '../../server/providers/cctv/ottawa.js';
|
||||||
|
|
||||||
|
const CERT = { OTTAWA_CAMERA_CERTIFICATE: 'CERT123' };
|
||||||
|
|
||||||
|
/** Set (or, for `undefined`, delete) environment variables for one test. */
|
||||||
|
function withEnv(t, env) {
|
||||||
|
for (const [name, value] of Object.entries(env)) {
|
||||||
|
const previous = process.env[name];
|
||||||
|
t.after(() => {
|
||||||
|
if (previous === undefined) delete process.env[name];
|
||||||
|
else process.env[name] = previous;
|
||||||
|
});
|
||||||
|
if (value === undefined) delete process.env[name];
|
||||||
|
else process.env[name] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Silence the loader's progress and failure logging. */
|
||||||
|
function quiet(t) {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One documented `/map/service/camera` row carrying the fields the loader reads. */
|
||||||
|
function ottawaRow(number, lat, lon, overrides = {}) {
|
||||||
|
return {
|
||||||
|
id: number + 10000,
|
||||||
|
camera_number: number,
|
||||||
|
name: `Camera ${number}`,
|
||||||
|
name_french: `Caméra ${number}`,
|
||||||
|
cameraOwner: 'CITY',
|
||||||
|
latitude: lat,
|
||||||
|
longitude: lon,
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The feed's envelope around its rows. */
|
||||||
|
const ottawaPayload = (rows) => Response.json({ cameras: rows });
|
||||||
|
|
||||||
|
test('without OTTAWA_CAMERA_CERTIFICATE the Ottawa pack is skipped with no request, logged once', async (t) => {
|
||||||
|
_resetOttawaCertificateWarningForTest();
|
||||||
|
const lines = [];
|
||||||
|
t.mock.method(console, 'warn', (line) => lines.push(String(line)));
|
||||||
|
const fetchMock = t.mock.method(globalThis, 'fetch', async () => {
|
||||||
|
throw new Error('no request expected');
|
||||||
|
});
|
||||||
|
assert.deepEqual(await loadOttawaSourcesFromOpenData({}, {}), []);
|
||||||
|
assert.deepEqual(
|
||||||
|
await loadOttawaSourcesFromOpenData({}, { OTTAWA_CAMERA_CERTIFICATE: ' ' }),
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
assert.equal(fetchMock.mock.callCount(), 0);
|
||||||
|
assert.equal(lines.length, 1);
|
||||||
|
assert.match(lines[0], /OTTAWA_CAMERA_CERTIFICATE/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Ottawa frame URLs are signed only inside the opendata camera path', () => {
|
||||||
|
assert.equal(
|
||||||
|
ottawaAuthorizedFrameUrl('https://traffic.ottawa.ca/opendata/camera?c=16', CERT),
|
||||||
|
'https://traffic.ottawa.ca/opendata/camera?c=16&certificate=CERT123&id=gev',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
ottawaAuthorizedFrameUrl('https://traffic.ottawa.ca/opendata/camera?c=16', {}),
|
||||||
|
'',
|
||||||
|
'no certificate, no signed URL',
|
||||||
|
);
|
||||||
|
for (const url of [
|
||||||
|
'https://traffic.ottawa.ca/opendata/camera?c=16x',
|
||||||
|
'https://traffic.ottawa.ca/opendata/other?c=16',
|
||||||
|
'https://traffic.ottawa.ca/map/camera?id=16',
|
||||||
|
'https://traffic.ottawa.ca.evil.test/opendata/camera?c=16',
|
||||||
|
'http://traffic.ottawa.ca/opendata/camera?c=16',
|
||||||
|
])
|
||||||
|
assert.equal(ottawaAuthorizedFrameUrl(url, CERT), '', url);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Ottawa loader keeps in-city cameras and builds keyless frame URLs from the camera number', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
withEnv(t, { CCTV_OTTAWA_MAX_SOURCES: undefined });
|
||||||
|
const requested = [];
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url) => {
|
||||||
|
requested.push(String(url));
|
||||||
|
return ottawaPayload([
|
||||||
|
ottawaRow(2025, 45.341343, -75.81467, {
|
||||||
|
name: '(MTO) Hwy 416 NB ramp to Hwy 417 East',
|
||||||
|
cameraOwner: 'MTO',
|
||||||
|
}),
|
||||||
|
ottawaRow(1, 45.4215, -75.6972, {
|
||||||
|
name: 'Bank St at Somerset St',
|
||||||
|
camera_owner: 'CITY',
|
||||||
|
cameraOwner: undefined,
|
||||||
|
}),
|
||||||
|
ottawaRow(1, 45.4216, -75.6973, { name: 'duplicate number' }),
|
||||||
|
ottawaRow(0, 45.4215, -75.6972),
|
||||||
|
ottawaRow(-3, 45.4215, -75.6972),
|
||||||
|
ottawaRow(7, null, -75.7),
|
||||||
|
ottawaRow(8, 45.4, null),
|
||||||
|
ottawaRow(9, 43.6532, -79.3832, { description: 'Toronto' }),
|
||||||
|
ottawaRow(10, 45.9, -75.7),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
const cameras = await loadOttawaSourcesFromOpenData({}, CERT);
|
||||||
|
|
||||||
|
assert.deepEqual(requested, [OTTAWA_CAMERAS_URL]);
|
||||||
|
assert.deepEqual(cameras.map((camera) => camera.id).sort(), [
|
||||||
|
'ottawa-1',
|
||||||
|
'ottawa-2025',
|
||||||
|
]);
|
||||||
|
|
||||||
|
const mto = cameras.find((camera) => camera.id === 'ottawa-2025');
|
||||||
|
const city = cameras.find((camera) => camera.id === 'ottawa-1');
|
||||||
|
assert.equal(mto.url, 'https://traffic.ottawa.ca/opendata/camera?c=2025');
|
||||||
|
assert.doesNotMatch(mto.url, /certificate/, 'the catalog URL carries no key');
|
||||||
|
assert.equal(mto.snapshotUrl, mto.url);
|
||||||
|
assert.equal(mto.frameRefreshMs, 60000, 'the API allows one fetch a minute');
|
||||||
|
assert.equal(city.name, 'Bank St at Somerset St');
|
||||||
|
assert.equal(mto.name, '(MTO) Hwy 416 NB ramp to Hwy 417 East');
|
||||||
|
assert.equal(mto.city, 'Ottawa');
|
||||||
|
assert.equal(mto.provider, 'City of Ottawa');
|
||||||
|
assert.equal(mto.feedType, 'image');
|
||||||
|
assert.equal(mto.sourceKind, 'ottawa-traffic');
|
||||||
|
assert.equal(mto.headingConfidence, 'low');
|
||||||
|
assert.equal(
|
||||||
|
mto.headingDeg,
|
||||||
|
fallbackHeadingFromId('ottawa-2025'),
|
||||||
|
'the feed publishes no bearing, so the id-hash fallback is deterministic',
|
||||||
|
);
|
||||||
|
assert.match(mto.license, /City of Ottawa/);
|
||||||
|
assert.equal(
|
||||||
|
mto.credit,
|
||||||
|
'Ministry of Transportation of Ontario (MTO) camera',
|
||||||
|
'a provincial camera carried on the city feed names its owner',
|
||||||
|
);
|
||||||
|
assert.equal(city.credit, '', 'a city camera carries no partner credit');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Ottawa loader keeps the cameras nearest downtown under its cap', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
withEnv(t, { CCTV_OTTAWA_MAX_SOURCES: '8' });
|
||||||
|
const rows = [
|
||||||
|
// Far suburbs come first in payload order, so only distance can drop them.
|
||||||
|
...[45.55, 45.54, 45.53, 45.52].map((lat, i) =>
|
||||||
|
ottawaRow(100 + i, lat, -76.1),
|
||||||
|
),
|
||||||
|
...[45.42, 45.421, 45.422, 45.423, 45.424, 45.425, 45.426, 45.427].map(
|
||||||
|
(lat, i) => ottawaRow(200 + i, lat, -75.7),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
t.mock.method(globalThis, 'fetch', async () => ottawaPayload(rows));
|
||||||
|
|
||||||
|
const cameras = await loadOttawaSourcesFromOpenData({}, CERT);
|
||||||
|
|
||||||
|
assert.equal(cameras.length, 8);
|
||||||
|
assert.deepEqual(
|
||||||
|
cameras.map((camera) => camera.id).filter((id) => /^ottawa-10\d$/.test(id)),
|
||||||
|
[],
|
||||||
|
'the far-suburb cameras are the ones dropped',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Ottawa loader fails soft on HTTP errors, unexpected payloads and network errors', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
let respond;
|
||||||
|
t.mock.method(globalThis, 'fetch', (...args) => respond(...args));
|
||||||
|
for (respond of [
|
||||||
|
async () => new Response('unavailable', { status: 503 }),
|
||||||
|
async () => Response.json({ cameras: [] }),
|
||||||
|
async () => Response.json([ottawaRow(1, 45.4215, -75.6972)]),
|
||||||
|
async () => {
|
||||||
|
throw new TypeError('fetch failed');
|
||||||
|
},
|
||||||
|
]) {
|
||||||
|
assert.deepEqual(await loadOttawaSourcesFromOpenData({}, CERT), []);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV catalog merges Ottawa cameras with a certificate and CCTV_OTTAWA_ENABLED=0 skips the request', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const sourceRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'gev-cctv-ottawa-'));
|
||||||
|
t.after(() => fs.rmSync(sourceRoot, { recursive: true, force: true }));
|
||||||
|
withEnv(t, {
|
||||||
|
CCTV_SOURCES_FILE: undefined,
|
||||||
|
CCTV_SOURCES_JSON: undefined,
|
||||||
|
CCTV_FORCE_AUSTIN: undefined,
|
||||||
|
CCTV_PREFER_AUSTIN: undefined,
|
||||||
|
CCTV_MAX_SOURCES: undefined,
|
||||||
|
CCTV_OTTAWA_ENABLED: undefined,
|
||||||
|
CCTV_OTTAWA_MAX_SOURCES: undefined,
|
||||||
|
CCTV_QUEBEC_ENABLED: '0',
|
||||||
|
CCTV_WORLD_CAMERAS_ENABLED: '0',
|
||||||
|
OTTAWA_CAMERA_CERTIFICATE: 'CERT123',
|
||||||
|
});
|
||||||
|
const requested = [];
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url) => {
|
||||||
|
requested.push(String(url));
|
||||||
|
// Every other live pack is down; only Ottawa answers.
|
||||||
|
return String(url) === OTTAWA_CAMERAS_URL
|
||||||
|
? ottawaPayload([ottawaRow(1, 45.4215, -75.6972)])
|
||||||
|
: new Response('unavailable', { status: 503 });
|
||||||
|
});
|
||||||
|
|
||||||
|
const sources = await createCctvCatalog({ sourceRoot })();
|
||||||
|
assert.deepEqual(
|
||||||
|
sources.map((source) => source.id),
|
||||||
|
['ottawa-1'],
|
||||||
|
);
|
||||||
|
assert.equal(sources[0].url, 'https://traffic.ottawa.ca/opendata/camera?c=1');
|
||||||
|
|
||||||
|
process.env.CCTV_OTTAWA_ENABLED = '0';
|
||||||
|
requested.length = 0;
|
||||||
|
assert.deepEqual(await createCctvCatalog({ sourceRoot })(), []);
|
||||||
|
assert.ok(requested.length > 0, 'the other live packs still load');
|
||||||
|
assert.equal(
|
||||||
|
requested.includes(OTTAWA_CAMERAS_URL),
|
||||||
|
false,
|
||||||
|
'a disabled pack makes no request',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Ottawa frames stay inside the city image directory', () => {
|
||||||
|
assert.ok(
|
||||||
|
pinnedCameraUrl(
|
||||||
|
'https://traffic.ottawa.ca/opendata/camera?c=309',
|
||||||
|
OTTAWA_IMAGE_ORIGIN,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
for (const url of [
|
||||||
|
'https://traffic.ottawa.ca.evil.test/opendata/camera?c=309',
|
||||||
|
'https://traffic.ottawa.ca/map/camera?id=309',
|
||||||
|
'https://user:[email protected]/opendata/camera?c=309',
|
||||||
|
'https://traffic.ottawa.ca:8443/opendata/camera?c=309',
|
||||||
|
'http://traffic.ottawa.ca/opendata/camera?c=309',
|
||||||
|
])
|
||||||
|
assert.equal(pinnedCameraUrl(url, OTTAWA_IMAGE_ORIGIN), null, url);
|
||||||
|
});
|
||||||
@@ -313,3 +313,234 @@ test('CCTV upstream frame fetch accepts only raster image types and sends their
|
|||||||
assert.equal(state.cancelled, true, `${contentType}: body cancelled`);
|
assert.equal(state.cancelled, true, `${contentType}: body cancelled`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function multipartResponse(contentType, chunks, { onCancel = () => {} } = {}) {
|
||||||
|
let nextChunk = 0;
|
||||||
|
const body = new ReadableStream(
|
||||||
|
{
|
||||||
|
pull(controller) {
|
||||||
|
if (nextChunk >= chunks.length) {
|
||||||
|
controller.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
controller.enqueue(chunks[nextChunk++]);
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
onCancel();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ highWaterMark: 0 },
|
||||||
|
);
|
||||||
|
return new Response(body, {
|
||||||
|
status: 200,
|
||||||
|
headers: { 'Content-Type': contentType },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function jpegPart(boundary, body, contentType = 'image/jpeg', length = body.length) {
|
||||||
|
return Buffer.concat([
|
||||||
|
Buffer.from(
|
||||||
|
'--' +
|
||||||
|
boundary +
|
||||||
|
'\r\nContent-Type: ' +
|
||||||
|
contentType +
|
||||||
|
'\r\nContent-Length: ' +
|
||||||
|
length +
|
||||||
|
'\r\n\r\n',
|
||||||
|
),
|
||||||
|
body,
|
||||||
|
Buffer.from('\r\n'),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
test('CCTV upstream frame fetch extracts only the first JPEG from MJPEG', async () => {
|
||||||
|
const boundary = 'DIGIEVER';
|
||||||
|
const first = Buffer.from([0xff, 0xd8, 0x11, 0x22, 0xff, 0xd9]);
|
||||||
|
const second = Buffer.from([0xff, 0xd8, 0x33, 0x44, 0xff, 0xd9]);
|
||||||
|
for (const type of [
|
||||||
|
'multipart/x-mixed-replace; boundary=DIGIEVER',
|
||||||
|
'multipart/x-mixed-replace; boundary="DIGIEVER"',
|
||||||
|
]) {
|
||||||
|
let cancelled = false;
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
allowMjpeg: true,
|
||||||
|
maxBytes: 1024,
|
||||||
|
fetchImpl: async () =>
|
||||||
|
multipartResponse(
|
||||||
|
type,
|
||||||
|
[
|
||||||
|
jpegPart(boundary, first),
|
||||||
|
jpegPart(boundary, second),
|
||||||
|
Buffer.from('--' + boundary + '--\r\n'),
|
||||||
|
],
|
||||||
|
{ onCancel: () => { cancelled = true; } },
|
||||||
|
),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert.equal(result?.contentType, 'image/jpeg', type);
|
||||||
|
assert.deepEqual(result?.body, first, type);
|
||||||
|
assert.equal(cancelled, true, type);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV upstream frame fetch rejects malformed and non-JPEG MJPEG parts', async () => {
|
||||||
|
const jpeg = Buffer.from([0xff, 0xd8, 0x01, 0x02, 0xff, 0xd9]);
|
||||||
|
for (const [type, chunks] of [
|
||||||
|
['multipart/x-mixed-replace', []],
|
||||||
|
[
|
||||||
|
'multipart/x-mixed-replace; boundary=DIGIEVER',
|
||||||
|
[jpegPart('DIGIEVER', jpeg, 'image/png')],
|
||||||
|
],
|
||||||
|
]) {
|
||||||
|
let cancelled = false;
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
allowMjpeg: true,
|
||||||
|
fetchImpl: async () =>
|
||||||
|
multipartResponse(type, chunks, { onCancel: () => { cancelled = true; } }),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert.equal(result, null, type);
|
||||||
|
assert.equal(cancelled, true, type);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV upstream frame fetch rejects truncated or oversized MJPEG parts', async () => {
|
||||||
|
const boundary = 'DIGIEVER';
|
||||||
|
const full = Buffer.from([0xff, 0xd8, 0x01, 0x02, 0xff, 0xd9]);
|
||||||
|
const truncated = Buffer.from([0xff, 0xd8, 0x01, 0x02]);
|
||||||
|
for (const [chunks, maxBytes] of [
|
||||||
|
[jpegPart(boundary, truncated, 'image/jpeg', full.length), 1024],
|
||||||
|
[jpegPart(boundary, full), 5],
|
||||||
|
]) {
|
||||||
|
let cancelled = false;
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
allowMjpeg: true,
|
||||||
|
maxBytes,
|
||||||
|
fetchImpl: async () =>
|
||||||
|
multipartResponse(
|
||||||
|
'multipart/x-mixed-replace; boundary=' + boundary,
|
||||||
|
[chunks],
|
||||||
|
{ onCancel: () => { cancelled = true; } },
|
||||||
|
),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert.equal(result, null);
|
||||||
|
assert.equal(cancelled, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV upstream frame fetch does not cross into a later part when the first JPEG is truncated', async () => {
|
||||||
|
const boundary = 'DIGIEVER';
|
||||||
|
const truncated = Buffer.from([0xff, 0xd8, 0x01, 0x02]);
|
||||||
|
const valid = Buffer.from([0xff, 0xd8, 0x03, 0x04, 0xff, 0xd9]);
|
||||||
|
const wire = Buffer.concat([
|
||||||
|
Buffer.from(
|
||||||
|
'--' + boundary + '\r\nContent-Type: image/jpeg\r\n\r\n',
|
||||||
|
),
|
||||||
|
truncated,
|
||||||
|
Buffer.from(
|
||||||
|
'\r\n--' +
|
||||||
|
boundary +
|
||||||
|
'\r\nContent-Type: image/jpeg\r\nContent-Length: ' +
|
||||||
|
valid.length +
|
||||||
|
'\r\n\r\n',
|
||||||
|
),
|
||||||
|
valid,
|
||||||
|
Buffer.from('\r\n--' + boundary + '--\r\n'),
|
||||||
|
]);
|
||||||
|
let cancelled = false;
|
||||||
|
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
allowMjpeg: true,
|
||||||
|
maxBytes: 1024,
|
||||||
|
fetchImpl: async () =>
|
||||||
|
multipartResponse(
|
||||||
|
'multipart/x-mixed-replace; boundary=' + boundary,
|
||||||
|
[wire],
|
||||||
|
{ onCancel: () => { cancelled = true; } },
|
||||||
|
),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.equal(result, null);
|
||||||
|
assert.equal(cancelled, true);
|
||||||
|
});
|
||||||
|
test('CCTV upstream frame fetch ignores MJPEG unless the source is registered as MJPEG', async () => {
|
||||||
|
const boundary = 'DIGIEVER';
|
||||||
|
const jpeg = Buffer.from([0xff, 0xd8, 0x11, 0x22, 0xff, 0xd9]);
|
||||||
|
let cancelled = false;
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
fetchImpl: async () =>
|
||||||
|
multipartResponse(
|
||||||
|
'multipart/x-mixed-replace; boundary=' + boundary,
|
||||||
|
[jpegPart(boundary, jpeg)],
|
||||||
|
{ onCancel: () => { cancelled = true; } },
|
||||||
|
),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert.equal(result, null);
|
||||||
|
assert.equal(cancelled, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV upstream frame fetch accepts a CRLF preamble and a boundary that already starts with --', async () => {
|
||||||
|
const jpeg = Buffer.from([0xff, 0xd8, 0x11, 0x22, 0xff, 0xd9]);
|
||||||
|
for (const [type, wire] of [
|
||||||
|
[
|
||||||
|
'multipart/x-mixed-replace; boundary=DIGIEVER',
|
||||||
|
Buffer.concat([Buffer.from('\r\n'), jpegPart('DIGIEVER', jpeg)]),
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'multipart/x-mixed-replace; boundary=--myboundary',
|
||||||
|
Buffer.concat([
|
||||||
|
Buffer.from(
|
||||||
|
'--myboundary\r\nContent-Type: image/jpeg\r\nContent-Length: ' +
|
||||||
|
jpeg.length +
|
||||||
|
'\r\n\r\n',
|
||||||
|
),
|
||||||
|
jpeg,
|
||||||
|
Buffer.from('\r\n--myboundary\r\n'),
|
||||||
|
]),
|
||||||
|
],
|
||||||
|
]) {
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
allowMjpeg: true,
|
||||||
|
fetchImpl: async () => multipartResponse(type, [wire]),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert.deepEqual(result?.body, jpeg, type);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CCTV MJPEG part without Content-Length ends at the next delimiter, not at an inner JPEG end marker', async () => {
|
||||||
|
const boundary = 'DIGIEVER';
|
||||||
|
// An EXIF thumbnail's own FF D9 sits inside the image.
|
||||||
|
const jpeg = Buffer.from([0xff, 0xd8, 0x01, 0xff, 0xd9, 0x02, 0x03, 0xff, 0xd9]);
|
||||||
|
const wire = Buffer.concat([
|
||||||
|
Buffer.from('--' + boundary + '\r\nContent-Type: image/jpeg\r\n\r\n'),
|
||||||
|
jpeg,
|
||||||
|
Buffer.from('\r\n--' + boundary + '\r\nContent-Type: image/jpeg\r\n\r\n'),
|
||||||
|
]);
|
||||||
|
// Delivered one byte at a time, as a trickling upstream would.
|
||||||
|
const chunks = [...wire].map((byte) => Buffer.from([byte]));
|
||||||
|
const result = await fetchCctvImageFromUpstream(
|
||||||
|
'https://cctv-ss02.thb.gov.tw/T62-9K+020',
|
||||||
|
{
|
||||||
|
allowMjpeg: true,
|
||||||
|
fetchImpl: async () =>
|
||||||
|
multipartResponse('multipart/x-mixed-replace; boundary=' + boundary, chunks),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert.deepEqual(result?.body, jpeg);
|
||||||
|
});
|
||||||
@@ -182,6 +182,86 @@ test('loader deduplicates cameras that share a camera number', async (t) => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('falls back to Highway Bureau MJPEG cameras when the Freeway catalog fails', async (t) => {
|
||||||
|
const highwayUrl = 'https://cctv-maintain.thb.gov.tw/opendataCCTVs.xml';
|
||||||
|
const requests = [];
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url, options) => {
|
||||||
|
const href = String(url);
|
||||||
|
requests.push(href);
|
||||||
|
assert.equal(options.redirect, 'manual');
|
||||||
|
if (href === TAIWAN_FREEWAY_CCTV_URL)
|
||||||
|
return new Response('', { status: 503 });
|
||||||
|
if (href === highwayUrl) {
|
||||||
|
return new Response(
|
||||||
|
cctvXml(
|
||||||
|
block({
|
||||||
|
id: 'CCTV-14-0620-009-002',
|
||||||
|
stream: 'https://cctv-ss02.thb.gov.tw:443/T62-9K+020',
|
||||||
|
lat: '24.9967',
|
||||||
|
lon: '121.4521',
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
{ headers: { 'content-type': 'application/xml' } },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
throw new Error('Unexpected Taiwan feed URL: ' + href);
|
||||||
|
});
|
||||||
|
|
||||||
|
const sources = await loadTaiwanSources();
|
||||||
|
|
||||||
|
assert.deepEqual(requests, [TAIWAN_FREEWAY_CCTV_URL, highwayUrl]);
|
||||||
|
assert.equal(sources.length, 1);
|
||||||
|
assert.equal(sources[0].id, 'tw-thb-cctv-14-0620-009-002');
|
||||||
|
assert.equal(sources[0].cityId, 'taiwan');
|
||||||
|
assert.equal(sources[0].provider, 'Highway Bureau, MOTC');
|
||||||
|
assert.equal(sources[0].feedType, 'mjpeg');
|
||||||
|
assert.equal(sources[0].sourceKind, 'taiwan-highway-motc');
|
||||||
|
assert.equal(new URL(sources[0].url).hostname, 'cctv-ss02.thb.gov.tw');
|
||||||
|
assert.equal(new URL(sources[0].url).pathname, '/T62-9K+020');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the Highway Bureau fallback registers only approved HTTPS camera servers', async (t) => {
|
||||||
|
const highwayUrl = 'https://cctv-maintain.thb.gov.tw/opendataCCTVs.xml';
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url) => {
|
||||||
|
if (String(url) === TAIWAN_FREEWAY_CCTV_URL)
|
||||||
|
return new Response('', { status: 503 });
|
||||||
|
if (String(url) === highwayUrl) {
|
||||||
|
return new Response(
|
||||||
|
cctvXml(
|
||||||
|
block({
|
||||||
|
id: 'CCTV-14-0620-009-001',
|
||||||
|
stream: 'https://cctv-ss09.thb.gov.tw/T62-9K+019',
|
||||||
|
}),
|
||||||
|
block({
|
||||||
|
id: 'CCTV-14-0620-009-003',
|
||||||
|
stream: 'http://cctv-ss02.thb.gov.tw/T62-9K+021',
|
||||||
|
}),
|
||||||
|
block({
|
||||||
|
id: 'CCTV-14-0620-009-004',
|
||||||
|
stream: 'https://cctv-ss02.thb.gov.tw:8443/T62-9K+022',
|
||||||
|
}),
|
||||||
|
block({
|
||||||
|
id: 'CCTV-14-0620-009-002',
|
||||||
|
stream: 'https://cctv-ss02.thb.gov.tw:443/T62-9K+020',
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
{ headers: { 'content-type': 'application/xml' } },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
throw new Error('Unexpected Taiwan feed URL: ' + String(url));
|
||||||
|
});
|
||||||
|
|
||||||
|
const sources = await loadTaiwanSources();
|
||||||
|
|
||||||
|
assert.deepEqual(
|
||||||
|
sources.map((source) => source.id),
|
||||||
|
['tw-thb-cctv-14-0620-009-002'],
|
||||||
|
);
|
||||||
|
});
|
||||||
test('a redirected or failed catalog contributes an empty pack', async (t) => {
|
test('a redirected or failed catalog contributes an empty pack', async (t) => {
|
||||||
t.mock.method(console, 'warn', () => {});
|
t.mock.method(console, 'warn', () => {});
|
||||||
for (const status of [302, 503]) {
|
for (const status of [302, 503]) {
|
||||||
@@ -214,13 +294,17 @@ test('the Taiwan pack is in the catalog by default', async (t) => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('CCTV_TAIWAN_ENABLED=0 makes no Freeway Bureau request', async (t) => {
|
test('CCTV_TAIWAN_ENABLED=0 makes no Taiwan catalog request', async (t) => {
|
||||||
const { requested, sources } = await runCatalogWithTaiwanFlag(t, '0');
|
const { requested, sources } = await runCatalogWithTaiwanFlag(t, '0');
|
||||||
assert.ok(requested.length > 0, 'the other packs still refreshed');
|
assert.ok(requested.length > 0, 'the other packs still refreshed');
|
||||||
assert.equal(
|
assert.equal(
|
||||||
requested.some((href) => href.includes('freeway.gov.tw')),
|
requested.some((href) => href.includes('freeway.gov.tw')),
|
||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
|
assert.equal(
|
||||||
|
requested.some((href) => href.includes('cctv-maintain.thb.gov.tw')),
|
||||||
|
false,
|
||||||
|
);
|
||||||
assert.ok(!sources.some((c) => c.cityId === 'taiwan'));
|
assert.ok(!sources.some((c) => c.cityId === 'taiwan'));
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -250,12 +334,12 @@ test('a failed download is not retried until the backoff ends', async (t) => {
|
|||||||
t.mock.method(Date, 'now', () => 1_000_000);
|
t.mock.method(Date, 'now', () => 1_000_000);
|
||||||
assert.deepEqual(await loadTaiwanSources(), []);
|
assert.deepEqual(await loadTaiwanSources(), []);
|
||||||
assert.deepEqual(await loadTaiwanSources(), []);
|
assert.deepEqual(await loadTaiwanSources(), []);
|
||||||
assert.equal(calls, 1, 'the second refresh made no request');
|
assert.equal(calls, 2, 'the second refresh made no request');
|
||||||
Date.now.mock.mockImplementation(
|
Date.now.mock.mockImplementation(
|
||||||
() => 1_000_000 + TAIWAN_RETRY_AFTER_FAILURE_MS + 1,
|
() => 1_000_000 + TAIWAN_RETRY_AFTER_FAILURE_MS + 1,
|
||||||
);
|
);
|
||||||
await loadTaiwanSources();
|
await loadTaiwanSources();
|
||||||
assert.equal(calls, 2, 'the backoff ends after an hour');
|
assert.equal(calls, 4, 'the backoff ends after an hour');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('a failed download serves the last good table', async (t) => {
|
test('a failed download serves the last good table', async (t) => {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import {
|
|||||||
TORONTO_RESCU_LIST_URL,
|
TORONTO_RESCU_LIST_URL,
|
||||||
TORONTO_RESCU_IMAGE_ORIGIN,
|
TORONTO_RESCU_IMAGE_ORIGIN,
|
||||||
TORONTO_MAX_CATALOG_BYTES,
|
TORONTO_MAX_CATALOG_BYTES,
|
||||||
DEFAULT_CCTV_MAX_SOURCES,
|
CCTV_SHARED_SOURCE_SLOTS,
|
||||||
} from '../../server/providers/cctv/constants.js';
|
} from '../../server/providers/cctv/constants.js';
|
||||||
import { CAMERA_CODE_MAX_CHARS } from '../../server/providers/cctv/normalize.js';
|
import { CAMERA_CODE_MAX_CHARS } from '../../server/providers/cctv/normalize.js';
|
||||||
import { allocateSourceCap } from '../../server/providers/cctv/cap.js';
|
import { allocateSourceCap } from '../../server/providers/cctv/cap.js';
|
||||||
@@ -418,6 +418,6 @@ test('CCTV_TORONTO_ENABLED=0 keeps the lane from being loaded at all', async (t)
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the shipped catalog ceiling is not raised to make room for this pack', () => {
|
test('the shared catalog slots are not raised to make room for this pack', () => {
|
||||||
assert.equal(DEFAULT_CCTV_MAX_SOURCES, 4000);
|
assert.equal(CCTV_SHARED_SOURCE_SLOTS, 4000);
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,316 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import fs from 'node:fs';
|
||||||
|
import os from 'node:os';
|
||||||
|
import path from 'node:path';
|
||||||
|
import {
|
||||||
|
DEFAULT_WORLD_CCTV_SOURCE_FILE,
|
||||||
|
WORLD_CCTV_SOURCE_COUNT,
|
||||||
|
} from '../../server/providers/cctv/constants.js';
|
||||||
|
import {
|
||||||
|
isMlitRiverAdjustmentImage,
|
||||||
|
loadWorldCameraSources,
|
||||||
|
} from '../../server/providers/cctv/worldCameras.js';
|
||||||
|
import {
|
||||||
|
loadQuebecSources,
|
||||||
|
QUEBEC_CAMERA_SOURCE_COUNT,
|
||||||
|
quebec511VideoUrl,
|
||||||
|
quebecBrowserVideoEnabled,
|
||||||
|
} from '../../server/providers/cctv/quebec.js';
|
||||||
|
import { cctvProxy } from '../../server/providers/cctv.js';
|
||||||
|
|
||||||
|
const REPO_ROOT = path.resolve(import.meta.dirname, '../..');
|
||||||
|
const JPEG = Buffer.from([0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0xff, 0xd9]);
|
||||||
|
|
||||||
|
/** Silence the loaders' progress and failure logging. */
|
||||||
|
function quiet(t) {
|
||||||
|
t.mock.method(console, 'log', () => {});
|
||||||
|
t.mock.method(console, 'warn', () => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Set (or, for `undefined`, delete) environment variables for one test. */
|
||||||
|
function withEnv(t, env) {
|
||||||
|
for (const [name, value] of Object.entries(env)) {
|
||||||
|
const previous = process.env[name];
|
||||||
|
t.after(() => {
|
||||||
|
if (previous === undefined) delete process.env[name];
|
||||||
|
else process.env[name] = previous;
|
||||||
|
});
|
||||||
|
if (value === undefined) delete process.env[name];
|
||||||
|
else process.env[name] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A temporary source root holding the given World and Québec catalogs. */
|
||||||
|
function sourceRoot(t, { world = [], quebec = null } = {}) {
|
||||||
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), 'gev-cctv-world-'));
|
||||||
|
t.after(() => fs.rmSync(root, { recursive: true, force: true }));
|
||||||
|
const worldFile = path.join(root, DEFAULT_WORLD_CCTV_SOURCE_FILE);
|
||||||
|
fs.mkdirSync(path.dirname(worldFile), { recursive: true });
|
||||||
|
fs.writeFileSync(worldFile, JSON.stringify(world));
|
||||||
|
if (quebec) {
|
||||||
|
fs.mkdirSync(path.join(root, 'public'), { recursive: true });
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(root, 'public/quebec-cameras.json'),
|
||||||
|
JSON.stringify({ cameras: quebec }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return root;
|
||||||
|
}
|
||||||
|
|
||||||
|
const oregonRow = (overrides = {}) => ({
|
||||||
|
id: 'world-or-764',
|
||||||
|
name: '3rd St at Harwood MP18.35',
|
||||||
|
provider: 'TripCheck (ODOT)',
|
||||||
|
lat: 44.3029,
|
||||||
|
lon: -120.8549,
|
||||||
|
sourceKind: 'tripcheck-odot',
|
||||||
|
url: 'https://www.tripcheck.com/roadcams/cams/Harwood_pid3527.jpg',
|
||||||
|
snapshotUrl: 'https://www.tripcheck.com/roadcams/cams/Harwood_pid3527.jpg',
|
||||||
|
...overrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the shipped World catalog loads every curated row', (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const sources = loadWorldCameraSources({ sourceRoot: REPO_ROOT });
|
||||||
|
assert.equal(sources.length, WORLD_CCTV_SOURCE_COUNT);
|
||||||
|
const byKind = Object.groupBy(sources, (source) => source.sourceKind);
|
||||||
|
// Iceland comes from the live Iceland pack, never a second World copy.
|
||||||
|
assert.equal(byKind['vegagerdin-road'], undefined);
|
||||||
|
assert.equal(byKind['tripcheck-odot'].length, 1176);
|
||||||
|
assert.equal(byKind['mlit-river'].length, 1054);
|
||||||
|
for (const source of byKind['mlit-river'])
|
||||||
|
assert.equal(source.frameRefreshMs, 10 * 60 * 1000);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the World loader accepts a pinned row and rejects anything outside its policy', (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const rejected = [
|
||||||
|
['unknown kind', { sourceKind: 'nzta-journeys' }],
|
||||||
|
[
|
||||||
|
'Iceland duplicates the Iceland pack',
|
||||||
|
{
|
||||||
|
sourceKind: 'vegagerdin-road',
|
||||||
|
lat: 64.291877,
|
||||||
|
lon: -15.028035,
|
||||||
|
url: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/almannaskard_1.jpg',
|
||||||
|
snapshotUrl: 'https://www.vegagerdin.is/vgdata/vefmyndavelar/almannaskard_1.jpg',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
['wrong id prefix', { id: 'world-jp-river-7075' }],
|
||||||
|
['outside bounds', { lat: 40, lon: -15 }],
|
||||||
|
['other host', { url: 'https://evil.test/roadcams/cams/a.jpg' }],
|
||||||
|
['other directory', { url: 'https://www.tripcheck.com/other/a.jpg' }],
|
||||||
|
['query string', { url: oregonRow().url + '?x=1' }],
|
||||||
|
['not a jpg', { url: 'https://www.tripcheck.com/roadcams/cams/a.png' }],
|
||||||
|
['plain http', { url: oregonRow().url.replace('https:', 'http:') }],
|
||||||
|
[
|
||||||
|
'url and snapshot differ',
|
||||||
|
{ snapshotUrl: 'https://www.tripcheck.com/roadcams/cams/b.jpg' },
|
||||||
|
],
|
||||||
|
];
|
||||||
|
const root = sourceRoot(t, {
|
||||||
|
world: [
|
||||||
|
oregonRow(),
|
||||||
|
oregonRow(), // duplicate id
|
||||||
|
...rejected.map(([, overrides], i) =>
|
||||||
|
oregonRow({ id: `world-or-${9000 + i}`, ...overrides }),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const sources = loadWorldCameraSources({ sourceRoot: root });
|
||||||
|
assert.deepEqual(
|
||||||
|
sources.map((source) => source.id),
|
||||||
|
['world-or-764'],
|
||||||
|
);
|
||||||
|
assert.equal(sources[0].frameRefreshMs, 5 * 60 * 1000);
|
||||||
|
assert.equal(sources[0].feedType, 'image');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the World loader fails soft on a missing or malformed catalog', (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), 'gev-cctv-world-'));
|
||||||
|
t.after(() => fs.rmSync(root, { recursive: true, force: true }));
|
||||||
|
assert.deepEqual(loadWorldCameraSources({ sourceRoot: root }), []);
|
||||||
|
const file = path.join(root, DEFAULT_WORLD_CCTV_SOURCE_FILE);
|
||||||
|
fs.mkdirSync(path.dirname(file), { recursive: true });
|
||||||
|
fs.writeFileSync(file, '{not json');
|
||||||
|
assert.deepEqual(loadWorldCameraSources({ sourceRoot: root }), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('only the exact MLIT adjustment image is recognised', () => {
|
||||||
|
assert.equal(isMlitRiverAdjustmentImage({ ok: true, body: JPEG }), false);
|
||||||
|
assert.equal(isMlitRiverAdjustmentImage(null), false);
|
||||||
|
assert.equal(isMlitRiverAdjustmentImage({ ok: false, body: JPEG }), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the shipped Québec catalog loads every location', (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const sources = loadQuebecSources({ sourceRoot: REPO_ROOT });
|
||||||
|
assert.equal(sources.length, QUEBEC_CAMERA_SOURCE_COUNT);
|
||||||
|
for (const source of sources) {
|
||||||
|
assert.equal(source.url, '', 'the server never fetches Québec media');
|
||||||
|
assert.equal(source.snapshotUrl, '');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the Québec loader maps ids by kind, keeps https viewer links, and splits the MTQ credit', (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const at = { lat: 45.51651, lon: -73.5502 };
|
||||||
|
const root = sourceRoot(t, {
|
||||||
|
quebec: [
|
||||||
|
{ id: '3735', kind: 'traffic', name: 'Route 136', viewerUrl: 'https://www.quebec511.info/Carte/Fenetres/FenetreVideo.html?id=3735', ...at },
|
||||||
|
{ id: 'mtl-465', kind: 'montreal', name: 'Montréal 465', viewerUrl: 'http://ville.montreal.qc.ca/x', ...at },
|
||||||
|
{ id: 'web-1', kind: 'webcam', name: 'Tremblant', operator: 'Station Mont-Tremblant', viewerUrl: 'https://user:[email protected]/', ...at },
|
||||||
|
{ id: 'abc', kind: 'traffic', ...at }, // non-numeric traffic id
|
||||||
|
{ id: '3735', kind: 'traffic', ...at }, // duplicate
|
||||||
|
{ id: '9', kind: 'traffic', lat: 40, lon: -73.5 }, // outside Québec
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const sources = loadQuebecSources({ sourceRoot: root });
|
||||||
|
const byId = new Map(sources.map((source) => [source.id, source]));
|
||||||
|
assert.deepEqual([...byId.keys()], ['qc-511-3735', 'qc-mtl-465', 'qc-web-1']);
|
||||||
|
|
||||||
|
const mtq = byId.get('qc-511-3735');
|
||||||
|
assert.equal(mtq.sourceKind, 'quebec-511-browser');
|
||||||
|
assert.match(mtq.credit, /Locations: MTQ · CC BY 4\.0/);
|
||||||
|
assert.match(mtq.credit, /Video: Québec 511/);
|
||||||
|
assert.doesNotMatch(mtq.license, /^Données Québec \/ MTQ, CC BY 4\.0$/);
|
||||||
|
assert.equal(byId.get('qc-mtl-465').sourceUrl, '', 'http viewer links are dropped');
|
||||||
|
assert.equal(byId.get('qc-web-1').sourceUrl, '', 'credentialed links are dropped');
|
||||||
|
assert.equal(
|
||||||
|
quebec511VideoUrl('qc-511-3735'),
|
||||||
|
'https://www.quebec511.info/Carte/Fenetres/camera.ashx?id=3735&format=mp4',
|
||||||
|
);
|
||||||
|
assert.equal(quebec511VideoUrl('qc-mtl-465'), '');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Québec 511 browser video is opt-in', () => {
|
||||||
|
assert.equal(quebecBrowserVideoEnabled({}), false);
|
||||||
|
assert.equal(quebecBrowserVideoEnabled({ CCTV_QUEBEC_VIDEO_ENABLED: '0' }), false);
|
||||||
|
assert.equal(quebecBrowserVideoEnabled({ CCTV_QUEBEC_VIDEO_ENABLED: ' 1 ' }), true);
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Mount the real proxy with a fixed fetch, and drive requests through it. */
|
||||||
|
function mount(t, root, respond) {
|
||||||
|
withEnv(t, {
|
||||||
|
CCTV_SOURCES_FILE: 'absent-source-file.json',
|
||||||
|
CCTV_SOURCES_JSON: undefined,
|
||||||
|
CCTV_FORCE_AUSTIN: '0',
|
||||||
|
CCTV_MAX_SOURCES: undefined,
|
||||||
|
// A configured key makes any Street View fallback observable.
|
||||||
|
GOOGLE_MAPS_SERVER_API_KEY: 'test-google-key',
|
||||||
|
});
|
||||||
|
const requests = [];
|
||||||
|
t.mock.method(globalThis, 'fetch', async (url, init = {}) => {
|
||||||
|
requests.push(String(url));
|
||||||
|
return respond(String(url), init) || new Response('down', { status: 503 });
|
||||||
|
});
|
||||||
|
let handler;
|
||||||
|
cctvProxy({ sourceRoot: root }).configureServer({
|
||||||
|
middlewares: {
|
||||||
|
use(_route, fn) {
|
||||||
|
handler = fn;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const call = async (url) => {
|
||||||
|
const res = {
|
||||||
|
writeHead(status, headers) {
|
||||||
|
Object.assign(this, { status, headers });
|
||||||
|
},
|
||||||
|
end(body) {
|
||||||
|
this.body = body;
|
||||||
|
},
|
||||||
|
on() {},
|
||||||
|
once() {},
|
||||||
|
};
|
||||||
|
await handler({ url, method: 'GET', headers: {}, on() {} }, res);
|
||||||
|
return res;
|
||||||
|
};
|
||||||
|
return { call, requests };
|
||||||
|
}
|
||||||
|
|
||||||
|
test('/sources lists Québec browser media only when the operator opts in', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const root = sourceRoot(t, {
|
||||||
|
quebec: [{ id: '3735', kind: 'traffic', name: 'Route 136', lat: 45.5, lon: -73.5 }],
|
||||||
|
});
|
||||||
|
withEnv(t, { CCTV_QUEBEC_VIDEO_ENABLED: undefined });
|
||||||
|
const app = mount(t, root, () => null);
|
||||||
|
const off = JSON.parse((await app.call('/sources')).body).sources;
|
||||||
|
assert.equal(off.find((s) => s.id === 'qc-511-3735').browserMediaUrl, '');
|
||||||
|
|
||||||
|
process.env.CCTV_QUEBEC_VIDEO_ENABLED = '1';
|
||||||
|
const on = JSON.parse((await app.call('/sources')).body).sources;
|
||||||
|
assert.match(on.find((s) => s.id === 'qc-511-3735').browserMediaUrl, /camera\.ashx\?id=3735&format=mp4$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a World frame is fetched once per refresh floor and the cooldown never spends Street View', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const root = sourceRoot(t, { world: [oregonRow()] });
|
||||||
|
let answer = () => new Response(JPEG, { headers: { 'content-type': 'image/jpeg' } });
|
||||||
|
const app = mount(t, root, (url) =>
|
||||||
|
url === oregonRow().url ? answer() : null,
|
||||||
|
);
|
||||||
|
const frame = '/frame/world-or-764';
|
||||||
|
const upstreamHits = () =>
|
||||||
|
app.requests.filter((url) => url === oregonRow().url).length;
|
||||||
|
|
||||||
|
const first = await app.call(frame);
|
||||||
|
assert.equal(first.headers['X-CCTV-Source'], 'upstream-image');
|
||||||
|
const second = await app.call(frame);
|
||||||
|
assert.equal(second.headers['X-CCTV-Source'], 'upstream-image');
|
||||||
|
assert.equal(upstreamHits(), 1, 'the second view reuses the cached frame');
|
||||||
|
|
||||||
|
// A camera whose first fetch fails is inside its failure backoff: it gets
|
||||||
|
// the placeholder, not Google Street View, and no second upstream request.
|
||||||
|
const failRoot = sourceRoot(t, { world: [oregonRow()] });
|
||||||
|
answer = () => new Response('down', { status: 503 });
|
||||||
|
const failing = mount(t, failRoot, (url) =>
|
||||||
|
url === oregonRow().url ? answer() : null,
|
||||||
|
);
|
||||||
|
const failed = await failing.call(frame);
|
||||||
|
assert.notEqual(failed.headers['X-CCTV-Source'], 'upstream-image');
|
||||||
|
const retry = await failing.call(frame);
|
||||||
|
assert.equal(retry.headers['X-CCTV-Source'], 'synthetic');
|
||||||
|
assert.equal(
|
||||||
|
failing.requests.filter((url) => url === oregonRow().url).length,
|
||||||
|
1,
|
||||||
|
'the backoff holds the provider cadence',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
failing.requests.filter((url) => url.includes('maps.googleapis.com/maps/api/streetview')).length,
|
||||||
|
1,
|
||||||
|
'only the first miss, outside any cooldown, may try Street View',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Ottawa frames are signed with the certificate at fetch time only', async (t) => {
|
||||||
|
quiet(t);
|
||||||
|
const root = sourceRoot(t);
|
||||||
|
withEnv(t, { OTTAWA_CAMERA_CERTIFICATE: 'CERT123' });
|
||||||
|
const app = mount(t, root, (url) => {
|
||||||
|
if (url === 'https://traffic.ottawa.ca/map/service/camera')
|
||||||
|
return Response.json({
|
||||||
|
cameras: [
|
||||||
|
{ camera_number: 16, name: 'Bank & Hunt Club', latitude: 45.35, longitude: -75.65, cameraOwner: 'CITY' },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
if (url.startsWith('https://traffic.ottawa.ca/opendata/camera'))
|
||||||
|
return new Response(JPEG, { headers: { 'content-type': 'image/jpeg' } });
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
const sources = JSON.parse((await app.call('/sources')).body).sources;
|
||||||
|
const ottawa = sources.find((source) => source.id === 'ottawa-16');
|
||||||
|
assert.ok(ottawa);
|
||||||
|
assert.doesNotMatch(JSON.stringify(sources), /CERT123/, 'no catalog field carries the certificate');
|
||||||
|
|
||||||
|
const frame = await app.call('/frame/ottawa-16');
|
||||||
|
assert.equal(frame.headers['X-CCTV-Source'], 'upstream-image');
|
||||||
|
await app.call('/frame/ottawa-16');
|
||||||
|
const hits = app.requests.filter((url) => url.includes('/opendata/camera'));
|
||||||
|
assert.deepEqual(hits, [
|
||||||
|
'https://traffic.ottawa.ca/opendata/camera?c=16&certificate=CERT123&id=gev',
|
||||||
|
], 'one signed request per camera per minute');
|
||||||
|
});
|
||||||
@@ -304,6 +304,38 @@ export const DATA_CREDITS = [
|
|||||||
'CCTV static data (MOTC 2.0), released under the ' +
|
'CCTV static data (MOTC 2.0), released under the ' +
|
||||||
'<a href="https://data.gov.tw/license" target="_blank" rel="noopener">Open Government Data License, Taiwan (Version 1.0)</a>',
|
'<a href="https://data.gov.tw/license" target="_blank" rel="noopener">Open Government Data License, Taiwan (Version 1.0)</a>',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'ottawa-cctv',
|
||||||
|
html:
|
||||||
|
'Traffic cameras (Ottawa, with an access certificate): ' +
|
||||||
|
'<a href="https://traffic.ottawa.ca/en/traffic-map-data-lists-and-resources/about-the-data" target="_blank" rel="noopener">City of Ottawa Traffic Camera Images API</a>',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'quebec-cctv',
|
||||||
|
html:
|
||||||
|
'Camera locations (Québec): Ministère des Transports et de la Mobilité durable via ' +
|
||||||
|
'<a href="https://www.donneesquebec.ca/" target="_blank" rel="noopener">Données Québec</a> ' +
|
||||||
|
'(<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">CC BY 4.0</a>); ' +
|
||||||
|
'Montréal camera locations © OpenStreetMap contributors (ODbL). ' +
|
||||||
|
'Video (when enabled) and linked webcam pages stay with ' +
|
||||||
|
'<a href="https://www.quebec511.info/" target="_blank" rel="noopener">Québec 511</a> and each operator, under their own terms',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'tripcheck-cctv',
|
||||||
|
html:
|
||||||
|
'Road camera stills (Oregon): camera courtesy of ODOT, via ' +
|
||||||
|
'<a href="https://www.tripcheck.com/" target="_blank" rel="noopener">TripCheck</a>; ' +
|
||||||
|
'partner cameras (counties, cities, Caltrans, WSDOT) are named in the camera label',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'mlit-river-cctv',
|
||||||
|
html:
|
||||||
|
'River camera stills (Japan): 出典:国土交通省 ' +
|
||||||
|
'<a href="https://www.river.go.jp/" target="_blank" rel="noopener">川の防災情報</a> ' +
|
||||||
|
'(Ministry of Land, Infrastructure, Transport and Tourism; ' +
|
||||||
|
'<a href="https://www.river.go.jp/kawabou/kwb_apend/html/caution.html" target="_blank" rel="noopener">terms</a>), ' +
|
||||||
|
'fetched on view, at most every ten minutes per camera',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'calgary-cctv',
|
key: 'calgary-cctv',
|
||||||
html:
|
html:
|
||||||
@@ -326,6 +358,15 @@ export const DATA_CREDITS = [
|
|||||||
'(Llicència oberta d’ús d’informació - Catalunya); some cameras are supplied by partners ' +
|
'(Llicència oberta d’ús d’informació - Catalunya); some cameras are supplied by partners ' +
|
||||||
'(Ajuntament de Barcelona, Ajuntament de Terrassa), each named in the CCTV panel',
|
'(Ajuntament de Barcelona, Ajuntament de Terrassa), each named in the CCTV panel',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'iceland-cctv',
|
||||||
|
html:
|
||||||
|
'CCTV cameras & frames (Iceland): road camera images, fetched live, from the ' +
|
||||||
|
'<a href="https://www.vegagerdin.is/" target="_blank" rel="noopener">Icelandic Road and Coastal Administration (Vegagerðin)</a> — ' +
|
||||||
|
'<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">CC BY 4.0</a> ' +
|
||||||
|
'(<a href="https://www.vegagerdin.is/vegagerdin/gagnasafn/vefthjonustur/terms-and-conditions" target="_blank" rel="noopener">terms</a>); ' +
|
||||||
|
'no endorsement by IRCA is implied',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'kingcounty-cctv',
|
key: 'kingcounty-cctv',
|
||||||
html:
|
html:
|
||||||
@@ -350,6 +391,14 @@ export const DATA_CREDITS = [
|
|||||||
'<a href="https://data.gov.hk/en-data/dataset/hk-td-tis_2-traffic-snapshot-images" target="_blank" rel="noopener">Transport Department / DATA.GOV.HK</a> ' +
|
'<a href="https://data.gov.hk/en-data/dataset/hk-td-tis_2-traffic-snapshot-images" target="_blank" rel="noopener">Transport Department / DATA.GOV.HK</a> ' +
|
||||||
'(<a href="https://data.gov.hk/en/terms-and-conditions" target="_blank" rel="noopener">Terms of Use</a> — attribution required)',
|
'(<a href="https://data.gov.hk/en/terms-and-conditions" target="_blank" rel="noopener">Terms of Use</a> — attribution required)',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'webcamromania-cctv',
|
||||||
|
html:
|
||||||
|
'Giroc camera (when configured): ' +
|
||||||
|
'<a href="https://webcamromania.ro/webcam-orase/webcam-giroc/" target="_blank" rel="noopener">Webcam Romania</a>. ' +
|
||||||
|
'Video rights remain with the camera operator; ' +
|
||||||
|
'<a href="https://webcamromania.ro/termeni-si-conditii/" target="_blank" rel="noopener">provider terms</a> apply.',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'vegvesen-cctv',
|
key: 'vegvesen-cctv',
|
||||||
html:
|
html:
|
||||||
|
|||||||
@@ -256,3 +256,17 @@ test('data credits go through the renderer to the attribution list', async () =>
|
|||||||
assert.match(shown[3].html, /Traffic flow data © TomTom/);
|
assert.match(shown[3].html, /Traffic flow data © TomTom/);
|
||||||
assert.equal(registerDynamicCredit({}, { key: 'none', html: 'x' }), false);
|
assert.equal(registerDynamicCredit({}, { key: 'none', html: 'x' }), false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('the PR #1506 camera packs are credited with their sources and terms', () => {
|
||||||
|
const html = (key) => DATA_CREDITS.find((entry) => entry.key === key)?.html;
|
||||||
|
assert.match(html('ottawa-cctv') || '', /traffic\.ottawa\.ca/);
|
||||||
|
assert.match(html('quebec-cctv') || '', /CC BY 4\.0/);
|
||||||
|
assert.match(html('quebec-cctv') || '', /OpenStreetMap contributors/);
|
||||||
|
assert.match(html('tripcheck-cctv') || '', /courtesy of ODOT/);
|
||||||
|
// MLIT's terms ask for the source in this form, with the page link.
|
||||||
|
assert.match(html('mlit-river-cctv') || '', /出典:国土交通省/);
|
||||||
|
assert.match(
|
||||||
|
html('mlit-river-cctv') || '',
|
||||||
|
/href="https:\/\/www\.river\.go\.jp\//,
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -3121,3 +3121,70 @@ test('Active Fires: the codec accepts whole megawatts in bounds and the three co
|
|||||||
confidence: 'nominal',
|
confidence: 'nominal',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// An application built without a layer (a smaller catalog) receives a link or
|
||||||
|
// saved state from a build that has it: the layer is neither restored nor
|
||||||
|
// stored nor carried into the links this application shares.
|
||||||
|
function managerWithout(withheld) {
|
||||||
|
const manager = new DataLayerManager({});
|
||||||
|
for (const id of REGISTERED_LAYER_IDS)
|
||||||
|
if (!withheld.includes(id)) manager.register(fakeLayer(id));
|
||||||
|
manager.finalizeRegistrations(
|
||||||
|
LAYER_STATE_REGISTRY.filter(({ id }) => !withheld.includes(id)),
|
||||||
|
);
|
||||||
|
return manager;
|
||||||
|
}
|
||||||
|
|
||||||
|
test('layers the application did not register are never restored, stored or shared', async () => {
|
||||||
|
const manager = managerWithout(['earthquakes']);
|
||||||
|
const storage = memoryStorage();
|
||||||
|
const share = shareSink();
|
||||||
|
const coordinator = new LayerStateCoordinator(manager, share, { storage });
|
||||||
|
const incoming = createDefaultLayerState();
|
||||||
|
incoming.enabledLayerIds = ['earthquakes', 'traffic'];
|
||||||
|
await coordinator.start({ shareLayerState: incoming });
|
||||||
|
|
||||||
|
assert.deepEqual(coordinator.getDurableState().enabledLayerIds, ['traffic']);
|
||||||
|
assert.deepEqual(share.provider().enabledLayerIds, ['traffic']);
|
||||||
|
assert.equal(manager.layers.has('earthquakes'), false);
|
||||||
|
|
||||||
|
await manager.setEnabled('cctv', true, { origin: 'user' });
|
||||||
|
const [[, written]] = storage.writes;
|
||||||
|
assert.deepEqual(parseStoredLayerState(written).enabledLayerIds, [
|
||||||
|
'cctv',
|
||||||
|
'traffic',
|
||||||
|
]);
|
||||||
|
assert.deepEqual(share.provider().enabledLayerIds, ['cctv', 'traffic']);
|
||||||
|
|
||||||
|
await coordinator.applyShareLayerState({ shareLayerState: incoming });
|
||||||
|
assert.deepEqual(coordinator.getDurableState().enabledLayerIds, ['traffic']);
|
||||||
|
coordinator.destroy();
|
||||||
|
|
||||||
|
const saved = createDefaultLayerState();
|
||||||
|
saved.enabledLayerIds = ['earthquakes', 'traffic'];
|
||||||
|
const local = new LayerStateCoordinator(
|
||||||
|
managerWithout(['earthquakes']),
|
||||||
|
shareSink(),
|
||||||
|
{ storage: memoryStorage(serializeStoredLayerState(saved)) },
|
||||||
|
);
|
||||||
|
await local.start();
|
||||||
|
assert.equal(local.source, 'local');
|
||||||
|
assert.deepEqual(local.getDurableState().enabledLayerIds, ['traffic']);
|
||||||
|
local.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('an application with every layer registered keeps every requested layer', async () => {
|
||||||
|
const coordinator = new LayerStateCoordinator(
|
||||||
|
productionManager(),
|
||||||
|
shareSink(),
|
||||||
|
{ storage: memoryStorage() },
|
||||||
|
);
|
||||||
|
const incoming = createDefaultLayerState();
|
||||||
|
incoming.enabledLayerIds = ['earthquakes', 'traffic'];
|
||||||
|
await coordinator.start({ shareLayerState: incoming });
|
||||||
|
assert.deepEqual(coordinator.getDurableState().enabledLayerIds, [
|
||||||
|
'earthquakes',
|
||||||
|
'traffic',
|
||||||
|
]);
|
||||||
|
coordinator.destroy();
|
||||||
|
});
|
||||||
@@ -106,9 +106,7 @@ export class LayerStateCoordinator {
|
|||||||
} = {}) {
|
} = {}) {
|
||||||
if (this._destroyed)
|
if (this._destroyed)
|
||||||
throw new Error('Layer-state coordinator is destroyed');
|
throw new Error('Layer-state coordinator is destroyed');
|
||||||
let selected = shareLayerState
|
let selected = shareLayerState ? this._normalize(shareLayerState) : null;
|
||||||
? normalizeLayerState(shareLayerState)
|
|
||||||
: null;
|
|
||||||
if (selected) {
|
if (selected) {
|
||||||
this._source = 'share';
|
this._source = 'share';
|
||||||
this._shareCreatedAtMs = Number.isFinite(shareCreatedAtMs)
|
this._shareCreatedAtMs = Number.isFinite(shareCreatedAtMs)
|
||||||
@@ -124,7 +122,7 @@ export class LayerStateCoordinator {
|
|||||||
/* best effort */
|
/* best effort */
|
||||||
}
|
}
|
||||||
if (stored) {
|
if (stored) {
|
||||||
selected = stored;
|
selected = this._normalize(stored);
|
||||||
this._source = 'local';
|
this._source = 'local';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -163,9 +161,7 @@ export class LayerStateCoordinator {
|
|||||||
for (const controller of this._restoreControllers.values())
|
for (const controller of this._restoreControllers.values())
|
||||||
controller.abort('superseded-by-share-navigation');
|
controller.abort('superseded-by-share-navigation');
|
||||||
this._revokePendingTrackingWatch('superseded-by-share-navigation');
|
this._revokePendingTrackingWatch('superseded-by-share-navigation');
|
||||||
const selected = shareLayerState
|
const selected = shareLayerState ? this._normalize(shareLayerState) : null;
|
||||||
? normalizeLayerState(shareLayerState)
|
|
||||||
: null;
|
|
||||||
this._source = selected ? 'share' : 'legacy-share';
|
this._source = selected ? 'share' : 'legacy-share';
|
||||||
this._shareCreatedAtMs =
|
this._shareCreatedAtMs =
|
||||||
selected && Number.isFinite(shareCreatedAtMs) ? shareCreatedAtMs : null;
|
selected && Number.isFinite(shareCreatedAtMs) ? shareCreatedAtMs : null;
|
||||||
@@ -182,6 +178,25 @@ export class LayerStateCoordinator {
|
|||||||
return this._source;
|
return this._source;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Canonical layer state holding only the layers this application
|
||||||
|
* registered. An application built without a layer never restores, stores
|
||||||
|
* or shares it, even when a link or saved state from a build that has it
|
||||||
|
* names it. Filtering before normalizing lets normalization drop options
|
||||||
|
* that depend on a layer that is not here (a tracked selection).
|
||||||
|
*/
|
||||||
|
_normalize(candidate) {
|
||||||
|
const input = candidate && typeof candidate === 'object' ? candidate : {};
|
||||||
|
return normalizeLayerState({
|
||||||
|
...input,
|
||||||
|
enabledLayerIds: Array.isArray(input.enabledLayerIds)
|
||||||
|
? input.enabledLayerIds.filter((id) =>
|
||||||
|
this.dataManager.layers.has(String(id)),
|
||||||
|
)
|
||||||
|
: [],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
getDurableState() {
|
getDurableState() {
|
||||||
return cloneLayerState(this._durableState);
|
return cloneLayerState(this._durableState);
|
||||||
}
|
}
|
||||||
@@ -345,7 +360,7 @@ export class LayerStateCoordinator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_commitExplicit(candidate) {
|
_commitExplicit(candidate) {
|
||||||
this._durableState = normalizeLayerState(candidate);
|
this._durableState = this._normalize(candidate);
|
||||||
const serialized = serializeStoredLayerState(this._durableState);
|
const serialized = serializeStoredLayerState(this._durableState);
|
||||||
try {
|
try {
|
||||||
if (this.storage?.getItem?.(LAYER_STATE_STORAGE_KEY) !== serialized) {
|
if (this.storage?.getItem?.(LAYER_STATE_STORAGE_KEY) !== serialized) {
|
||||||
@@ -478,7 +493,7 @@ export class LayerStateCoordinator {
|
|||||||
...this._durableState.options[selected.optionOwner],
|
...this._durableState.options[selected.optionOwner],
|
||||||
[selected.optionKey]: null,
|
[selected.optionKey]: null,
|
||||||
};
|
};
|
||||||
this._durableState = normalizeLayerState({
|
this._durableState = this._normalize({
|
||||||
...this._durableState,
|
...this._durableState,
|
||||||
options: {
|
options: {
|
||||||
...this._durableState.options,
|
...this._durableState.options,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { fromDegrees } from '../geo/ellipsoid.js';
|
|||||||
import { bindFakeDraw } from '../testSupport/fakeDrawPort.mjs';
|
import { bindFakeDraw } from '../testSupport/fakeDrawPort.mjs';
|
||||||
import { fakeSceneFrame } from '../testSupport/fakeCesiumScene.mjs';
|
import { fakeSceneFrame } from '../testSupport/fakeCesiumScene.mjs';
|
||||||
import { gstime } from 'satellite.js';
|
import { gstime } from 'satellite.js';
|
||||||
|
import { worldClock } from '../time/worldClock.js';
|
||||||
import { createModel } from '../layers/launches/model.js';
|
import { createModel } from '../layers/launches/model.js';
|
||||||
import rocketLaunchesLayer, {
|
import rocketLaunchesLayer, {
|
||||||
_setRocketMissionOverlayHostForTest,
|
_setRocketMissionOverlayHostForTest,
|
||||||
@@ -1243,7 +1244,11 @@ test('real mission build, select, refresh, deselect, disable, and destroy paths
|
|||||||
rocketLaunchesLayer.init(viewer);
|
rocketLaunchesLayer.init(viewer);
|
||||||
initialized = true;
|
initialized = true;
|
||||||
await rocketLaunchesLayer.enable();
|
await rocketLaunchesLayer.enable();
|
||||||
|
assert.equal(worldClock.coverage(), null, 'nothing loaded, no time to show');
|
||||||
await rocketLaunchesLayer.update();
|
await rocketLaunchesLayer.update();
|
||||||
|
const at = Date.parse(launchTime);
|
||||||
|
assert.deepEqual(worldClock.coverage(), { start: at, end: at, marks: [at] });
|
||||||
|
assert.equal(worldClock.isSupported(), true, 'loaded launches bring up the timeline');
|
||||||
|
|
||||||
assert.ok(missionItems().size >= 7, 'runtime guard requires the populated mission build path');
|
assert.ok(missionItems().size >= 7, 'runtime guard requires the populated mission build path');
|
||||||
// Every set is a kind with no world text: labels are the host's.
|
// Every set is a kind with no world text: labels are the host's.
|
||||||
@@ -1369,6 +1374,7 @@ test('real mission build, select, refresh, deselect, disable, and destroy paths
|
|||||||
assert.equal(deselectedPublication[2][0].protected, false);
|
assert.equal(deselectedPublication[2][0].protected, false);
|
||||||
|
|
||||||
await rocketLaunchesLayer.disable();
|
await rocketLaunchesLayer.disable();
|
||||||
|
assert.equal(worldClock.coverage(), null, 'off, launches show no time');
|
||||||
assert.deepEqual(hostCalls.slice(-4), [
|
assert.deepEqual(hostCalls.slice(-4), [
|
||||||
['clear', ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID],
|
['clear', ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID],
|
||||||
['visible', ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID, false],
|
['visible', ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID, false],
|
||||||
@@ -1490,3 +1496,11 @@ test('missing payload details stay unknown without inventing mass or classificat
|
|||||||
const [launch] = normalizeRocketLaunches([{ id: 'missing', pad: { latitude: 1, longitude: 2 }, net: '2026-07-20T10:00:00Z' }], NOW);
|
const [launch] = normalizeRocketLaunches([{ id: 'missing', pad: { latitude: 1, longitude: 2 }, net: '2026-07-20T10:00:00Z' }], NOW);
|
||||||
assert.deepEqual(launch.payloads, []);
|
assert.deepEqual(launch.payloads, []);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('away from live the feed keeps its own window of launches', (t) => {
|
||||||
|
t.after(() => worldClock.goLive());
|
||||||
|
worldClock.seek(Date.now() - 20 * 86_400_000);
|
||||||
|
const net = new Date(Date.now() - 86_400_000).toISOString();
|
||||||
|
const launches = normalizeRocketLaunches([{ id: 'recent', pad: { latitude: 1, longitude: 2 }, net }]);
|
||||||
|
assert.deepEqual(launches.map((launch) => launch.id), ['recent']);
|
||||||
|
});
|
||||||
@@ -96,7 +96,7 @@ test('Warendorf webcam display introduces the shared OSM credit', (t) => {
|
|||||||
const v = viewer(t), empty = new Proxy({}, { get: () => noop });
|
const v = viewer(t), empty = new Proxy({}, { get: () => noop });
|
||||||
const lifecycle = createCctvLifecycle({ state: { _viewer: v, _records: [{ camera: { id: 'warendorf-marktplatz-rathaus', cityId: 'warendorf' } }], _recordById: new Map(), _cctvOverlayHost: overlayHost },
|
const lifecycle = createCctvLifecycle({ state: { _viewer: v, _records: [{ camera: { id: 'warendorf-marktplatz-rathaus', cityId: 'warendorf' } }], _recordById: new Map(), _cctvOverlayHost: overlayHost },
|
||||||
services: { credits: { showOsmCredit, hideOsmCredit }, sprites: empty, activation: empty, picking: empty, focus: empty, render: empty },
|
services: { credits: { showOsmCredit, hideOsmCredit }, sprites: empty, activation: empty, picking: empty, focus: empty, render: empty },
|
||||||
parts: { selection: empty, geometryQueue: empty, rendering: empty, projection: empty, cards: empty, presentation: empty }, source: {} });
|
parts: { selection: empty, geometryQueue: empty, rendering: empty, projection: empty, cards: empty, presentation: empty, navigation: empty }, source: {} });
|
||||||
lifecycle.methods.enable(); assertCredit(v); lifecycle.methods.disable();
|
lifecycle.methods.enable(); assertCredit(v); lifecycle.methods.disable();
|
||||||
assert.equal(v.credits.filter(c => c.showOnScreen).length, 0);
|
assert.equal(v.credits.filter(c => c.showOnScreen).length, 0);
|
||||||
});
|
});
|
||||||
|
|||||||
+9
-4
@@ -24,6 +24,11 @@ import { findCamera } from './render/rendererOf.js';
|
|||||||
import { greatCircleKm } from './geoDistance.js';
|
import { greatCircleKm } from './geoDistance.js';
|
||||||
import { forward as toMGRS } from 'mgrs';
|
import { forward as toMGRS } from 'mgrs';
|
||||||
import { CITY_POIS } from './cityPois.js';
|
import { CITY_POIS } from './cityPois.js';
|
||||||
|
import { worldTimeFor } from './time/worldClock.js';
|
||||||
|
|
||||||
|
// The HUD stamps its readouts with the world time; its sun is the sky's.
|
||||||
|
const hudTime = worldTimeFor('hud');
|
||||||
|
const skyTime = worldTimeFor('sky');
|
||||||
import { composeLocalityTag } from './hudLocality.js';
|
import { composeLocalityTag } from './hudLocality.js';
|
||||||
import { hudQuantity, LOCALIZED_LOCALITY } from './hudLocalityFormat.js';
|
import { hudQuantity, LOCALIZED_LOCALITY } from './hudLocalityFormat.js';
|
||||||
import {
|
import {
|
||||||
@@ -455,11 +460,11 @@ export class IntelHUD {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format the current wall-clock time as a UTC Zulu string.
|
* Format the HUD's world time as a UTC Zulu string.
|
||||||
* @returns {string} Timestamp in `YYYY-MM-DD HH:MM:SSZ` format.
|
* @returns {string} Timestamp in `YYYY-MM-DD HH:MM:SSZ` format.
|
||||||
*/
|
*/
|
||||||
_formatUTC() {
|
_formatUTC() {
|
||||||
const now = new Date();
|
const now = new Date(hudTime());
|
||||||
const y = now.getUTCFullYear();
|
const y = now.getUTCFullYear();
|
||||||
const mo = String(now.getUTCMonth() + 1).padStart(2, '0');
|
const mo = String(now.getUTCMonth() + 1).padStart(2, '0');
|
||||||
const d = String(now.getUTCDate()).padStart(2, '0');
|
const d = String(now.getUTCDate()).padStart(2, '0');
|
||||||
@@ -561,7 +566,7 @@ export class IntelHUD {
|
|||||||
readouts.alt = `ALT: ${Math.round(altMslM)}m SUN: ${sunEl.toFixed(1)}° EL`;
|
readouts.alt = `ALT: ${Math.round(altMslM)}m SUN: ${sunEl.toFixed(1)}° EL`;
|
||||||
|
|
||||||
// Collection timestamp
|
// Collection timestamp
|
||||||
const now = new Date();
|
const now = new Date(hudTime());
|
||||||
const h = String(now.getUTCHours()).padStart(2, '0');
|
const h = String(now.getUTCHours()).padStart(2, '0');
|
||||||
const m = String(now.getUTCMinutes()).padStart(2, '0');
|
const m = String(now.getUTCMinutes()).padStart(2, '0');
|
||||||
const s = String(now.getUTCSeconds()).padStart(2, '0');
|
const s = String(now.getUTCSeconds()).padStart(2, '0');
|
||||||
@@ -668,7 +673,7 @@ export class IntelHUD {
|
|||||||
* @returns {number} Estimated sun elevation in degrees (negative = below horizon).
|
* @returns {number} Estimated sun elevation in degrees (negative = below horizon).
|
||||||
*/
|
*/
|
||||||
_estimateSunElevation(lat, lon) {
|
_estimateSunElevation(lat, lon) {
|
||||||
const now = new Date();
|
const now = new Date(skyTime());
|
||||||
// Approximate local solar time by shifting UTC hours by longitude offset
|
// Approximate local solar time by shifting UTC hours by longitude offset
|
||||||
const hours = now.getUTCHours() + now.getUTCMinutes() / 60 + lon / 15;
|
const hours = now.getUTCHours() + now.getUTCMinutes() / 60 + lon / 15;
|
||||||
const solarNoon = 12;
|
const solarNoon = 12;
|
||||||
|
|||||||
@@ -3478,5 +3478,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "الحد الأقصى لعمر الحدث: {days} يوم؛ تُحفظ العلامات غير المؤرخة",
|
"Maximum event age: {days}d; undated markers are kept": "الحد الأقصى لعمر الحدث: {days} يوم؛ تُحفظ العلامات غير المؤرخة",
|
||||||
"event age filter|All": "الكل",
|
"event age filter|All": "الكل",
|
||||||
"Event age": "عمر الحدث",
|
"Event age": "عمر الحدث",
|
||||||
"Event age: {days}d · undated kept": "عمر الحدث: {days} يوم · الاحتفاظ بغير المؤرخ"
|
"Event age: {days}d · undated kept": "عمر الحدث: {days} يوم · الاحتفاظ بغير المؤرخ",
|
||||||
|
"Close camera preview": "إغلاق معاينة الكاميرا",
|
||||||
|
"Refresh map still": "تحديث صورة الخريطة الثابتة",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "تستخدم صورة الخريطة طلبًا منفصلًا وقد تعرض لحظة مختلفة.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "يُشغَّل الفيديو من Québec 511، الذي يرى عنوان IP الخاص بك.",
|
||||||
|
"World time": "وقت العالم",
|
||||||
|
"Back to live": "العودة إلى البث المباشر",
|
||||||
|
"Live": "مباشر",
|
||||||
|
"1 h/s": "ساعة/ث",
|
||||||
|
"1 d/s": "يوم/ث",
|
||||||
|
"1 wk/s": "أسبوع/ث",
|
||||||
|
"Play speed": "سرعة التشغيل",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "مرّر أو اقرص للتكبير، واسحب للتنقل · انقر نقرًا مزدوجًا لرؤية الكل",
|
||||||
|
"1 min/s": "دقيقة/ث"
|
||||||
}
|
}
|
||||||
@@ -3178,5 +3178,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Maximales Ereignisalter: {days} Tage; undatierte Markierungen bleiben",
|
"Maximum event age: {days}d; undated markers are kept": "Maximales Ereignisalter: {days} Tage; undatierte Markierungen bleiben",
|
||||||
"event age filter|All": "Alle",
|
"event age filter|All": "Alle",
|
||||||
"Event age": "Ereignisalter",
|
"Event age": "Ereignisalter",
|
||||||
"Event age: {days}d · undated kept": "Ereignisalter: {days} Tage · undatierte bleiben"
|
"Event age: {days}d · undated kept": "Ereignisalter: {days} Tage · undatierte bleiben",
|
||||||
|
"Close camera preview": "Kameravorschau schließen",
|
||||||
|
"Refresh map still": "Kartenstandbild aktualisieren",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "Das Kartenstandbild wird separat abgerufen und kann einen anderen Moment zeigen.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "Das Video wird von Québec 511 abgespielt, das Ihre IP-Adresse sieht.",
|
||||||
|
"World time": "Weltzeit",
|
||||||
|
"Back to live": "Zurück zu live",
|
||||||
|
"Live": "Live",
|
||||||
|
"1 h/s": "1 Std./s",
|
||||||
|
"1 d/s": "1 Tag/s",
|
||||||
|
"1 wk/s": "1 Wo./s",
|
||||||
|
"Play speed": "Wiedergabegeschwindigkeit",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Scrollen oder mit zwei Fingern zoomen, ziehen zum Verschieben · Doppelklick zeigt alles",
|
||||||
|
"1 min/s": "1 Min./s"
|
||||||
}
|
}
|
||||||
@@ -3253,5 +3253,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Antigüedad máxima: {days} días; se conservan los marcadores sin fecha",
|
"Maximum event age: {days}d; undated markers are kept": "Antigüedad máxima: {days} días; se conservan los marcadores sin fecha",
|
||||||
"event age filter|All": "Todos",
|
"event age filter|All": "Todos",
|
||||||
"Event age": "Antigüedad",
|
"Event age": "Antigüedad",
|
||||||
"Event age: {days}d · undated kept": "Antigüedad: {days} días · se conservan los marcadores sin fecha"
|
"Event age: {days}d · undated kept": "Antigüedad: {days} días · se conservan los marcadores sin fecha",
|
||||||
|
"Close camera preview": "Cerrar vista previa de la cámara",
|
||||||
|
"Refresh map still": "Actualizar imagen fija del mapa",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "La imagen del mapa usa una solicitud independiente y puede mostrar otro momento.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "El vídeo se reproduce desde Québec 511, que ve tu dirección IP.",
|
||||||
|
"World time": "Hora mundial",
|
||||||
|
"Back to live": "Volver al directo",
|
||||||
|
"Live": "En directo",
|
||||||
|
"1 h/s": "1 h/s",
|
||||||
|
"1 d/s": "1 d/s",
|
||||||
|
"1 wk/s": "1 sem/s",
|
||||||
|
"Play speed": "Velocidad de reproducción",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Desplaza o pellizca para ampliar, arrastra para moverte · doble clic para verlo todo",
|
||||||
|
"1 min/s": "1 min/s"
|
||||||
}
|
}
|
||||||
@@ -3253,5 +3253,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Ancienneté maximale : {days} j ; marqueurs sans date conservés",
|
"Maximum event age: {days}d; undated markers are kept": "Ancienneté maximale : {days} j ; marqueurs sans date conservés",
|
||||||
"event age filter|All": "Tous",
|
"event age filter|All": "Tous",
|
||||||
"Event age": "Ancienneté",
|
"Event age": "Ancienneté",
|
||||||
"Event age: {days}d · undated kept": "Ancienneté : {days} j · marqueurs sans date conservés"
|
"Event age: {days}d · undated kept": "Ancienneté : {days} j · marqueurs sans date conservés",
|
||||||
|
"Close camera preview": "Fermer l’aperçu de la caméra",
|
||||||
|
"Refresh map still": "Actualiser l’image fixe sur la carte",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "L’image fixe de la carte utilise une requête distincte et peut montrer un autre moment.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "La vidéo est lue depuis Québec 511, qui voit votre adresse IP.",
|
||||||
|
"World time": "Heure du monde",
|
||||||
|
"Back to live": "Revenir au direct",
|
||||||
|
"Live": "Direct",
|
||||||
|
"1 h/s": "1 h/s",
|
||||||
|
"1 d/s": "1 j/s",
|
||||||
|
"1 wk/s": "1 sem/s",
|
||||||
|
"Play speed": "Vitesse de lecture",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Faites défiler ou pincez pour zoomer, glissez pour vous déplacer · double-clic pour tout voir",
|
||||||
|
"1 min/s": "1 min/s"
|
||||||
}
|
}
|
||||||
@@ -3253,5 +3253,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Età massima degli eventi: {days} giorni; indicatori senza data mantenuti",
|
"Maximum event age: {days}d; undated markers are kept": "Età massima degli eventi: {days} giorni; indicatori senza data mantenuti",
|
||||||
"event age filter|All": "Tutti",
|
"event age filter|All": "Tutti",
|
||||||
"Event age": "Età degli eventi",
|
"Event age": "Età degli eventi",
|
||||||
"Event age: {days}d · undated kept": "Età degli eventi: {days} giorni · senza data mantenuti"
|
"Event age: {days}d · undated kept": "Età degli eventi: {days} giorni · senza data mantenuti",
|
||||||
|
"Close camera preview": "Chiudi anteprima della telecamera",
|
||||||
|
"Refresh map still": "Aggiorna immagine fissa sulla mappa",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "L’immagine sulla mappa usa una richiesta separata e può mostrare un momento diverso.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "Il video viene riprodotto da Québec 511, che vede il tuo indirizzo IP.",
|
||||||
|
"World time": "Ora del mondo",
|
||||||
|
"Back to live": "Torna alla diretta",
|
||||||
|
"Live": "Diretta",
|
||||||
|
"1 h/s": "1 h/s",
|
||||||
|
"1 d/s": "1 g/s",
|
||||||
|
"1 wk/s": "1 sett/s",
|
||||||
|
"Play speed": "Velocità di riproduzione",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Scorri o pizzica per lo zoom, trascina per spostarti · doppio clic per vedere tutto",
|
||||||
|
"1 min/s": "1 min/s"
|
||||||
}
|
}
|
||||||
@@ -3103,5 +3103,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "イベントの最大経過日数:{days}日。日付のないマーカーは保持",
|
"Maximum event age: {days}d; undated markers are kept": "イベントの最大経過日数:{days}日。日付のないマーカーは保持",
|
||||||
"event age filter|All": "すべて",
|
"event age filter|All": "すべて",
|
||||||
"Event age": "経過日数",
|
"Event age": "経過日数",
|
||||||
"Event age: {days}d · undated kept": "経過日数:{days}日以内 · 日付なしは保持"
|
"Event age: {days}d · undated kept": "経過日数:{days}日以内 · 日付なしは保持",
|
||||||
|
"Close camera preview": "カメラのプレビューを閉じる",
|
||||||
|
"Refresh map still": "地図上の静止画を更新",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "地図上の静止画は別のリクエストで取得されるため、異なる時点を表示する場合があります。",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "動画は Québec 511 から再生され、Québec 511 にはあなたの IP アドレスが見えます。",
|
||||||
|
"World time": "世界時刻",
|
||||||
|
"Back to live": "ライブに戻る",
|
||||||
|
"Live": "ライブ",
|
||||||
|
"1 h/s": "1時間/秒",
|
||||||
|
"1 d/s": "1日/秒",
|
||||||
|
"1 wk/s": "1週間/秒",
|
||||||
|
"Play speed": "再生速度",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "スクロールまたはピンチでズーム、ドラッグで移動 · ダブルクリックで全体表示",
|
||||||
|
"1 min/s": "1分/秒"
|
||||||
}
|
}
|
||||||
@@ -3253,5 +3253,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Idade máxima do evento: {days} dias; marcadores sem data mantidos",
|
"Maximum event age: {days}d; undated markers are kept": "Idade máxima do evento: {days} dias; marcadores sem data mantidos",
|
||||||
"event age filter|All": "Todos",
|
"event age filter|All": "Todos",
|
||||||
"Event age": "Idade do evento",
|
"Event age": "Idade do evento",
|
||||||
"Event age: {days}d · undated kept": "Idade do evento: {days} dias · sem data mantidos"
|
"Event age: {days}d · undated kept": "Idade do evento: {days} dias · sem data mantidos",
|
||||||
|
"Close camera preview": "Fechar prévia da câmera",
|
||||||
|
"Refresh map still": "Atualizar imagem fixa no mapa",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "A imagem no mapa usa uma solicitação separada e pode mostrar outro momento.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "O vídeo é reproduzido a partir do Québec 511, que vê o seu endereço IP.",
|
||||||
|
"World time": "Hora do mundo",
|
||||||
|
"Back to live": "Voltar ao vivo",
|
||||||
|
"Live": "Ao vivo",
|
||||||
|
"1 h/s": "1 h/s",
|
||||||
|
"1 d/s": "1 d/s",
|
||||||
|
"1 wk/s": "1 sem/s",
|
||||||
|
"Play speed": "Velocidade de reprodução",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Role ou faça pinça para ampliar, arraste para se mover · clique duplo para ver tudo",
|
||||||
|
"1 min/s": "1 min/s"
|
||||||
}
|
}
|
||||||
@@ -3328,5 +3328,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Максимальный возраст события: {days} дн.; метки без даты сохранены",
|
"Maximum event age: {days}d; undated markers are kept": "Максимальный возраст события: {days} дн.; метки без даты сохранены",
|
||||||
"event age filter|All": "Все",
|
"event age filter|All": "Все",
|
||||||
"Event age": "Возраст события",
|
"Event age": "Возраст события",
|
||||||
"Event age: {days}d · undated kept": "Возраст события: {days} дн. · метки без даты сохранены"
|
"Event age: {days}d · undated kept": "Возраст события: {days} дн. · метки без даты сохранены",
|
||||||
|
"Close camera preview": "Закрыть просмотр камеры",
|
||||||
|
"Refresh map still": "Обновить кадр на карте",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "Кадр на карте запрашивается отдельно и может показывать другой момент.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "Видео воспроизводится с Québec 511, который видит ваш IP-адрес.",
|
||||||
|
"World time": "Мировое время",
|
||||||
|
"Back to live": "Вернуться к прямому эфиру",
|
||||||
|
"Live": "Сейчас",
|
||||||
|
"1 h/s": "1 ч/с",
|
||||||
|
"1 d/s": "1 дн/с",
|
||||||
|
"1 wk/s": "1 нед/с",
|
||||||
|
"Play speed": "Скорость воспроизведения",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Прокрутите или сведите пальцы для масштаба, перетащите для перемещения · двойной щелчок — показать всё",
|
||||||
|
"1 min/s": "1 мин/с"
|
||||||
}
|
}
|
||||||
@@ -3328,5 +3328,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "Максимальний вік події: {days} дн.; позначки без дати збережено",
|
"Maximum event age: {days}d; undated markers are kept": "Максимальний вік події: {days} дн.; позначки без дати збережено",
|
||||||
"event age filter|All": "Усі",
|
"event age filter|All": "Усі",
|
||||||
"Event age": "Вік події",
|
"Event age": "Вік події",
|
||||||
"Event age: {days}d · undated kept": "Вік події: {days} дн. · позначки без дати збережено"
|
"Event age: {days}d · undated kept": "Вік події: {days} дн. · позначки без дати збережено",
|
||||||
|
"Close camera preview": "Закрити перегляд камери",
|
||||||
|
"Refresh map still": "Оновити кадр на карті",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "Кадр на карті запитується окремо та може показувати інший момент.",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "Відео відтворюється з Québec 511, який бачить вашу IP-адресу.",
|
||||||
|
"World time": "Світовий час",
|
||||||
|
"Back to live": "Повернутися до прямого ефіру",
|
||||||
|
"Live": "Зараз",
|
||||||
|
"1 h/s": "1 год/с",
|
||||||
|
"1 d/s": "1 дн/с",
|
||||||
|
"1 wk/s": "1 тиж/с",
|
||||||
|
"Play speed": "Швидкість відтворення",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "Прокрутіть або зведіть пальці для масштабу, перетягніть для переміщення · подвійне клацання — показати все",
|
||||||
|
"1 min/s": "1 хв/с"
|
||||||
}
|
}
|
||||||
@@ -3103,5 +3103,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "事件最长保留时间:{days}天;保留无日期标记",
|
"Maximum event age: {days}d; undated markers are kept": "事件最长保留时间:{days}天;保留无日期标记",
|
||||||
"event age filter|All": "全部",
|
"event age filter|All": "全部",
|
||||||
"Event age": "事件时间",
|
"Event age": "事件时间",
|
||||||
"Event age: {days}d · undated kept": "事件时间:{days}天内 · 保留无日期标记"
|
"Event age: {days}d · undated kept": "事件时间:{days}天内 · 保留无日期标记",
|
||||||
|
"Close camera preview": "关闭摄像头预览",
|
||||||
|
"Refresh map still": "刷新地图静止画面",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "地图静止画面通过单独的请求获取,可能显示不同的时刻。",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "视频从 Québec 511 播放,Québec 511 会看到你的 IP 地址。",
|
||||||
|
"World time": "世界时间",
|
||||||
|
"Back to live": "返回实时",
|
||||||
|
"Live": "实时",
|
||||||
|
"1 h/s": "1 小时/秒",
|
||||||
|
"1 d/s": "1 天/秒",
|
||||||
|
"1 wk/s": "1 周/秒",
|
||||||
|
"Play speed": "播放速度",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "滚动或双指缩放,拖动以移动 · 双击查看全部",
|
||||||
|
"1 min/s": "1 分钟/秒"
|
||||||
}
|
}
|
||||||
@@ -3103,5 +3103,18 @@
|
|||||||
"Maximum event age: {days}d; undated markers are kept": "事件最長保留時間:{days}天;保留無日期標記",
|
"Maximum event age: {days}d; undated markers are kept": "事件最長保留時間:{days}天;保留無日期標記",
|
||||||
"event age filter|All": "全部",
|
"event age filter|All": "全部",
|
||||||
"Event age": "事件時間",
|
"Event age": "事件時間",
|
||||||
"Event age: {days}d · undated kept": "事件時間:{days}天內 · 保留無日期標記"
|
"Event age: {days}d · undated kept": "事件時間:{days}天內 · 保留無日期標記",
|
||||||
|
"Close camera preview": "關閉攝影機預覽",
|
||||||
|
"Refresh map still": "重新整理地圖靜態畫面",
|
||||||
|
"The map still uses a separate request and may show a different moment.": "地圖靜態畫面使用獨立請求,顯示的時間可能不同。",
|
||||||
|
"Video plays from Québec 511, which sees your IP address.": "影片從 Québec 511 播放,Québec 511 會看到你的 IP 位址。",
|
||||||
|
"World time": "世界時間",
|
||||||
|
"Back to live": "返回即時",
|
||||||
|
"Live": "即時",
|
||||||
|
"1 h/s": "1 小時/秒",
|
||||||
|
"1 d/s": "1 天/秒",
|
||||||
|
"1 wk/s": "1 週/秒",
|
||||||
|
"Play speed": "播放速度",
|
||||||
|
"Scroll or pinch to zoom, drag to move along · double-click to see it all": "捲動或雙指縮放,拖曳以移動 · 按兩下查看全部",
|
||||||
|
"1 min/s": "1 分鐘/秒"
|
||||||
}
|
}
|
||||||
@@ -98,6 +98,7 @@
|
|||||||
"Landsat 8/9",
|
"Landsat 8/9",
|
||||||
"Latin",
|
"Latin",
|
||||||
"Layout",
|
"Layout",
|
||||||
|
"Live",
|
||||||
"London",
|
"London",
|
||||||
"Los Angeles",
|
"Los Angeles",
|
||||||
"MIL",
|
"MIL",
|
||||||
@@ -215,6 +216,7 @@
|
|||||||
"▲ {frp} MW"
|
"▲ {frp} MW"
|
||||||
],
|
],
|
||||||
"es": [
|
"es": [
|
||||||
|
"1 min/s",
|
||||||
"1090 MHz",
|
"1090 MHz",
|
||||||
"978 MHz UAT",
|
"978 MHz UAT",
|
||||||
"AIS: --",
|
"AIS: --",
|
||||||
@@ -354,6 +356,7 @@
|
|||||||
"iNaturalist"
|
"iNaturalist"
|
||||||
],
|
],
|
||||||
"fr": [
|
"fr": [
|
||||||
|
"1 min/s",
|
||||||
"1090 MHz",
|
"1090 MHz",
|
||||||
"978 MHz UAT",
|
"978 MHz UAT",
|
||||||
"ALTITUDE",
|
"ALTITUDE",
|
||||||
@@ -548,6 +551,7 @@
|
|||||||
"▲ {frp} MW"
|
"▲ {frp} MW"
|
||||||
],
|
],
|
||||||
"it": [
|
"it": [
|
||||||
|
"1 min/s",
|
||||||
"1090 MHz",
|
"1090 MHz",
|
||||||
"978 MHz UAT",
|
"978 MHz UAT",
|
||||||
"AFRICA",
|
"AFRICA",
|
||||||
@@ -783,6 +787,7 @@
|
|||||||
"▲ {frp} MW"
|
"▲ {frp} MW"
|
||||||
],
|
],
|
||||||
"pt": [
|
"pt": [
|
||||||
|
"1 min/s",
|
||||||
"1090 MHz",
|
"1090 MHz",
|
||||||
"978 MHz UAT",
|
"978 MHz UAT",
|
||||||
"AIS: --",
|
"AIS: --",
|
||||||
|
|||||||
@@ -128,9 +128,11 @@ export function createCards({ state: layerState, services, parts, source }) {
|
|||||||
record.camera.lon,
|
record.camera.lon,
|
||||||
),
|
),
|
||||||
inView,
|
inView,
|
||||||
isVideo: parts.model.isVideoFeedType(
|
// Québec's browser-only sources have no registered frame endpoint;
|
||||||
parts.model.normalizeFeedType(record.camera.feedType),
|
// keep them out of still-card fill just like video feeds.
|
||||||
),
|
isVideo:
|
||||||
|
parts.model.isVideoFeedCamera(record.camera) ||
|
||||||
|
parts.model.isBrowserOverlayCamera(record.camera),
|
||||||
sx,
|
sx,
|
||||||
sy,
|
sy,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -237,9 +237,14 @@ export function createCatalog({ state: layerState, services, parts, source }) {
|
|||||||
groundElevationM,
|
groundElevationM,
|
||||||
absoluteHeightM: groundElevationM + mountHeightM,
|
absoluteHeightM: groundElevationM + mountHeightM,
|
||||||
pitchDeg,
|
pitchDeg,
|
||||||
|
frameRefreshMs: parts.model.safeNumber(source.frameRefreshMs, NaN),
|
||||||
license: String(source.license || source.licenseNote || ''),
|
license: String(source.license || source.licenseNote || ''),
|
||||||
credit: String(source.credit || ''),
|
credit: String(source.credit || ''),
|
||||||
code: String(source.code || ''),
|
code: String(source.code || ''),
|
||||||
|
sourceUrl: String(source.sourceUrl || ''),
|
||||||
|
browserMediaUrl: String(source.browserMediaUrl || ''),
|
||||||
|
accuracyM: parts.model.safeNumber(source.accuracyM, NaN),
|
||||||
|
positionSource: String(source.positionSource || ''),
|
||||||
// Shipped precompute (see server/providers/cctv/groundHeights.js).
|
// Shipped precompute (see server/providers/cctv/groundHeights.js).
|
||||||
groundHeights:
|
groundHeights:
|
||||||
source.groundHeights && typeof source.groundHeights === 'object'
|
source.groundHeights && typeof source.groundHeights === 'object'
|
||||||
|
|||||||
@@ -255,11 +255,20 @@ export function createFrames({ state: layerState, services, parts, source }) {
|
|||||||
// clears this latch so the next normal tick can refresh.
|
// clears this latch so the next normal tick can refresh.
|
||||||
if (runtime.imageLoading) return;
|
if (runtime.imageLoading) return;
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const refreshMs =
|
const defaultRefreshMs =
|
||||||
record.camera.id === layerState._activeCameraId
|
record.camera.id === layerState._activeCameraId
|
||||||
? PROJECTION_ACTIVE_REFRESH_MS
|
? PROJECTION_ACTIVE_REFRESH_MS
|
||||||
: PROJECTION_IDLE_REFRESH_MS;
|
: PROJECTION_IDLE_REFRESH_MS;
|
||||||
if (!force && now - runtime.lastImageRefreshAt < refreshMs) return;
|
const sourceRefreshMs = parts.model.safeNumber(
|
||||||
|
record.camera.frameRefreshMs,
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
const refreshMs = Math.max(defaultRefreshMs, sourceRefreshMs);
|
||||||
|
const sinceLastRefresh = now - runtime.lastImageRefreshAt;
|
||||||
|
// Forced activation may skip the normal active interval, but it cannot
|
||||||
|
// bypass a provider's explicit minimum between image requests.
|
||||||
|
if (sourceRefreshMs > 0 && sinceLastRefresh < sourceRefreshMs) return;
|
||||||
|
if (!force && sinceLastRefresh < refreshMs) return;
|
||||||
runtime.lastImageRefreshAt = now;
|
runtime.lastImageRefreshAt = now;
|
||||||
|
|
||||||
const frameUrl = frameUrlFor(record.camera, refreshMs);
|
const frameUrl = frameUrlFor(record.camera, refreshMs);
|
||||||
|
|||||||
@@ -43,9 +43,8 @@ export function createHover({ state: layerState, services, parts, source }) {
|
|||||||
!!record &&
|
!!record &&
|
||||||
cameraId !== layerState._activeCameraId &&
|
cameraId !== layerState._activeCameraId &&
|
||||||
!layerState._cardIds.has(cameraId) &&
|
!layerState._cardIds.has(cameraId) &&
|
||||||
!parts.model.isVideoFeedType(
|
!parts.model.isBrowserOverlayCamera(record.camera) &&
|
||||||
parts.model.normalizeFeedType(record.camera.feedType),
|
!parts.model.isVideoFeedCamera(record.camera);
|
||||||
);
|
|
||||||
if (eligible) {
|
if (eligible) {
|
||||||
cancelHoverRelease();
|
cancelHoverRelease();
|
||||||
layerState._hoverCardId = cameraId;
|
layerState._hoverCardId = cameraId;
|
||||||
|
|||||||
@@ -116,6 +116,8 @@ export function createCctvLayer({ services, source }) {
|
|||||||
_cctvDrawnForTest: parts.testing._cctvDrawnForTest,
|
_cctvDrawnForTest: parts.testing._cctvDrawnForTest,
|
||||||
focusCctvRecord: parts.navigation.focusCctvRecord,
|
focusCctvRecord: parts.navigation.focusCctvRecord,
|
||||||
maybeAutoHop: parts.navigation.maybeAutoHop,
|
maybeAutoHop: parts.navigation.maybeAutoHop,
|
||||||
|
openingCameraId: parts.navigation.openingCameraId,
|
||||||
|
reopenNearestCamera: parts.navigation.reopenNearestCamera,
|
||||||
cctvCycleIndex: parts.navigation.cctvCycleIndex,
|
cctvCycleIndex: parts.navigation.cctvCycleIndex,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ export function createLifecycle({
|
|||||||
layerState._horizonCullListener = viewCamera.on('moveEnd', () => {
|
layerState._horizonCullListener = viewCamera.on('moveEnd', () => {
|
||||||
layerState._cameraMoving = false;
|
layerState._cameraMoving = false;
|
||||||
stopViewMotionTimer();
|
stopViewMotionTimer();
|
||||||
|
parts.navigation.reopenNearestCamera();
|
||||||
settleView();
|
settleView();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -200,6 +201,7 @@ export function createLifecycle({
|
|||||||
layerState._enabled = false;
|
layerState._enabled = false;
|
||||||
layerState._activeCameraId = null;
|
layerState._activeCameraId = null;
|
||||||
layerState._autoHopSuspended = false;
|
layerState._autoHopSuspended = false;
|
||||||
|
layerState._openingCameraProvisional = false;
|
||||||
layerState._lastHopAt = 0;
|
layerState._lastHopAt = 0;
|
||||||
layerState._lastViewContext = '';
|
layerState._lastViewContext = '';
|
||||||
layerState._calibrationById = parts.calibration.loadCalibrationStore();
|
layerState._calibrationById = parts.calibration.loadCalibrationStore();
|
||||||
@@ -322,11 +324,8 @@ export function createLifecycle({
|
|||||||
}
|
}
|
||||||
|
|
||||||
layerState._count = layerState._records.length;
|
layerState._count = layerState._records.length;
|
||||||
if (layerState._records.length > 0) {
|
// No camera is picked here: enable() opens on the one nearest the
|
||||||
// Projection runtime + first frame fetch are deferred to enable() so
|
// viewer, unless restored params selected one first.
|
||||||
// initializing the catalog stays render-cheap.
|
|
||||||
layerState._activeCameraId = layerState._records[0].camera.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Task 5: if the prior batch lost init's bounded race, apply it post-hoc
|
// Task 5: if the prior batch lost init's bounded race, apply it post-hoc
|
||||||
// when it lands (pure recomputes — applyLateGroundPriors guards against
|
// when it lands (pure recomputes — applyLateGroundPriors guards against
|
||||||
@@ -487,8 +486,9 @@ export function createLifecycle({
|
|||||||
return Boolean(coverage && layerState._recordById.has(coverage[1]));
|
return Boolean(coverage && layerState._recordById.has(coverage[1]));
|
||||||
});
|
});
|
||||||
if (!layerState._activeCameraId && layerState._records.length) {
|
if (!layerState._activeCameraId && layerState._records.length) {
|
||||||
layerState._activeCameraId = layerState._records[0].camera.id;
|
layerState._activeCameraId = parts.navigation.openingCameraId();
|
||||||
layerState._autoHopSuspended = false;
|
layerState._autoHopSuspended = false;
|
||||||
|
layerState._openingCameraProvisional = true;
|
||||||
}
|
}
|
||||||
const activeRecord = parts.selection.getActiveRecord();
|
const activeRecord = parts.selection.getActiveRecord();
|
||||||
if (activeRecord) {
|
if (activeRecord) {
|
||||||
@@ -584,6 +584,7 @@ export function createLifecycle({
|
|||||||
layerState._enabled = false;
|
layerState._enabled = false;
|
||||||
layerState._activeCameraId = null;
|
layerState._activeCameraId = null;
|
||||||
layerState._autoHopSuspended = false;
|
layerState._autoHopSuspended = false;
|
||||||
|
layerState._openingCameraProvisional = false;
|
||||||
// Clear existing subscribers rather than replacing the Set —
|
// Clear existing subscribers rather than replacing the Set —
|
||||||
// replacing would silently orphan any unsubscribe() closures
|
// replacing would silently orphan any unsubscribe() closures
|
||||||
layerState._listeners.clear();
|
layerState._listeners.clear();
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ function lifecycleFor(state) {
|
|||||||
geometryQueue: { enqueueViewGeometry() {} },
|
geometryQueue: { enqueueViewGeometry() {} },
|
||||||
cards: { refreshAmbientCards() {} },
|
cards: { refreshAmbientCards() {} },
|
||||||
presentation: { notifyListeners() {} },
|
presentation: { notifyListeners() {} },
|
||||||
|
navigation: { reopenNearestCamera() {} },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return { lifecycle, passes };
|
return { lifecycle, passes };
|
||||||
|
|||||||
@@ -98,6 +98,19 @@ export function createModel({ state: layerState, services, parts, source }) {
|
|||||||
return feedType === 'mp4' || feedType === 'hls' || feedType === 'webm';
|
return feedType === 'mp4' || feedType === 'hls' || feedType === 'webm';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A browser-only source still counts as live-capable for map icon/LOD policy. */
|
||||||
|
function isVideoFeedCamera(camera) {
|
||||||
|
return (
|
||||||
|
isVideoFeedType(normalizeFeedType(camera?.feedType)) ||
|
||||||
|
Boolean(camera?.browserMediaUrl)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Québec source pages and browser-played MP4s use the DOM overlay path. */
|
||||||
|
function isBrowserOverlayCamera(camera) {
|
||||||
|
return String(camera?.sourceKind || '').startsWith('quebec-');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Coerces a value to a finite number or returns the fallback.
|
* Coerces a value to a finite number or returns the fallback.
|
||||||
*
|
*
|
||||||
@@ -416,7 +429,12 @@ export function createModel({ state: layerState, services, parts, source }) {
|
|||||||
|
|
||||||
function projectionLoopIsNeeded() {
|
function projectionLoopIsNeeded() {
|
||||||
if (!layerState._enabled || !layerState._viewer) return false;
|
if (!layerState._enabled || !layerState._viewer) return false;
|
||||||
if (layerState._showProjection && parts.selection.getActiveRecord())
|
const active = parts.selection.getActiveRecord();
|
||||||
|
if (
|
||||||
|
layerState._showProjection &&
|
||||||
|
active &&
|
||||||
|
!isBrowserOverlayCamera(active.camera)
|
||||||
|
)
|
||||||
return true;
|
return true;
|
||||||
return focusPassIsNeeded(
|
return focusPassIsNeeded(
|
||||||
getFocusTarget(),
|
getFocusTarget(),
|
||||||
@@ -523,6 +541,8 @@ export function createModel({ state: layerState, services, parts, source }) {
|
|||||||
angularDeltaAbs,
|
angularDeltaAbs,
|
||||||
normalizeFeedType,
|
normalizeFeedType,
|
||||||
isVideoFeedType,
|
isVideoFeedType,
|
||||||
|
isVideoFeedCamera,
|
||||||
|
isBrowserOverlayCamera,
|
||||||
safeNumber,
|
safeNumber,
|
||||||
headingFromId,
|
headingFromId,
|
||||||
quantize,
|
quantize,
|
||||||
|
|||||||
@@ -33,6 +33,36 @@ export function createNavigation({
|
|||||||
return best?.id || null;
|
return best?.id || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The camera the layer opens on when none is selected: the one nearest the
|
||||||
|
* viewer, or the first record when the viewer has no position yet.
|
||||||
|
* @returns {string|null} Camera ID, or null when the catalog is empty.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function openingCameraId() {
|
||||||
|
return (
|
||||||
|
nearestCameraIdToViewer() || layerState._records[0]?.camera?.id || null
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* After a settled move, moves the opening camera to the one nearest the
|
||||||
|
* view, until someone chooses a camera. A shared view's flight lands after
|
||||||
|
* enable() picked from the startup view.
|
||||||
|
* @returns {boolean} True when the active camera changed.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function reopenNearestCamera() {
|
||||||
|
if (!layerState._openingCameraProvisional || !layerState._enabled)
|
||||||
|
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;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Flies the viewer's camera to frame the specified CCTV camera,
|
* Flies the viewer's camera to frame the specified CCTV camera,
|
||||||
* looking along its heading from above.
|
* looking along its heading from above.
|
||||||
@@ -146,6 +176,8 @@ export function createNavigation({
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
nearestCameraIdToViewer,
|
nearestCameraIdToViewer,
|
||||||
|
openingCameraId,
|
||||||
|
reopenNearestCamera,
|
||||||
focusCctvRecord,
|
focusCctvRecord,
|
||||||
focusCamera,
|
focusCamera,
|
||||||
maybeAutoHop,
|
maybeAutoHop,
|
||||||
|
|||||||
@@ -160,9 +160,14 @@ export function createPresentation({
|
|||||||
const camera = record.camera;
|
const camera = record.camera;
|
||||||
const health = layerState._healthById.get(camera.id) || null;
|
const health = layerState._healthById.get(camera.id) || null;
|
||||||
const isActive = camera.id === resolvedActiveId;
|
const isActive = camera.id === resolvedActiveId;
|
||||||
const refreshMs = isActive
|
const defaultRefreshMs = isActive
|
||||||
? ACTIVE_FRAME_REFRESH_MS
|
? ACTIVE_FRAME_REFRESH_MS
|
||||||
: IDLE_FRAME_REFRESH_MS;
|
: IDLE_FRAME_REFRESH_MS;
|
||||||
|
const sourceRefreshMs = Number(camera.frameRefreshMs);
|
||||||
|
const refreshMs =
|
||||||
|
Number.isFinite(sourceRefreshMs) && sourceRefreshMs > 0
|
||||||
|
? Math.max(defaultRefreshMs, sourceRefreshMs)
|
||||||
|
: defaultRefreshMs;
|
||||||
return {
|
return {
|
||||||
id: camera.id,
|
id: camera.id,
|
||||||
name: camera.name,
|
name: camera.name,
|
||||||
@@ -192,11 +197,16 @@ export function createPresentation({
|
|||||||
mountHeightM: camera.mountHeightM,
|
mountHeightM: camera.mountHeightM,
|
||||||
active: isActive,
|
active: isActive,
|
||||||
feedType: camera.feedType,
|
feedType: camera.feedType,
|
||||||
|
sourceUrl: camera.sourceUrl || '',
|
||||||
|
browserMediaUrl: camera.browserMediaUrl || '',
|
||||||
|
accuracyM: Number.isFinite(camera.accuracyM) ? camera.accuracyM : null,
|
||||||
|
positionSource: camera.positionSource || '',
|
||||||
isVideo:
|
isVideo:
|
||||||
parts.model.isVideoFeedType(camera.feedType) &&
|
parts.model.isVideoFeedCamera(camera) &&
|
||||||
record.projection?.mode !== 'image',
|
record.projection?.mode !== 'image',
|
||||||
sourceKind:
|
sourceKind: camera.sourceKind?.startsWith('quebec-')
|
||||||
health?.sourceKind ||
|
? camera.sourceKind
|
||||||
|
: health?.sourceKind ||
|
||||||
camera.sourceKind ||
|
camera.sourceKind ||
|
||||||
(camera.feedConfigured ? 'configured' : 'seed'),
|
(camera.feedConfigured ? 'configured' : 'seed'),
|
||||||
sourceStatus: health?.status || 'unknown',
|
sourceStatus: health?.status || 'unknown',
|
||||||
@@ -276,6 +286,7 @@ export function createPresentation({
|
|||||||
hoverId: layerState._hoverCardId,
|
hoverId: layerState._hoverCardId,
|
||||||
},
|
},
|
||||||
activeCameraId: activeId,
|
activeCameraId: activeId,
|
||||||
|
activeCameraReselection: layerState._activeCameraReselection,
|
||||||
activeCamera: active ? getPublicCameraState(active, activeId) : null,
|
activeCamera: active ? getPublicCameraState(active, activeId) : null,
|
||||||
cameraIndex: cameraIndex(),
|
cameraIndex: cameraIndex(),
|
||||||
summary: buildSummaryText(),
|
summary: buildSummaryText(),
|
||||||
|
|||||||
@@ -201,6 +201,9 @@ export function createProjection({
|
|||||||
|
|
||||||
function createProjectionRuntime(record) {
|
function createProjectionRuntime(record) {
|
||||||
if (!layerState._viewer) return null;
|
if (!layerState._viewer) return null;
|
||||||
|
// Québec 511 denies CORS pixel access; Québec map previews are native DOM
|
||||||
|
// videos positioned over the globe, never Cesium video textures.
|
||||||
|
if (parts.model.isBrowserOverlayCamera(record.camera)) return null;
|
||||||
const canvas = document.createElement('canvas');
|
const canvas = document.createElement('canvas');
|
||||||
canvas.width = PROJECTION_CANVAS_WIDTH;
|
canvas.width = PROJECTION_CANVAS_WIDTH;
|
||||||
canvas.height = PROJECTION_CANVAS_HEIGHT;
|
canvas.height = PROJECTION_CANVAS_HEIGHT;
|
||||||
|
|||||||
@@ -204,8 +204,7 @@ export function createRendering({
|
|||||||
function cameraColorFor(record) {
|
function cameraColorFor(record) {
|
||||||
if (record.camera.id === layerState._activeCameraId)
|
if (record.camera.id === layerState._activeCameraId)
|
||||||
return ACTIVE_CAMERA_COLOR;
|
return ACTIVE_CAMERA_COLOR;
|
||||||
if (parts.model.isVideoFeedType(record.camera.feedType))
|
if (parts.model.isVideoFeedCamera(record.camera)) return LIVE_CAMERA_COLOR;
|
||||||
return LIVE_CAMERA_COLOR;
|
|
||||||
return IDLE_CAMERA_COLOR;
|
return IDLE_CAMERA_COLOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -557,8 +556,9 @@ export function createRendering({
|
|||||||
if (
|
if (
|
||||||
layerState._enabled &&
|
layerState._enabled &&
|
||||||
isActive &&
|
isActive &&
|
||||||
|
!parts.model.isBrowserOverlayCamera(record.camera) &&
|
||||||
(layerState._showProjection ||
|
(layerState._showProjection ||
|
||||||
parts.model.isVideoFeedType(record.camera.feedType))
|
parts.model.isVideoFeedCamera(record.camera))
|
||||||
) {
|
) {
|
||||||
parts.projection.ensureProjectionRuntime(record);
|
parts.projection.ensureProjectionRuntime(record);
|
||||||
}
|
}
|
||||||
@@ -568,7 +568,8 @@ export function createRendering({
|
|||||||
const planeShowing = !!(
|
const planeShowing = !!(
|
||||||
layerState._enabled &&
|
layerState._enabled &&
|
||||||
layerState._showProjection &&
|
layerState._showProjection &&
|
||||||
isActive
|
isActive &&
|
||||||
|
!parts.model.isBrowserOverlayCamera(record.camera)
|
||||||
);
|
);
|
||||||
|
|
||||||
const inVisibleSet = coverageVisible.has(record.camera.id);
|
const inVisibleSet = coverageVisible.has(record.camera.id);
|
||||||
|
|||||||
@@ -69,7 +69,13 @@ test('focus de-emphasis fades each icon from its own color', () => {
|
|||||||
createRendering({
|
createRendering({
|
||||||
state,
|
state,
|
||||||
services: { focus },
|
services: { focus },
|
||||||
parts: { model: { isVideoFeedType } },
|
parts: {
|
||||||
|
model: {
|
||||||
|
isVideoFeedType,
|
||||||
|
isVideoFeedCamera: (camera) =>
|
||||||
|
isVideoFeedType(camera.feedType) || Boolean(camera.browserMediaUrl),
|
||||||
|
},
|
||||||
|
},
|
||||||
source: {},
|
source: {},
|
||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
@@ -280,7 +286,7 @@ test('a view pass writes only the icons it changes, in one write', () => {
|
|||||||
state,
|
state,
|
||||||
services: { focus: {} },
|
services: { focus: {} },
|
||||||
parts: {
|
parts: {
|
||||||
model: { isVideoFeedType: () => false },
|
model: { isVideoFeedType: () => false, isVideoFeedCamera: () => false },
|
||||||
drawSets: { roleOfSet: () => null },
|
drawSets: { roleOfSet: () => null },
|
||||||
},
|
},
|
||||||
source: {},
|
source: {},
|
||||||
@@ -350,7 +356,9 @@ test('a pose with no perspective field of view is projected by the renderer', ()
|
|||||||
const rendering = createRendering({
|
const rendering = createRendering({
|
||||||
state,
|
state,
|
||||||
services: { focus: {} },
|
services: { focus: {} },
|
||||||
parts: { model: { isVideoFeedType: () => false } },
|
parts: {
|
||||||
|
model: { isVideoFeedType: () => false, isVideoFeedCamera: () => false },
|
||||||
|
},
|
||||||
source: {},
|
source: {},
|
||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -70,10 +70,17 @@ export function createSelection({
|
|||||||
record,
|
record,
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
|
// 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();
|
||||||
|
}
|
||||||
return CCTV_ACTIVATION_RESULT.UNCHANGED;
|
return CCTV_ACTIVATION_RESULT.UNCHANGED;
|
||||||
}
|
}
|
||||||
layerState._activeCameraId = cameraId;
|
layerState._activeCameraId = cameraId;
|
||||||
layerState._autoHopSuspended = false;
|
layerState._autoHopSuspended = false;
|
||||||
|
layerState._openingCameraProvisional = false;
|
||||||
// A real activation creates projection work — wake the self-stopping loop.
|
// A real activation creates projection work — wake the self-stopping loop.
|
||||||
parts.projection.startProjectionLoop();
|
parts.projection.startProjectionLoop();
|
||||||
if (previousActiveRecord && previousActiveRecord !== record) {
|
if (previousActiveRecord && previousActiveRecord !== record) {
|
||||||
@@ -161,6 +168,7 @@ export function createSelection({
|
|||||||
if (!record) return false;
|
if (!record) return false;
|
||||||
layerState._activeCameraId = null;
|
layerState._activeCameraId = null;
|
||||||
layerState._autoHopSuspended = true;
|
layerState._autoHopSuspended = true;
|
||||||
|
layerState._openingCameraProvisional = false;
|
||||||
record.activationDone = false;
|
record.activationDone = false;
|
||||||
parts.geometry.clearProbeClampOnDeactivation(record, (previous) => {
|
parts.geometry.clearProbeClampOnDeactivation(record, (previous) => {
|
||||||
parts.geometry.applyFrustumGeometry(
|
parts.geometry.applyFrustumGeometry(
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { CCTV_ACTIVATION_RESULT } from '../../cctvFocusRequest.js';
|
||||||
|
import { createSelection } from './selection.js';
|
||||||
|
|
||||||
|
function makeSelection(sourceKind) {
|
||||||
|
const camera = { id: 'same-camera', sourceKind };
|
||||||
|
const record = { camera };
|
||||||
|
const state = {
|
||||||
|
_activeCameraId: camera.id,
|
||||||
|
_activeCameraReselection: 0,
|
||||||
|
_recordById: new Map([[camera.id, record]]),
|
||||||
|
};
|
||||||
|
let notifications = 0;
|
||||||
|
const selection = createSelection({
|
||||||
|
state,
|
||||||
|
services: {
|
||||||
|
activation: { CCTV_ACTIVATION_RESULT },
|
||||||
|
picking: { resolvePickId: () => null },
|
||||||
|
},
|
||||||
|
parts: {
|
||||||
|
model: {
|
||||||
|
cctvRecordNeedsActivation: () => false,
|
||||||
|
isBrowserOverlayCamera: (value) =>
|
||||||
|
String(value?.sourceKind || '').startsWith('quebec-'),
|
||||||
|
},
|
||||||
|
presentation: { notifyListeners: () => notifications++ },
|
||||||
|
},
|
||||||
|
source: {},
|
||||||
|
});
|
||||||
|
return { selection, state, notifications: () => notifications };
|
||||||
|
}
|
||||||
|
|
||||||
|
test('same-camera selection does not notify or mutate snapshot-feed state', () => {
|
||||||
|
const fixture = makeSelection('tripcheck-odot');
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
fixture.selection.setActiveCamera('same-camera'),
|
||||||
|
CCTV_ACTIVATION_RESULT.UNCHANGED,
|
||||||
|
);
|
||||||
|
assert.equal(fixture.state._activeCameraReselection, 0);
|
||||||
|
assert.equal(fixture.notifications(), 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('same-camera selection notifies browser-overlay feeds so playback can retry', () => {
|
||||||
|
const fixture = makeSelection('quebec-511-browser');
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
fixture.selection.setActiveCamera('same-camera'),
|
||||||
|
CCTV_ACTIVATION_RESULT.UNCHANGED,
|
||||||
|
);
|
||||||
|
assert.equal(fixture.state._activeCameraReselection, 1);
|
||||||
|
assert.equal(fixture.notifications(), 1);
|
||||||
|
});
|
||||||
@@ -28,6 +28,10 @@ export function createState({ services }) {
|
|||||||
|
|
||||||
layerState._activeCameraId = null;
|
layerState._activeCameraId = null;
|
||||||
|
|
||||||
|
// Advances when a user reselects the already-active camera. The geometry
|
||||||
|
// activation remains a no-op, but browser-only camera UI can retry playback.
|
||||||
|
layerState._activeCameraReselection = 0;
|
||||||
|
|
||||||
layerState._coverageMode = 'on';
|
layerState._coverageMode = 'on';
|
||||||
// 'off' | 'on' (wireframes) | 'viewshed' (color-coded volumes)
|
// 'off' | 'on' (wireframes) | 'viewshed' (color-coded volumes)
|
||||||
|
|
||||||
@@ -35,6 +39,12 @@ export function createState({ services }) {
|
|||||||
|
|
||||||
layerState._autoHop = false;
|
layerState._autoHop = false;
|
||||||
|
|
||||||
|
// True while the active camera is the one enable() opened on and nobody has
|
||||||
|
// chosen a camera since: each settled move then re-picks the one nearest
|
||||||
|
// the view, so a share flight that lands after enable still opens nearby.
|
||||||
|
|
||||||
|
layerState._openingCameraProvisional = false;
|
||||||
|
|
||||||
// An explicit empty-space deselect keeps AUTO HOP configured but prevents its
|
// An explicit empty-space deselect keeps AUTO HOP configured but prevents its
|
||||||
// timer from silently choosing a replacement. A later explicit activation or
|
// timer from silently choosing a replacement. A later explicit activation or
|
||||||
// AUTO HOP toggle-on releases the hold.
|
// AUTO HOP toggle-on releases the hold.
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ export function createTesting({ state: layerState, services, parts, source }) {
|
|||||||
coverageMode = 'on',
|
coverageMode = 'on',
|
||||||
showProjection = false,
|
showProjection = false,
|
||||||
healthById = new Map(),
|
healthById = new Map(),
|
||||||
|
openingCameraProvisional = false,
|
||||||
} = {}) {
|
} = {}) {
|
||||||
layerState._viewer = viewer;
|
layerState._viewer = viewer;
|
||||||
layerState._records = Array.isArray(records) ? records : [];
|
layerState._records = Array.isArray(records) ? records : [];
|
||||||
@@ -113,6 +114,7 @@ export function createTesting({ state: layerState, services, parts, source }) {
|
|||||||
layerState._projectionEntities = [];
|
layerState._projectionEntities = [];
|
||||||
layerState._activeCameraId = activeCameraId;
|
layerState._activeCameraId = activeCameraId;
|
||||||
layerState._autoHopSuspended = false;
|
layerState._autoHopSuspended = false;
|
||||||
|
layerState._openingCameraProvisional = !!openingCameraProvisional;
|
||||||
layerState._enabled = !!enabled;
|
layerState._enabled = !!enabled;
|
||||||
layerState._coverageMode = parts.model.normalizeCoverageMode(
|
layerState._coverageMode = parts.model.normalizeCoverageMode(
|
||||||
coverageMode,
|
coverageMode,
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { eastNorthUp, framePoint } from '../../geo/frames.js';
|
|||||||
import {
|
import {
|
||||||
addSeconds,
|
addSeconds,
|
||||||
julianLessThan,
|
julianLessThan,
|
||||||
julianNow,
|
julianFromEpochMs,
|
||||||
secondsDifference,
|
secondsDifference,
|
||||||
} from '../../geo/julian.js';
|
} from '../../geo/julian.js';
|
||||||
import {
|
import {
|
||||||
@@ -209,7 +209,7 @@ export function createMotion({
|
|||||||
const renderTime =
|
const renderTime =
|
||||||
sampledRenderTime ??
|
sampledRenderTime ??
|
||||||
addSeconds(
|
addSeconds(
|
||||||
julianNow(flightState._scratchRenderTime),
|
julianFromEpochMs(flightState.now(), flightState._scratchRenderTime),
|
||||||
-RENDER_DELAY_SEC,
|
-RENDER_DELAY_SEC,
|
||||||
flightState._scratchRenderTime,
|
flightState._scratchRenderTime,
|
||||||
);
|
);
|
||||||
@@ -306,7 +306,7 @@ export function createMotion({
|
|||||||
const history = flightState._positionHistory.get(flightState._trackedIcao);
|
const history = flightState._positionHistory.get(flightState._trackedIcao);
|
||||||
if (!history || history.length === 0) return true;
|
if (!history || history.length === 0) return true;
|
||||||
const renderTime = addSeconds(
|
const renderTime = addSeconds(
|
||||||
julianNow(),
|
julianFromEpochMs(flightState.now()),
|
||||||
-RENDER_DELAY_SEC,
|
-RENDER_DELAY_SEC,
|
||||||
flightState._scratchWarmupTime,
|
flightState._scratchWarmupTime,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ function fixture() {
|
|||||||
_scratchArc: {},
|
_scratchArc: {},
|
||||||
_scratchOffset: { x: 0, y: 0, z: 0 },
|
_scratchOffset: { x: 0, y: 0, z: 0 },
|
||||||
_scratchRenderTime: { dayNumber: 0, secondsOfDay: 0 },
|
_scratchRenderTime: { dayNumber: 0, secondsOfDay: 0 },
|
||||||
|
now: Date.now,
|
||||||
};
|
};
|
||||||
const motion = createMotion({
|
const motion = createMotion({
|
||||||
flightState,
|
flightState,
|
||||||
@@ -129,7 +130,7 @@ test('fleet render time is shared without resampling or mutating the supplied in
|
|||||||
assert.ok(Cesium.JulianDate.equals(renderTime, savedTime));
|
assert.ok(Cesium.JulianDate.equals(renderTime, savedTime));
|
||||||
});
|
});
|
||||||
|
|
||||||
test('tracked callers still sample a fresh delayed time without a fleet epoch', (t) => {
|
test('tracked callers still sample a fresh delayed time without a fleet epoch', () => {
|
||||||
const { flightState, motion } = fixture();
|
const { flightState, motion } = fixture();
|
||||||
const start = Cesium.JulianDate.fromIso8601('2026-10-24T12:00:00Z');
|
const start = Cesium.JulianDate.fromIso8601('2026-10-24T12:00:00Z');
|
||||||
const history = [
|
const history = [
|
||||||
@@ -147,8 +148,11 @@ test('tracked callers still sample a fresh delayed time without a fleet epoch',
|
|||||||
flightState.records.data.set('tracked', { velocity: 100, true_track: 90 });
|
flightState.records.data.set('tracked', { velocity: 100, true_track: 90 });
|
||||||
flightState._positionHistory.set('tracked', history);
|
flightState._positionHistory.set('tracked', history);
|
||||||
let elapsed = 60;
|
let elapsed = 60;
|
||||||
const startMs = Cesium.JulianDate.toDate(start).getTime();
|
let reads = 0;
|
||||||
const spy = t.mock.method(Date, 'now', () => startMs + elapsed * 1000);
|
flightState.now = () => {
|
||||||
|
reads += 1;
|
||||||
|
return Cesium.JulianDate.toDate(start).getTime() + elapsed * 1000;
|
||||||
|
};
|
||||||
const out = new Cesium.Cartesian3();
|
const out = new Cesium.Cartesian3();
|
||||||
close(
|
close(
|
||||||
motion._deadReckon('tracked', out),
|
motion._deadReckon('tracked', out),
|
||||||
@@ -169,7 +173,7 @@ test('tracked callers still sample a fresh delayed time without a fleet epoch',
|
|||||||
new Cesium.Cartesian3(),
|
new Cesium.Cartesian3(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
assert.equal(spy.mock.callCount(), 2);
|
assert.equal(reads, 2);
|
||||||
// Sampled into the layer's scratch, not a new date.
|
// Sampled into the layer's scratch, not a new date.
|
||||||
assert.ok(
|
assert.ok(
|
||||||
Cesium.JulianDate.equals(
|
Cesium.JulianDate.equals(
|
||||||
|
|||||||
@@ -187,6 +187,7 @@ test('the tracked trail head is drawn each frame while tracked and stops with th
|
|||||||
);
|
);
|
||||||
let headLon = 0.03;
|
let headLon = 0.03;
|
||||||
const flightState = {
|
const flightState = {
|
||||||
|
now: Date.now,
|
||||||
_viewer: viewer,
|
_viewer: viewer,
|
||||||
_trackedIcao: 'abc123',
|
_trackedIcao: 'abc123',
|
||||||
_trail: null,
|
_trail: null,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { FlightRecords } from './records.js';
|
import { FlightRecords } from './records.js';
|
||||||
import { createFlightFeed } from './ingestion.js';
|
import { createFlightFeed } from './ingestion.js';
|
||||||
|
import { worldTimeFor } from '../../time/worldClock.js';
|
||||||
import { ENRICH_AMBIENT_BUDGET_CEIL } from './policy.js';
|
import { ENRICH_AMBIENT_BUDGET_CEIL } from './policy.js';
|
||||||
|
|
||||||
export function createFlightState({ source, services }) {
|
export function createFlightState({ source, services }) {
|
||||||
@@ -10,6 +11,8 @@ export function createFlightState({ source, services }) {
|
|||||||
...services.geoid,
|
...services.geoid,
|
||||||
...services.groundFloor,
|
...services.groundFloor,
|
||||||
});
|
});
|
||||||
|
/** The time contacts are drawn behind by the render delay, in epoch ms. */
|
||||||
|
flightState.now = worldTimeFor('flights');
|
||||||
|
|
||||||
/** Per-class model spec. Hangar-fleet classes (CLASS_MODEL_REAL) ship GLBs
|
/** Per-class model spec. Hangar-fleet classes (CLASS_MODEL_REAL) ship GLBs
|
||||||
* vertex-baked to real-world METERS in the airplane.glb axis convention, so
|
* vertex-baked to real-world METERS in the airplane.glb axis convention, so
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import { fromDegrees, toLonLatH } from '../../geo/ellipsoid.js';
|
|||||||
import {
|
import {
|
||||||
addSeconds,
|
addSeconds,
|
||||||
julianLessThanOrEquals,
|
julianLessThanOrEquals,
|
||||||
julianNow,
|
julianFromEpochMs,
|
||||||
julianToEpochMs,
|
julianToEpochMs,
|
||||||
} from '../../geo/julian.js';
|
} from '../../geo/julian.js';
|
||||||
import { clone, distanceSquared, vec } from '../../geo/vector.js';
|
import { clone, distanceSquared, vec } from '../../geo/vector.js';
|
||||||
@@ -441,7 +441,7 @@ export function createTracking({
|
|||||||
// would draw the trail in front of the plane. They join the trail via _appendTrailFix
|
// would draw the trail in front of the plane. They join the trail via _appendTrailFix
|
||||||
// as they age past the delay.
|
// as they age past the delay.
|
||||||
const seedRenderTime = addSeconds(
|
const seedRenderTime = addSeconds(
|
||||||
julianNow(),
|
julianFromEpochMs(flightState.now()),
|
||||||
-RENDER_DELAY_SEC,
|
-RENDER_DELAY_SEC,
|
||||||
flightState._scratchWarmupTime,
|
flightState._scratchWarmupTime,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -81,6 +81,8 @@ export function createGnssIntegrityLayer({
|
|||||||
source,
|
source,
|
||||||
viewAnchor = defaultGnssViewAnchor,
|
viewAnchor = defaultGnssViewAnchor,
|
||||||
now = () => Date.now(),
|
now = () => Date.now(),
|
||||||
|
// The end of the window shown; retries and receipt times stay on `now`.
|
||||||
|
worldNow = now,
|
||||||
monotonicNow = () => performance.now(),
|
monotonicNow = () => performance.now(),
|
||||||
windowMs: requestedWindowMs,
|
windowMs: requestedWindowMs,
|
||||||
} = {}) {
|
} = {}) {
|
||||||
@@ -175,7 +177,7 @@ export function createGnssIntegrityLayer({
|
|||||||
|
|
||||||
/** Age the store without new evidence, so expired cells leave the globe. */
|
/** Age the store without new evidence, so expired cells leave the globe. */
|
||||||
function expire() {
|
function expire() {
|
||||||
pruneGnssObservations(_observations, now(), { windowMs });
|
pruneGnssObservations(_observations, worldNow(), { windowMs });
|
||||||
_cells = binGnssCells(_observations);
|
_cells = binGnssCells(_observations);
|
||||||
render();
|
render();
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+1
-1
@@ -29,7 +29,7 @@ export function createControls({ state: layerState, services, parts, source }) {
|
|||||||
*/
|
*/
|
||||||
getAnalystRecords(maxCount = Infinity) {
|
getAnalystRecords(maxCount = Infinity) {
|
||||||
if (!layerState._enabled) return [];
|
if (!layerState._enabled) return [];
|
||||||
const now = Date.now();
|
const now = layerState.now();
|
||||||
const text = (v) => (typeof v === 'string' && v.trim() ? v.trim() : null);
|
const text = (v) => (typeof v === 'string' && v.trim() ? v.trim() : null);
|
||||||
const result = [];
|
const result = [];
|
||||||
for (const launch of layerState._launches || []) {
|
for (const launch of layerState._launches || []) {
|
||||||
|
|||||||
@@ -225,6 +225,7 @@ export function createIngestion({
|
|||||||
}
|
}
|
||||||
layerState._focusAfterActiveLookup = false;
|
layerState._focusAfterActiveLookup = false;
|
||||||
parts.panel.renderMissionPanel();
|
parts.panel.renderMissionPanel();
|
||||||
|
layerState.coverageChanged();
|
||||||
layerState._entryCameraView = null;
|
layerState._entryCameraView = null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (layerState._enabled && token === layerState._lifecycleToken) {
|
if (layerState._enabled && token === layerState._lifecycleToken) {
|
||||||
|
|||||||
Loaded 100 of 170 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user