fix(street-level): drop the saved FIT / FILL key nothing reads now

Co-Authored-By: Claude Opus 5.5 <[email protected]>

.env.example

@@ -207,7 +207,6 @@ AISSTREAM_API_KEY=
 # CCTV_TFL_ENABLED=1                                   # set 0 to disable Transport for London JamCams
 # CCTV_TFL_MAX_SOURCES=250                             # cap cameras loaded from TfL
 # 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
 # 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_MAX_SOURCES=300                      # cap cameras loaded from the Fintraffic catalog
@@ -228,9 +227,6 @@ AISSTREAM_API_KEY=
 # 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_MAX_SOURCES=150                       # cap cameras loaded from Catalonia (~130 exist today)
-# 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_CAMERAS_URL=                                # override the DATA.GOV.HK camera locations XML URL
 # CCTV_KINGCOUNTY_ENABLED=1                            # set 0 to disable the King County (Washington) road cameras
 # CCTV_KINGCOUNTY_MAX_SOURCES=125                      # cap cameras loaded from the King County catalog
 # CCTV_WSDOT_ENABLED=1                                 # set 0 to disable the WSDOT (Washington State) highway cameras
@@ -238,7 +234,6 @@ AISSTREAM_API_KEY=
 # CCTV_VEGVESEN_ENABLED=1                              # set 0 to disable the Statens vegvesen (Norway) road cameras
 # CCTV_VEGVESEN_MAX_SOURCES=900                        # cap cameras loaded from Statens vegvesen (default loads all ~850 live; max 1000)
 # CCTV_VEGVESEN_VIDEO=1                                # set 0 to show stills instead of live HLS for Statens vegvesen video cameras
-# CCTV_VEGVESEN_HEIGHTS=1                              # set 0 to skip Kartverket ground heights for Statens vegvesen cameras (flat prior instead)
 # CCTV_VEGVESEN_URL=                                   # override the Statens vegvesen catalog URL
 # CCTV_NYC_ENABLED=                                    # off by default; set 1 only if you hold a NYC DOT data-sharing agreement ([email protected]) for the camera feed
 # CCTV_NYC_MAX_SOURCES=250                             # cap cameras loaded from the NYC TMC catalog (nearest borough cores first)
@@ -250,9 +245,6 @@ AISSTREAM_API_KEY=
 # CCTV_LITHUANIA_MAX_SOURCES=400                       # cap Lithuanian cameras; no API key required
 # CCTV_FLORIDA_ENABLED=                                # off by default; set 1 to load FL511 (Florida) cameras (individual, personal use only; any other use, including a public deployment, needs FDOT's express written consent; see DATA_SOURCES.md)
 # CCTV_FLORIDA_MAX_SOURCES=500                         # cap cameras loaded from the FL511 catalog (nearest regional anchors first)
-# CCTV_TAIWAN_ENABLED=1                                # set 0 to skip Taiwan Freeway Bureau (MOTC) road cameras
-# CCTV_TAIWAN_MAX_SOURCES=600                          # cap Taiwan freeway cameras (1-2000); no API key required
-# CCTV_TAIWAN_URL=                                     # override the Freeway Bureau MOTC 2.0 CCTV.xml URL
 # CCTV_MAX_SOURCES=4000                                # catalog-wide ceiling, shared round-robin across packs
 # CCTV_PREFER_AUSTIN=1                                 # prioritize Austin cameras in the registry
 # CCTV_FORCE_AUSTIN=                                   # force live default sources when a source-pack JSON is configured

DATA_SOURCES.md

@@ -63,9 +63,7 @@ How to read this:
 | **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                                                                  |
 | **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)                                                                  |
-| **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"                                                                                              |
 | **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) |
 | **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) |
 | **City of Toronto Open Data** (`opendata.toronto.ca`)                 | CCTV camera catalog + frames, Toronto city streets                                                                                  | [Open Government Licence – Toronto](https://www.toronto.ca/city-government/data-research-maps/open-data/open-data-licence/) — attribution REQUIRED                                                                                                                                                                                                    | "Contains information licensed under the Open Government Licence – Toronto"                                                                 |
 | **GBFS (Lyft / BCycle / Social Bicycles / PBSC)**                     | Bikeshare availability                                                                                                              | Per-feed (attribution-only)                                                                                                                                                                                                                                                                                                                           | Credit the operator (e.g. Austin BCycle) + its `license_url`                                                                                                   |
@@ -113,7 +111,6 @@ 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.
 
 - **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).
 
 - **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)).
 - **OpenSky Network.** Its license is **non-commercial**, and operational use of the REST API in a live product can require a prior written agreement with OpenSky — even for non-profit/government use. If you deploy this commercially, contact OpenSky for your own terms. The flights layer is a toggle and runs anonymously by default.
@@ -156,7 +153,7 @@ The optional Local ADS-B layer and the broadcast-FM receiver use radio you recei
 - **adsbdb enrichment.** `/api/adsbdb` resolves an ICAO hex to aircraft type, model name and registration, and the tracked flight's callsign to an airline and an origin/destination pair. Fan-out is deliberately small because adsbdb is a free community API that publishes no quota: at most 4 requests in flight, dispatches dripped to roughly 5/s, and each key asked for at most once per session, with route lookups reserved for the tracked aircraft. The dev-server proxy caches each key for 24 hours in `.gev-cache/adsbdb.json`, negative answers included, so fresh entries survive server restarts. That gitignored cache remains local to the deployment and is not bundled with this repo. adsbdb publishes no general service license; its README says the route data may not be copied, published, or incorporated into other databases without the explicit permission of David J Taylor, Edinburgh. Deployers are responsible for obtaining any permission their use requires. Enrichment is best-effort and fail-silent — a flight that gets no answer keeps what the flight feed already gave it.
 - **Launch Library 2.** `/api/launches` makes a server-side rolling-30-day query against the supported v2.3 detailed launch endpoint, caches successful responses for 15 minutes in memory and on disk, and serves the last successful response during a throttle or transient outage. Anonymous access is limited to 15 calls/hour; deployments can provide `LL2_API_TOKEN` for authenticated access. The Space Devs' published terms permit using and sharing the API data in any form, ask users not to forward it without adding value, disclaim complete accuracy, and encourage—but do not require—attribution. This app keeps a courtesy credit. Payload and stage/recovery records are shown only when supplied. Failed launches expose their source status and never receive fallback orbit geometry or a live/estimated marker. LL2 supplies launch context and event timing, not continuous ascent telemetry or live orbital state.
 - **TfL JamCams.** The camera list comes from the keyless `api.tfl.gov.uk` endpoint (an optional `TFL_APP_KEY` raises its rate limit); frames come from TfL's public S3 bucket. The "Powered by TfL Open Data" attribution is required by TfL's terms and is registered in the Data attribution popover.
-- **Ontario 511 CCTV.** The camera list comes from the `511on.ca/api/v2/get/cameras` endpoint, which now requires a free developer key (`ONTARIO_511_API_KEY`: sign up at 511on.ca/my511/register, then request it while logged in at 511on.ca/developers/doc; throttled to 10 calls a minute). Without the key the pack is skipped. Frames are server-registered still images under `511on.ca/map/Cctv/`. The source is live-fetched at runtime and attributed under the Open Government Licence - Ontario. Access is governed by Ontario 511's Developer's Access Agreement (511on.ca/developers/resources): the data stays under the Open Government Licence - Ontario unless otherwise specified; key requests are reviewed case by case and ask for the intended use and any third parties that will receive the data; attribution by link to 511on.ca is encouraged, and the Ontario 511 logo may not be altered or used to imply endorsement (this app links and shows no logo); and the data is provided "as is", a disclaimer distributors should pass on, which the credit does.
+- **Ontario 511 CCTV.** The camera list comes from the keyless `511on.ca/api/v2/get/cameras` endpoint; frames are server-registered still images under `511on.ca/map/Cctv/`. The source is live-fetched at runtime and attributed under the Open Government Licence - Ontario.
 - **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.
 - **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.
@@ -170,9 +167,7 @@ The optional Local ADS-B layer and the broadcast-FM receiver use radio you recei
 - **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`.
 - **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.
-- **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.
 - **Statens vegvesen road cameras.** Keyless. The camera list is one GeoJSON request to the OGC API Features view of the official DATEX 3.1 CCTV site table (`ogckart-sn1.atlas.vegvesen.no/ogc/features/v1/collections/datex_3_1:CctvSimple/items`), so no DATEX account is needed; frames are stills on `kamera.atlas.vegvesen.no/api/images/<cameraId>`, and only that exact path per camera is registered. Cameras the feed reports as faulty are dropped. About 135 working cameras also publish live HLS (`kamera.vegvesen.no/public/<cameraId>/manifest.m3u8`, MPEG-TS); those play as live video through the bounded in-memory HLS relay, with the still as the snapshot fallback, and only that exact manifest path per camera is registered. `CCTV_VEGVESEN_VIDEO=0` keeps every camera on stills. `orientationDescription` names the place a camera faces, not a bearing, so it goes into the label and headings use the id-hash fallback at low confidence. By default every live camera loads (~850); `CCTV_VEGVESEN_MAX_SOURCES` (8–1000) lowers the cap, keeping the cameras nearest Oslo, Bergen, Stavanger, Trondheim, Kristiansand, Bodø and Tromsø and `CCTV_VEGVESEN_ENABLED=0` turns the pack off. Frames are fetched at request time and never stored or redistributed. The NLOD attribution is registered in the Data attribution popover.
-- **Kartverket ground heights for Statens vegvesen cameras.** The camera feed's points are 2D, so the loader asks Kartverket's keyless point-height API (`ws.geonorge.no/hoydedata/v1/punkt`, CC BY 4.0) for the terrain height at each camera. Requests carry 20 points: the API accepts 50, but above ~20 it answers the extra points from contour lines (`hoydekurver`, metres to ~20 m off) or not at all. Eight requests run at a time, about 36 for the whole country: a cold lookup took 6–13 s in testing (single requests 0.6–9.5 s). Answers are matched by the coordinates the API echoes and recorded only for points that request asked about. Over water the API returns the sea-floor depth (`dybdekurver` or `Havflate`), which is replaced by 0 m, the water surface; for the ~14 bridge cameras that is below the deck, but much closer than the sea floor or the flat prior. Heights are cached in memory by position for the life of the server, and points with no height (a few ferry quays and bridges, or a point a 200 answer leaves out) for 6 h, so the 15-minute catalog refresh only asks about new or moved cameras. The first failing request (a 408, 429 or 5xx, a network error, a request over 10 s, or an unreadable or oversized body) stops the lookup, with no retries, and no new lookup starts until the backoff ends (Retry-After when sent, else 30 min, longer than the refresh; bounded to 1 min–1 h). Any other 4xx marks that request's points as having no height and the lookup carries on. The whole lookup has a 30 s deadline; a lookup cut short by it resumes on the next refresh without a backoff. The lane waits at most 12 s, counted from the start of the loader, and only when more than 10% of the cameras have no answer yet; a few new cameras or expired misses are looked up in the background. A slower lookup keeps filling the cache, and the cameras it had not reached keep the flat prior until the next 15-minute refresh (about 190 of 865 on one slow first run). Only coordinates are sent, with the same User-Agent as the other CCTV requests. `CCTV_VEGVESEN_HEIGHTS=0` turns the lookup off. The Kartverket credit, with a note that heights over water are set to 0 m and heights are rounded to 0.1 m, is shown beside the Statens vegvesen entry in the Data attribution popover.
 - **NYC DOT Traffic Management Center cameras.** Off by default. NYC DOT's [developer data feeds page](https://www.nyc.gov/html/dot/html/about/datafeeds.shtml) asks developers who want the camera feed to contact `[email protected]` and sign a data-sharing agreement. This project does not hold one that covers downstream installations, so the pack loads only when an operator who holds their own agreement sets `CCTV_NYC_ENABLED=1`; with the flag unset, empty or any other value, the server makes no request to NYC DOT. The endpoint needs no key. The camera list is the public `webcams.nyctmc.org/api/cameras` catalog (~980 cameras across the five boroughs); frames are stills at `webcams.nyctmc.org/api/cameras/<uuid>/image`, synthesized from a validated UUID rather than taken from the payload, and only that host is registered. Cameras the feed reports as offline are dropped. The catalog publishes no camera facing, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. Once enabled, the 250 cameras nearest the borough cores load; `CCTV_NYC_MAX_SOURCES` (8–400) changes the cap. Frames are fetched at request time and never stored or redistributed. NYC DOT asks every application that uses its data to carry its disclaimer; it is registered verbatim in the Data attribution popover.
 - **City of Toronto RESCU cameras.** Keyless. The camera list is the City's public `tmcearthcameras.json` on `opendata.toronto.ca` (dataset "Traffic Cameras", Transportation Services), served as JSONP and unwrapped with an anchored pattern. This is the municipal network the Ontario 511 pack does not carry: downtown arterials plus the Gardiner, DVP, Allen and Lake Shore. The list publishes no frame URL, so frame URLs are BUILT from the documented `CameraImages/loc####.jpg` convention and a strictly-digits camera number, pinning the frame proxy to the portal origin by construction; the list fetch refuses redirects and bounds the body it buffers. Frames are fetched at request time and never stored or redistributed. The dataset publishes no camera facing: the `D1`-`D4` fields are the directions of the *comparison* images (static reference stills captured in 2016 under a different path), not a bearing for the live pan-tilt-zoom frame, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. A camera that is temporarily out of service still answers 200 with a byte-identical "Image Unavailable" placeholder rather than an error (about 6% of the network at any moment), so such a camera reads as healthy; the frame it shows is the agency's, not a synthesized one. The licence requires the attribution statement above. Disable with `CCTV_TORONTO_ENABLED=0`.
 - **Camera frame content.** Public camera frames can contain people, vehicles and license plates, and the camera layer does nothing with them beyond putting them on the map. A successful upstream response is relayed as the provider served it: nothing in the camera pipeline blurs, redacts, enhances or restores it, and nothing there runs face, plate or object detection or otherwise recognises or classifies what is in the picture. (The ALPR layer described below maps where plate-reader cameras are, from locations contributors tagged in OpenStreetMap; it reads nothing from any camera frame.) When an upstream has no frame for a camera, what you see instead is a Google Street View still or the app's own placeholder card; the panel's source badge names which of them you are looking at, and a refresh that fails after a frame has arrived leaves the last good picture on screen rather than replacing it. The browser resamples each frame for display: onto a fixed 1920x1080 surface for the camera's projection plane in the scene, and onto a 192x108 canvas for the small ambient card. That scaling is the only change made to the picture, and the only pixels the camera layer reads back are a 64x36 downscale hashed to tell whether the picture has changed. Live streams are piped through; the still path reads the image into memory to pass it on — TxDOT wraps its JPEG in a JSON envelope, which is decoded there — and no frame is written to disk (the disk cache, `.gev-cache/`, holds feed JSON for other layers and never camera imagery). Outside that pipeline, the voice assistant is the one feature that sends imagery anywhere: when it answers a question about what is in view it may attach a downscaled screenshot of the rendered scene — including any camera plane on screen — to the request it sends to the voice model. Frames are fetched only from server-registered camera URLs — a client cannot hand the proxy a URL (see [SECURITY.md](SECURITY.md)). What the app does stays inside the line README draws: no named-person search, no face recognition, no tracking individuals.

README.md

@@ -381,7 +381,7 @@ Twenty layers and map sources. **Eighteen have a keyless path.** Some offer addi
 | 🌍 **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                          | 🟢                                                                                                  |
 | 🚗 **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), plus opt-in New York City (NYC DOT TMC, needs your own NYC DOT agreement), opt-in Lithuania (Via Lietuva / Eismoinfo, photo licence unconfirmed) and opt-in Florida (FL511, individual personal use only; other use needs FDOT's written consent). Positions are published; poses are estimated priors **you calibrate by dragging a gizmo on the camera itself** | City APIs                               | 🟢                                                                                                  |
+| 📹 **CCTV Mesh**            | ~4,000 public cameras (shared cap) projected _into_ the 3D space — Austin · Texas (TxDOT) · California (Caltrans) · London (TfL) · Ontario (511) · 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), plus opt-in New York City (NYC DOT TMC, needs your own NYC DOT agreement), opt-in Lithuania (Via Lietuva / Eismoinfo, photo licence unconfirmed) and opt-in Florida (FL511, individual personal use only; other use needs FDOT's written consent). Positions are published; 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)   | 🟢                                                                                                  |
 | 📷 **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            | 🟢                                                                                                  |
@@ -425,7 +425,7 @@ _The Space Missions layer replaying a Falcon 9 ascent — labeled `RECONSTRUCTED
 
 **Setup.** At [mapillary.com/dashboard/developers](https://www.mapillary.com/dashboard/developers), register an application with **Read** access and copy its **Client Token** (`MLY|…`). Paste it into **POWER UP → Mapillary**, or set `MAPILLARY_CLIENT_TOKEN` in `.env` and restart. Without it the panel reads **KEY REQUIRED**. **Google Street View** uses `GOOGLE_MAPS_API_KEY` with the **Maps JavaScript API** enabled for it in Google Cloud; its chip starts off, since every panorama is billed to the key. **KartaView** and **Panoramax** need nothing: their public APIs are keyless.
 
-**Use.** Turn on **Street Level** under DATA LAYERS → Cameras, or with the pill in the STREET LEVEL panel header. Each provider has a chip in its own colour (Mapillary green), and one is lit at a time: lighting one switches the others off. Mapillary, which is free, is lit by default. Zoom in to street level (below 60 km) for the coverage lines; from orbit the panel says to zoom in. The **IMAGERY** (ALL / 360° / FLAT) and **SINCE** filters apply to Mapillary, KartaView and Panoramax; Street View panoramas are all 360°, so with Street View lit the filters are hidden. Click a coverage line for its image cones and a cone to open the photo. Light **KARTAVIEW** (purple) and zoom in below about 6 km: its lines are the streets KartaView has photos of, and a click on one opens the photo nearest the click, flat or 360° (drag to look around), with cones along its drive; **‹ ›** or ← → step through the drive (Shift+← →, ↑ ↓ and + − look around a 360° photo; pinch zooms on a phone). Photos KartaView has archived are skipped, and where all are archived the panel says so. For KartaView, **SINCE** goes by upload date, as KartaView's own map does (it can filter by nothing else), and the panel notes it beside the SINCE value (ANY DATE (by upload date)); KartaView filters its lines on its own server, and a filtered area KartaView has not drawn before can take several seconds. Light **PANORAMAX** (orange) for the open, federated commons (strongest in France and Belgium): below about 60 km its lines are sequences. A click on a line opens that sequence's picture nearest the click without moving the camera, flat or 360°, with cones along the sequence around it; **‹ ›** or ← → step through it, and both filters apply. Its caption names the picture's authors (or the instance holding it) and licence (mostly CC BY-SA 4.0; pictures on the IGN instance are Licence Ouverte 2.0). On the **Google 3D** map (Google's terms keep Street View off other maps, where it does not appear), light **GOOGLE STREET VIEW** and click a street from below 3 km, or press **OPEN STREET VIEW** for the view centre, to open Google's panorama there; step along its arrows. Above the photo: **EXPAND** (full screen; Esc leaves) and **FIT / FILL** (Mapillary, and flat KartaView and Panoramax photos). The caption links to the image on the provider's site, and the globe credits each provider that is on ("© Mapillary contributors, CC BY-SA 4.0", "Street View imagery © Google", "© KartaView contributors, CC BY-SA 4.0", "© Panoramax contributors, licence per picture"). KartaView's own photo pages fail for signed-out visitors, so its link opens the full-size photo.
+**Use.** Turn on **Street Level** under DATA LAYERS → Cameras, or with the pill in the STREET LEVEL panel header. Each provider has a chip in its own colour (Mapillary green), and one is lit at a time: lighting one switches the others off. Mapillary, which is free, is lit by default. Zoom in to street level (below 60 km) for the coverage lines; from orbit the panel says to zoom in. The **IMAGERY** (ALL / 360° / FLAT) and **SINCE** filters apply to Mapillary, KartaView and Panoramax; Street View panoramas are all 360°, so with Street View lit the filters are hidden. Click a coverage line for its image cones and a cone to open the photo. Light **KARTAVIEW** (purple) and zoom in below about 6 km: its lines are the streets KartaView has photos of, and a click on one opens the photo nearest the click, flat or 360° (drag to look around), with cones along its drive; **‹ ›** or ← → step through the drive (Shift+← →, ↑ ↓ and + − look around a 360° photo; pinch zooms on a phone). Photos KartaView has archived are skipped, and where all are archived the panel says so. For KartaView, **SINCE** goes by upload date, as KartaView's own map does (it can filter by nothing else), and the panel notes it under SINCE; KartaView filters its lines on its own server, and a filtered area KartaView has not drawn before can take several seconds. Light **PANORAMAX** (orange) for the open, federated commons (strongest in France and Belgium): below about 60 km its lines are sequences. A click on a line opens that sequence's picture nearest the click without moving the camera, flat or 360°, with cones along the sequence around it; **‹ ›** or ← → step through it, and both filters apply. Its caption names the picture's authors (or the instance holding it) and licence (mostly CC BY-SA 4.0; pictures on the IGN instance are Licence Ouverte 2.0). On the **Google 3D** map (Google's terms keep Street View off other maps, where it does not appear), light **GOOGLE STREET VIEW** and click a street from below 3 km, or press **OPEN STREET VIEW** for the view centre, to open Google's panorama there; step along its arrows. Above the photo: **EXPAND** (full screen; Esc leaves) and **FIT / FILL** (Mapillary, and flat KartaView and Panoramax photos). The caption links to the image on the provider's site, and the globe credits each provider that is on ("© Mapillary contributors, CC BY-SA 4.0", "Street View imagery © Google", "© KartaView contributors, CC BY-SA 4.0", "© Panoramax contributors, licence per picture"). KartaView's own photo pages fail for signed-out visitors, so its link opens the full-size photo.
 
 Share links carry the provider switches and filters (`0.m.0` Mapillary off, `0.m.0_0.r.google-1` Street View on, `0.m.0_0.r.google-0*kartaview-1*panoramax-0` KartaView on and `0.m.0_0.r.google-0*kartaview-0*panoramax-1` Panoramax on, as the app writes them (`0.m.0_0.r.kartaview-1` and `0.m.0_0.r.panoramax-1` work too; a link that leaves out `m` keeps Mapillary, the default, lit), `0.p.p` panoramas only, `0.s.365` the last year). To add a provider, implement the contract in `src/layers/streetLevel/registry.js` and register it in `src/app/layers/streetLevel.js`.
 

changelog.d/1205-cctv-tool-routing.md

@@ -1,3 +0,0 @@
-- Report actual outcomes when voice enables or disables CCTV through the shared
-  layer lifecycle, including failed and cancelled changes (manjunath22466,
-  #1205).

changelog.d/1220-openai-typed-send.md

@@ -1,3 +0,0 @@
-- Avoid starting or queuing a reply when the local channel rejects a typed OpenAI
-  command, while preserving an earlier accepted deferred input
-  (Manjunath, #1220).

changelog.d/1228-cctv-ontario-511-key.md

@@ -1,4 +0,0 @@
-- Load Ontario 511 cameras again. 511on.ca's camera endpoint now requires a
-  free developer key; set `ONTARIO_511_API_KEY` to enable the pack, which is
-  otherwise skipped with one log line saying where to get a key
-  (quanticsoul4772, #1228).

changelog.d/1233-tarktee-datex-catalog-hardening.md

@@ -1,4 +0,0 @@
-- Harden the Tarktee (Estonia) DATEX2 camera catalog fetches: refuse redirects,
-  cancel both response streams when either response fails or overflows the 4 MB
-  byte cap, and deduplicate camera IDs before per-pack prioritization
-  (yaka0007, #1233).

changelog.d/1234-cctv-catalog-background-refresh.md

@@ -1,5 +0,0 @@
-- Serve the camera catalog while it refreshes. An expired catalog made every
-  camera request wait for the slowest pack to reload; it is now answered at
-  once while one background refresh runs, so only the first load waits. Estonia's
-  slow Tarktee feeds get 30 s instead of 15 s, so the pack no longer drops out
-  on about a third of loads (quanticsoul4772, #1234).

changelog.d/1235-location-resolution.md

@@ -1,3 +0,0 @@
-- Require a geocoded containment anchor for ambiguous analyst region names,
-  preserve boundary provenance and cancellation safety, and retain exact-name
-  precedence for natural outlines (manjunath22466, #1235).

changelog.d/1237-taiwan-freeway-cctv.md

@@ -1,4 +0,0 @@
-- Add Taiwan's national freeway cameras from the Freeway Bureau, MOTC to CCTV:
-  ~1,800 cameras read at runtime from the official MOTC 2.0 open-data table,
-  with on-demand snapshots and attribution. No API key is required; set
-  `CCTV_TAIWAN_ENABLED=0` to skip it (419vive, #1237).

changelog.d/1241-street-level-panel-cuts.md

@@ -0,0 +1,5 @@
+- Street Level panel: SINCE is a dropdown of its nine windows (the tooltip
+  names the cut-off date), IMAGERY and FIT / FILL are plain toggle buttons,
+  and the panel opens by itself only when a photo opens or a click fails to
+  load one, no longer when the layer is switched on. FIT / FILL starts at
+  FIT each session (gekh, #1241).

changelog.d/1267-cctv-session-admission.md

@@ -1,3 +0,0 @@
-- Gate CCTV HLS media requests before session work, bind leases to the direct
-  peer, and bound per-peer leases across shared sessions (asturksever, #1267).
-- Keep headful CCTV QA rendering active when its window is occluded (asturksever, #1267).

changelog.d/1283-satellite-cache-provenance.md

@@ -1,3 +0,0 @@
-- Report cached CelesTrak satellite records as stale in the Data Layers row,
-  preserving separate core and dense catalog provenance through refresh,
-  removal and lifecycle cleanup (rudycelekli, #1283).

changelog.d/1284-route-plausibility-segment.md

@@ -1,3 +0,0 @@
-- Keep aircraft route labels on the scheduled airport leg instead of accepting
-  its distant great-circle extensions, preserving generous endpoint tolerance
-  across the signed-angle branch cut (rudycelekli, #1284).

changelog.d/1286-since-note-inline.md

@@ -1,4 +0,0 @@
-- The Street Level SINCE note sits on the value's line, in its type and a
-  size smaller: with KartaView lit it reads ANY DATE (by upload date). It
-  had lost its size variable in the Street Level slim-down and rendered
-  larger than the value, on a line of its own (asturksever, #1286).

changelog.d/1287-shared-sliders.md

@@ -1,3 +0,0 @@
-- Give ordinary sliders a shared native control and consistent track, thumb,
-  value, focus and disabled styling while preserving feature behavior and
-  specialized controls (mazy1998, #1287).

changelog.d/1301-shared-segmented-selectors.md

@@ -1,5 +0,0 @@
-- Unify segmented selectors for model coverage, detection allocation, drawing
-  shape, Street View and imagery comparison while preserving their existing
-  behavior. Keep compact labels such as FILL and FLAT on one line, and let
-  collapsed Weather release space to the open rail panel. Reserve the full mode
-  button height in Recent Imagery so keyboard focus is not clipped (mazy1998, #1301).

changelog.d/945-cctv-vegvesen-kartverket-heights.md

@@ -1,17 +0,0 @@
-- Give each Statens vegvesen camera its own ground height from Kartverket's
-  keyless point-height API (CC BY 4.0) instead of one flat 150 m prior, so
-  mountain-pass cameras no longer sit hundreds of metres below the terrain
-  where neither the point-height prior nor the ground snap resolves. About 850
-  of ~855 cameras get a height; the rest keep the old prior. Requests carry 20
-  points, the most the API answers from its 1 m terrain model, eight at a
-  time; a cold lookup takes about 6–13 s. Cameras over water use the water
-  surface rather than the sea-floor depth the API returns there; for bridge
-  cameras that is still below the deck. Heights are cached for good and misses
-  for 6 h, so a refresh only asks about new or moved cameras. After a
-  failing request (a 408, 429 or 5xx, a network error, a request over 10 s or
-  an unreadable body) the lookup stops and backs off (Retry-After, else
-  30 min, longer than the refresh). The lane waits at most 12 s from its
-  start, and only on a cold cache; a slower first lookup leaves the cameras it
-  had not reached on the flat prior until the next 15-minute refresh, and
-  keeps filling the cache meanwhile.
-  `CCTV_VEGVESEN_HEIGHTS=0` turns it off. Follow-up to #929 (trygvehhh, #945).

changelog.d/990-hong-kong-cctv.md

@@ -1,7 +0,0 @@
-- Add Hong Kong Transport Department traffic snapshot cameras as a keyless CCTV
-  source pack: the public DATA.GOV.HK English locations XML, frames pinned to
-  `tdcctv.data.one.gov.hk`, with DATA.GOV.HK Terms of Use attribution. By
-  default nearly the full TD catalog (~1,013 cameras; cap 1,100) loads,
-  prioritized across Hong Kong Island, Kowloon and the New Territories. Headings
-  use the shared id-hash fallback at low confidence. `CCTV_HK_MAX_SOURCES` sets
-  the cap (8–1,200) and `CCTV_HK_ENABLED=0` turns the pack off (JCY2515, #990).

docs/CURRENT-STATE.md

@@ -1,21 +1,5 @@
 # God's Eye View Current State
 
-Analyst region queries resolve unique Natural Earth names offline without
-geocoding, so Gold Coast and Ivory Coast name the West African natural regions.
-Duplicate names require a geocoded containment anchor; when several entries for
-the same name contain that anchor, the lookup stays unresolved rather than
-selecting the largest entry. Natural outlines try exact names before aliases and
-broader suffix variants. Follow-ups retain boundary provenance, and cancelled
-lookups preserve the previous analyst cohort and boundary source. Navigation
-search keeps a successful geocode, with no search or view-based region recovery.
-
-CCTV live-media requests are same-site gated before catalog or media work, including
-HLS renewal, segment reads and DELETE cleanup. HLS leases belong to their socket
-peer (IPv4-mapped IPv6 is normalized), with eight leases per peer across the two
-global sessions. Peers behind the same NAT share that budget; this is resource
-admission, not authentication. Native same-origin video and range requests remain
-supported.
-
 Shared distance checks use `src/geoDistance.js` with `{ lat, lon }` points and
 the IUGG mean spherical Earth radius, 6371.0088 km. `greatCircleKm` is
 canonical; `greatCircleMeters` is its exact metre conversion. Missing,
@@ -640,14 +624,6 @@ The standalone app offers OpenAI and Gemini Live through an explicit provider ch
 
 Voice action argument schemas have one portable owner under `src/voice/actionSchemas.js`. The Realtime provider builds 30 tools using separate description-only metadata. Description customization cannot replace argument types, enum values or required fields.
 
-`createGevActionRunner` routes `control_cctv` enable/disable through the shared
-layer visibility lifecycle. Results distinguish successful changes from
-manager-reported failures or cancellation and report enabled state and lifecycle
-uncertainty. A caller-supplied abort signal reaches the manager; a late abort
-preserves an already committed change. Missing-layer errors and other CCTV
-actions retain their existing behavior. The exported `controlCctv` helper refuses direct
-enable/disable requests and directs callers to `set_layer_visibility`.
-
 `src/voice/layerManifest.js` declares each catalog layer's voice capabilities: spoken aliases, `toggle`, in-view `context`, `track`, and analyst `query` fields with type and unit, or `noQuery` with the reason. The `set_layer_visibility`, `show_data_layers_menu`, `get_entity_context` and `analyst_query` layer enums, the runner's alias table and the analyst field hints are generated from it. `src/voice/layerManifest.test.mjs` fails when a catalog layer is neither listed nor named in `VOICE_OFF_LAYERS` (today only the two scene-driven Bhote Koshi layers). Global Context is listed with `toggle: false`; `set_context_mode` reaches it. `set_panel_open` also opens `weather-panel` and `recent-imagery-panel`.
 
 Portable source exports provide Radio Browser station normalization, CCTV feed types and regional records independently of HTTP middleware. Radio normalization accepts an explicit URL policy; the standalone directory retains its existing HTTPS rules. Tile coordinate validation accepts explicit zoom bounds with unchanged traffic defaults. Cache, request and rendering owners remain unchanged.
@@ -841,11 +817,7 @@ Viewport limits, saturation retry, placement, query caps and controls are retain
 
 Satellite and mission layers expose separate factories through `./layers/satellites`
 and `./layers/launches`. Each owns its catalog, render state, tracking, interaction
-and teardown. Satellite core and dense catalogs retain upstream stale-cache
-provenance only for admitted records; duplicate or invalid entries cannot taint
-a fresh winning record. Dense removal clears only its own provenance, and a
-fresh core rebuild or lifecycle reset replaces the corresponding ownership.
-Source adapters retain the existing CelesTrak and Launch Library
+and teardown. Source adapters retain the existing CelesTrak and Launch Library
 endpoints; standalone entries provide scene services and the satellite dependency.
 The mission factory separates paths, replay, camera, panel, overlays and placement.
 Launch Library pad coordinates retain unknown values: missing fields use the
@@ -1120,26 +1092,6 @@ The images are periodically updated road-condition photographs, not continuous
 video; camera poses use the existing low-confidence heading prior.
 `CCTV_LITHUANIA_MAX_SOURCES` sets its cap (default 400, bounded to 1–1000).
 
-## Taiwan CCTV source pack
-
-The CCTV catalog includes Taiwan national freeway cameras from the Freeway
-Bureau, MOTC. One keyless request reads the daily MOTC 2.0 `CCTV.xml` table
-(~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
 
 The CCTV catalog adds DriveBC highway cameras for British Columbia alongside the
@@ -1231,32 +1183,6 @@ The application supplies actions and retains effect settings, restore claims and
 rendering. Native keyboard editing, model modes and current defaults are preserved.
 Destroying the UI removes these listeners before asynchronous teardown.
 
-Ordinary sliders share the native range component in `ui/slider.js` and the
-`gev-quantitative-slider` surface in `ui/styles/slider.css`. Display, shader
-parameters, volume, replay speed, weather settings/history, imagery opacity and
-Street View's date filter use the same rail, thumb, value styling, keyboard focus and disabled state.
-Generated controls use `createSlider`; static templates apply the same class.
-Feature owners retain bounds, steps, formatted values, input/change timing and
-listener cleanup. The radio tuning dial, imagery comparison divider and event
-comparison/progression controls keep their specialized presentation and behavior.
-
-## Segmented selectors
-
-Segmented selectors use the controlled DOM adapter in `ui/segmentedControl.js`
-and the shared `gev-segmented` / `gev-segment` surface. Model coverage, label
-allocation, drawing shape, Street View fit/panorama filters and imagery mode keep
-their feature-owned values, actions and persistence. Painting a restored value
-does not emit a change or move focus. Existing keyboard policies remain explicit:
-Street View uses arrows/Home/End with one tab stop, imagery mode uses arrows from
-its controlled selection, and Display keeps its existing native button behavior.
-Pure value navigation is separate from DOM rendering for reuse by a future view.
-Segments keep their word minimum width: compact inline groups such as FIT/FILL
-and ALL/360°/FLAT must not break short labels mid-word. Collapsed Weather follows
-the same exclusive-rail hiding rule as the other readouts.
-The imagery mode row reserves 26px for the 24px buttons and group borders so
-the complete button and inset keyboard-focus outline remain visible.
-Browser acceptance: `QA_BASE_URL=http://127.0.0.1:4173 node scripts/qa-segmented-controls.mjs`.
-
 ## Application shortcuts and shader parameter controls
 
 `ui/input` supplies the bubbling application shortcut listener and generated
@@ -3059,13 +2985,6 @@ down | auth-failed` (plus the unchanged `missing-key`/`unsupported`) with
 >   position getter reads only `_trackedDisplayCached`, the same authoritative
 >   Cartesian already consumed by the tracked visual and camera, and never
 >   advances dead reckoning from the host frame.
-> - **Scheduled route plausibility:** Aircraft route labels and selected-route
->   context reject the distant backwards, forwards and antipodal extensions of
->   an airport pair's great circle. The existing 130 km endpoint admission and
->   200 km cross-track tolerance remain; a projected fix outside the finite
->   origin-to-destination minor arc also has a generous 200 km extension at
->   either end. Missing coordinates and coincident or antipodal endpoint pairs
->   retain their loose, unjudgeable behavior; vertical-trend checks are unchanged.
 > - **Aircraft label convention (both flight layers, 2026-08-18):** every civil
 >   and military label surface resolves **callsign → registration → icao24**
 >   (`_contactLabel()` in `flights.js`; the same chain inline in
@@ -3528,7 +3447,7 @@ its criteria cannot be silently ignored.
 | 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                                                                             |
 | 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) + 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) + King County (WA) Open Data + WSDOT (WA) Open Data + NYC DOT TMC (opt-in) + City of Toronto RESCU + Catalonia (Servei Català de Trànsit) + FL511 (FL, opt-in) + 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                                                          |
 | 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                                                                               |
@@ -3617,7 +3536,13 @@ Mapillary token, Street View on Google 3D with a Google key), the layer
 reports it (`keyAlternatives`), and the panel's KEY REQUIRED, its coverage
 line and the layer row's tooltip say to light it. The
 viewer sits under the header with EXPAND, FIT/FILL and close above the
-image. SINCE is a stepped slider whose readout names the cut-off date.
+image; FIT/FILL starts at FIT each session. IMAGERY and FIT/FILL are rows of
+toggle buttons (`aria-pressed`), each its own tab stop. SINCE is a select of
+the nine windows; a link's day count between them gets its own option, and
+the tooltip names the cut-off date. The panel opens by itself only when a
+photo opens, or a click fails to open one or to load its sequence (the
+result, or its error, would otherwise be out of sight), never when the layer
+is switched on.
 
 MapillaryJS loads on the first photo. Opening one frames it with a single
 camera flight through the application's deferred navigation (`begin` /
@@ -3626,7 +3551,8 @@ if newer navigation took the camera while the photo loaded; closing the photo
 cancels it. EXPAND is the browser's Fullscreen API on the viewer element; on
 iPhone, which has no element fullscreen, the viewer opens as a top-layer
 popover instead (hidden where neither API exists). Clean View, recording and
-the cockpit take an expanded photo out of full screen. At phone width the
+the cockpit take an expanded photo out of full screen: the shell calls the
+panel's `shrinkViewer()` as it enters them. At phone width the
 viewer height comes from the rail band so the whole photo fits.
 
 Providers implement the contract in `src/layers/streetLevel/registry.js`. The
@@ -3718,8 +3644,8 @@ lookup asks the photo API for the projection (`SPHERE`/`PLANE`; it ignores
 `fieldOfView`) and upload date and checks each answer the same way (when
 photos are near but none passes, the panel says so), and the cones pass on
 each photo's projection and upload date. The provider declares
-`sinceBasis: 'upload'`, so while it is lit the panel shows "(by
-upload date)" beside the SINCE value, as ANY DATE (by upload date) (`sinceNote` in the UI state). Tiles come uncompressed and
+`sinceBasis: 'upload'`, so while it is lit the panel shows "KartaView: by
+upload date" under the SINCE select (`sinceNote` in the UI state). Tiles come uncompressed and
 uncacheable, so the last 24 decoded tiles are kept for 10 minutes while
 KartaView is lit (`createTileCache`, dropped when it is switched off); one
 that does not answer in 20 s is asked once more, and one that is not a line
@@ -4513,10 +4439,8 @@ silently demoting every later lookup for the session.
   default 36 → 250, hard bound 300), filtered to `camera_status === TURNED_ON` (~815 live of
   1,003 rows). City packs (2026-07-04): Caltrans (districts 4/7/11/3 — SF, LA, San Diego,
   Sacramento; cap 300) and TfL London JamCams (cap 250) join Austin (cap 250) as keyless default
-  sources. Ontario 511 (2026-09-12) adds highway cameras including Kitchener-area routes
-  (cap 1,000, all enabled rows from the current ~944-camera catalog). The 511on.ca API now
-  requires a developer key, so the pack needs `ONTARIO_511_API_KEY` and is skipped without one
-  (#1228). All sources are RAW PRIOR
+  sources. Ontario 511 (2026-09-12) adds keyless highway cameras including Kitchener-area routes
+  (cap 1,000, all enabled rows from the current ~944-camera catalog). All sources are RAW PRIOR
   poses, and the layer is stills-first.
   sources. Fintraffic Finland road weather cameras (2026-09-13; cap 300, `CCTV_FINTRAFFIC_MAX_SOURCES`,
   kill switch `CCTV_FINTRAFFIC_ENABLED=0`) are the fourth pack: one keyless GeoJSON station list
@@ -4524,18 +4448,7 @@ silently demoting every later lookup for the session.
   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
   across packs, so a lower global cap thins every region instead of starving the last pack.
-  ~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
-  pack, so only the very first load waits for the slowest pack (a live first load took about
-  22 s, and is bounded by Tarktee's 30 s). A background refresh that fails or comes back
-  empty keeps the old catalog and is retried after another 15 minutes, not on the next
-  request. Estonia's Tarktee DATEX feeds, which answer in 2 to 16.6 s, get 30 s
-  (`TARKTEE_FETCH_TIMEOUT_MS`) where other packs get 15 s.
-  Both Tarktee XML catalogs refuse redirects and have a 4 MiB per-document
-  limit, enforced against declared length and streamed bytes. A rejected fetch,
-  unsuccessful response, or body-read failure releases both available response
-  bodies; read failures also cancel an active sibling reader. Cameras sharing
-  an image number are deduplicated before the Tarktee pack cap is applied.
+  ~1,100 cameras total, all RAW PRIOR poses, stills-first.
 - **CCTV v3 UX — viewshed + calibration gizmo** (built 2026-07-05 and field
   validated 2026-07-21): the COVERAGE toggle is a
   tri-state cycle `OFF → ON → VIEWSHED`; viewshed mode renders each visible camera's frustum
@@ -4852,7 +4765,7 @@ and unreachable upstream (502/504) separately from road geometry.
   - **Every selectable layer writes that one slot** (2026-08-21). The tracking layers — flights, military, satellites — publish selection on their own awareness lane (`gev:awareness-subject-selected`, consumed by the readout card and the Contacts panel) and for the life of the voice tools never wrote the shared slot, so `scope:'selected'` silently answered `in_view` with a contact plainly selected on screen. They now call `selectTrackedSubjectContext` / `refreshTrackedSubjectContext` / `clearTrackedSubjectContext` (`src/data/contextStore.js`) on select / poll / deselect. **Invariants: (a)** that write path must NOT dispatch `gev:entity-selected` — tracking layers already own an event lane and a second one makes two surfaces fight over one subject; **(b)** exactly one record per tracking layer, because a frozen snapshot of a moved contact must never reach the visible-entity scan; **(c)** precedence is recency, not layer — one slot, last selection wins, so clicking an overlay entity supersedes a tracked plane as the voice subject while the plane stays tracked. Satellites refresh on the 1 s propagation beat, not per frame.
   - **Context-mode vocabulary is symmetric** (2026-08-21). `set_context_mode` accepts `contacts`; the internal id is `flights`. Every model-readable field (`mode`, `entering`, `priorMode`, nested `context`/`contextRollback`, and the transition diagnostic text) is reported in the accepted vocabulary, with the internal id preserved as `<field>Internal`; an absent secondary mode stays `null` rather than claiming to be `off`. Mapping lives in `src/contextModePolicy.js` so UI text and voice payloads cannot drift. Reporting the internal id made the model read `mode:'flights'` as "Contacts is off" and refuse to answer from the `contactsWindow` counts in the same payload.
   - **Analyst → track handoff carries a key, not just a label** (2026-08-21). `analyst_query` items include `icao24`/`mmsi` alongside the display `id`, and contact lookup uses the shared tiered ranking in `src/data/contactMatch.js`: hex exact → callsign exact → registration exact → callsign prefix → registration prefix → callsign substring → registration substring. The tiers keep an exact callsign ahead of a colliding registration regardless of feed order, and registrations compare separator-insensitively (`G-ABCD`/`GABCD`, `05-8152`/`058152`, `N123AB`/`N-123AB`).
-  - **A typed command supersedes the turn it interrupts** (2026-08-21; hardened 2026-10-17). `sendTextCommand` defers its `response.create` behind an active response instead of colliding with it, marks that response superseded so a late function call from it is refused rather than dispatched, and drops the old turn's queued follow-up. A refused call is still ANSWERED — a terminal `{ok:false, superseded:true}` `function_call_output` — because an unanswered `function_call` strands a pending call and deadlocks the model; the refusal creates no response of its own. A burst of typed commands coalesces into one response while keeping both conversation items. If the local channel rejects the user item, that command requests no response and adds no deferred answer; earlier accepted deferred input remains queued. Interruption and pointer preparation still happen before the send attempt.
+  - **A typed command supersedes the turn it interrupts** (2026-08-21). `sendTextCommand` defers its `response.create` behind an active response instead of colliding with it, marks that response superseded so a late function call from it is refused rather than dispatched, and drops the old turn's queued follow-up. A refused call is still ANSWERED — a terminal `{ok:false, superseded:true}` `function_call_output` — because an unanswered `function_call` strands a pending call and deadlocks the model; the refusal creates no response of its own. A burst of typed commands coalesces into one response while keeping both conversation items.
   - **Subject reconciliation across satellite catalog rebuilds** (2026-08-21). A dense↔core toggle or TLE refresh clears and repopulates the catalog, so the published subject is re-resolved against the new satrec; a subject that did NOT survive releases the slot. The per-frame refresh cannot do this itself — `_getTrackedFramePosition` returns early once the satellite has no catalog entry — so the reconcile runs at rebuild completion. An empty catalog is a rebuild in flight, not a disappearance.
   - **One aircraft-proximity snapshot** (2026-08-22; hardened 2026-09-30). `collectAircraftProximityWindow` (`src/data/militaryAwareness.js`) computes the Contacts panel cohort once. The voice analyst reads the exact retained snapshot and evaluation timestamp instead of re-scanning live layers, so the panel readout and spoken count for one centre cannot cross snapshots. **Invariant: do not re-derive a proximity count anywhere else.** Each layer retains 20,000 rows and samples one row beyond the cap; a saturated cohort reports `complete:false`, `truncated:true`, and is spoken as a lower bound. They diverged before because the panel read live billboard positions while the analyst used last-fix coordinates over a 2,000-record slice — 111 on screen, 15 spoken. Explicit regions, arbitrary points, and a radius different from the panel radius deliberately keep the general record engine. Entity-centred results carry `window: {engine:'contacts-window', centeredOn, radiusKm, flights, military, aircraft, complete, evaluatedAt}`.
   - **Centre precedence for nearby asks**: explicit place in the question > Contacts subject (a selected non-contact entity never silently becomes the centre) > an entity the user names > the current view, said aloud. Contacts active with no subject uses the view rather than reading an empty panel.

scripts/format-scope.json

@@ -112,8 +112,6 @@
   "server/providers/cctv/catalog.js",
   "server/providers/cctv/lithuania.js",
   "src/data/cctvLithuania.test.mjs",
-  "server/providers/cctv/taiwan.js",
-  "src/data/cctvTaiwan.test.mjs",
   "server/providers/cctv/constants.js",
   "server/providers/cctv/media.js",
   "server/providers/cctv/normalize.js",
@@ -190,10 +188,7 @@
   "src/ui/visualInput.js",
   "src/ui/visualInput.test.mjs",
   "scripts/qa-visual-input.mjs",
-  "scripts/qa-segmented-controls.mjs",
   "src/ui/displayControls.js",
-  "src/ui/segmentedControl.test.mjs",
-  "src/ui/styles/segmented-control.css",
   "src/ui/displayControls.test.mjs",
   "src/ui/cameraOrientationControls.js",
   "src/ui/cameraOrientationControls.test.mjs",
@@ -304,7 +299,6 @@
   "src/ui/styles/status.css",
   "src/ui/styles/layers.css",
   "src/ui/styles/controls.css",
-  "src/ui/styles/slider.css",
   "src/ui/styles/cctv.css",
   "src/ui/styles/foundation.css",
   "src/ui/styles/first-run.css",
@@ -449,7 +443,6 @@
   "src/data/satellites.js",
   "src/data/rocketLaunches.js",
   "src/layers/satellites/source.test.mjs",
-  "src/layers/satellites/stale.test.mjs",
   "src/layers/launches/source.test.mjs",
   "src/layers/launches/ingestion.test.mjs",
   "src/layers/installations/lifecycle.js",
@@ -556,7 +549,6 @@
   "src/data/cctvWarendorf.test.mjs",
   "src/data/cctvCalgary.test.mjs",
   "src/data/cctvCataloniaSource.test.mjs",
-  "src/data/cctvHk.test.mjs",
   "src/data/cctvVegvesen.test.mjs",
   "src/data/cctvNyc.test.mjs",
   "src/data/cctvNswSource.test.mjs",
@@ -1067,6 +1059,5 @@
   "scripts/assemble-changelog.mjs",
   "src/tooling/changelogFragments.test.mjs",
   "src/data/gbfsProxyRateLimit.test.mjs",
-  "src/data/routeSegment.test.mjs",
   "src/terrainHeightsBounds.test.mjs"
 ]

scripts/package-boundaries.json

@@ -187,13 +187,10 @@
     "exports": ["./server/providers/cctv"],
     "modules": [
       "server/providers/cctv.js",
-      "server/providers/common/same-site.js",
-      "src/localRequestGate.mjs",
       "server/providers/cctv/cap.js",
       "server/providers/cctv/groundHeights.js",
       "server/providers/cctv/catalog.js",
       "server/providers/cctv/lithuania.js",
-      "server/providers/cctv/taiwan.js",
       "server/providers/cctv/constants.js",
       "server/providers/cctv/media.js",
       "server/providers/cctv/normalize.js",
@@ -424,7 +421,6 @@
       "src/ui/visualInput.js",
       "src/ui/applicationShortcuts.js",
       "src/ui/styleParameters.js",
-      "src/ui/slider.js",
       "src/i18n/index.js",
       "src/i18n/locale.js",
       "src/i18n/locales/es.json",
@@ -434,7 +430,7 @@
   },
   "display-controls": {
     "exports": ["./ui/display"],
-    "modules": ["src/ui/displayControls.js", "src/ui/segmentedControl.js"],
+    "modules": ["src/ui/displayControls.js"],
     "external": []
   },
   "visual-effects": {
@@ -483,7 +479,6 @@
       "src/ui/weatherPanel.js",
       "src/ui/railCards.js",
       "src/ui/railCardBlocks.js",
-      "src/ui/slider.js",
       "src/ui/chipGroup.js",
       "src/ui/rowList.js",
       "src/ui/railTimeline.js",
@@ -705,7 +700,6 @@
       "src/ui/contextSubscriptions.js",
       "src/ui/contextTransactions.js",
       "src/ui/displayControls.js",
-      "src/ui/segmentedControl.js",
       "src/ui/effects.js",
       "src/ui/frameRateMonitor.js",
       "src/ui/layerPanel.js",
@@ -744,7 +738,6 @@
       "src/ui/shellElements.js",
       "src/ui/shellFeedback.js",
       "src/ui/styleParameters.js",
-      "src/ui/slider.js",
       "src/ui/surfaceKeyboard.js",
       "src/ui/uiLifetime.js",
       "src/ui/visualEffects.js",
@@ -2182,7 +2175,6 @@
       "src/ui/contextSubscriptions.js",
       "src/ui/contextTransactions.js",
       "src/ui/displayControls.js",
-      "src/ui/segmentedControl.js",
       "src/ui/effects.js",
       "src/ui/frameRateMonitor.js",
       "src/ui/layerPanel.js",
@@ -2221,7 +2213,6 @@
       "src/ui/shellElements.js",
       "src/ui/shellFeedback.js",
       "src/ui/styleParameters.js",
-      "src/ui/slider.js",
       "src/ui/surfaceKeyboard.js",
       "src/ui/uiLifetime.js",
       "src/ui/visualEffects.js",
@@ -3215,13 +3206,11 @@
       "src/ui/applicationShortcuts.js",
       "src/ui/effects.js",
       "src/ui/styleParameters.js",
-      "src/ui/slider.js",
       "src/ui/uiLifetime.js",
       "src/ui/visualEffects.js",
       "src/ui/visualInput.js",
       "src/ui/visualPresets.js",
       "src/ui/visualSettings.js",
-      "src/ui/segmentedControl.js",
       "src/i18n/index.js",
       "src/i18n/locale.js",
       "src/i18n/locales/es.json",

scripts/precompute-cctv-heights.mjs

@@ -326,10 +326,8 @@ async function main() {
       'src/data/local_data/cctv_ground_heights/cctv_ground_heights.json',
   );
   let sidecar = await loadSidecar(output);
-  // A cold catalog waits for its slowest pack (Tarktee gets 30 s), so allow
-  // more than that.
   const response = await fetch(`${base}/api/cctv/sources`, {
-    signal: AbortSignal.timeout(60_000),
+    signal: AbortSignal.timeout(30_000),
   });
   if (!response.ok) throw new Error(`Catalog HTTP ${response.status}`);
   const catalog = await response.json();

scripts/qa-cctv-v2.mjs

@@ -11,10 +11,8 @@
  *      exactly once per camera ACTIVATION (the §9.1 obstruction probe) and
  *      never again in steady state; shared mesh-floor sampling fires at most
  *      once per coarse cell during the staggered geometry-load drain, and
- *      actually COMPLETES once tiles load in photoreal mode (>=1 real sample
- *      — the ceiling alone would pass trivially at Δ=0 if the snap never
- *      finished). Globe mode instead proves the rendered mount uses a real
- *      terrain height with zero mesh samples. Sampling
+ *      actually COMPLETES once tiles load (>=1 real sample — the
+ *      ceiling alone would pass trivially at Δ=0 if the snap never finished),
  *      stays flat while idle, and stays flat for non-positional pose edits.
  *   2. Geometry contract: the 5-polyline frustum wireframe + far-cap plane
  *      exist for the active camera, the plane's corners coincide with the
@@ -141,56 +139,6 @@ function record(name, ok, detail) {
 
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
-// Each page.evaluate is bounded by puppeteer's `protocolTimeout` (default
-// 180s). Waits never come close: they poll from Node (below). The headroom is
-// for the few long evaluates, such as enabling the full ~3,700-camera catalog
-// on a real GPU, and matches the other qa-*.mjs harnesses.
-const PROTOCOL_TIMEOUT_MS = 300_000;
-
-/**
- * Polls an in-page predicate from Node, one short page.evaluate per tick,
- * until it holds or the budget runs out. Used instead of page.waitForFunction
- * for two reasons: its default rAF polling stops in a minimised or hidden
- * headful window (timers keep running, rAF does not), and its result is one
- * CDP call that protocolTimeout cuts off, while the headful drain budget
- * reaches ~50 minutes. A predicate that throws fails the run instead of
- * silently spending the budget.
- * @param {import('puppeteer').Page} page
- * @param {Function} predicate - In-page predicate.
- * @param {object} opts
- * @param {number} opts.timeoutMs - Overall budget.
- * @param {number} [opts.intervalMs=250] - Delay between checks.
- * @param {unknown[]} [opts.args=[]] - Arguments passed to the predicate.
- *   The predicate must return a boolean: its result crosses CDP by value.
- * @returns {Promise<boolean>} True if the predicate held within the budget.
- */
-async function waitForPredicate(
-  page,
-  predicate,
-  { timeoutMs, intervalMs = 250, args = [] },
-) {
-  // performance.now() is monotonic and doesn't advance while the machine
-  // sleeps, so neither a clock change nor a laptop sleep eats the budget.
-  const deadline = performance.now() + timeoutMs;
-  for (;;) {
-    try {
-      if (await page.evaluate(predicate, ...args)) return true;
-    } catch (err) {
-      // A navigation or Vite reload replaces the execution context: poll again.
-      if (
-        !/Execution context was destroyed|Cannot find context/.test(
-          err?.message ?? '',
-        )
-      ) {
-        throw err;
-      }
-    }
-    const remaining = deadline - performance.now();
-    if (remaining <= 0) return false;
-    await sleep(Math.min(intervalMs, remaining));
-  }
-}
-
 // SwiftShader can spend tens of seconds servicing the hover drillPick emitted
 // by page.mouse.move(), before the LEFT_DOWN under test even runs. Position the
 // pointer while ADJUST is disabled, then re-enable it and explicitly render a
@@ -207,58 +155,29 @@ async function positionPointerForGizmoDrag(page, point, frameCount = 3) {
     gev.dataManager.layers
       .get('cctv')
       .module.setParams({ calibrationMode: true });
-    return (await window.__qaRenderFrames(count, 5000)) >= count;
-  }, frameCount);
-}
-
-/**
- * Saves a screenshot for human review. These are never a gate, so a capture
- * that fails (for example when the renderer stalls in a hidden headful window)
- * is logged instead of ending the run.
- * @param {import('puppeteer').Page} page
- * @param {string} file
- * @param {string} label
- */
-async function saveReviewShot(page, file, label) {
-  try {
-    await page.screenshot({ path: file });
-    console.log(`  screenshot (${label}) → ${path.relative(REPO_ROOT, file)}`);
-  } catch (err) {
-    console.warn(
-      `  screenshot skipped (${label}): ${path.relative(REPO_ROOT, file)}: ${err?.message ?? err}`,
-    );
-  }
-}
-
-/**
- * Installs window.__qaRenderFrames(count, capMs) in the page: requests renders
- * until `count` frames have passed scene.postRender or capMs runs out, and
- * resolves with the number of frames rendered. The cap keeps a stalled
- * renderer (headful window asleep or hidden) from hanging the CDP call.
- * @param {import('puppeteer').Page} page
- */
-function installRenderFramesHelper(page) {
-  return page.evaluate(() => {
-    window.__qaRenderFrames = (count, capMs) =>
-      new Promise((resolve) => {
-        const scene = window.__godsEyeView.viewer.scene;
-        let frames = 0;
-        const finish = () => {
-          clearTimeout(timer);
-          remove();
-          resolve(frames);
-        };
-        const remove = scene.postRender.addEventListener(() => {
-          if (++frames >= count) {
-            finish();
-            return;
-          }
-          scene.requestRender();
-        });
-        const timer = setTimeout(finish, capMs);
+    const scene = gev.viewer.scene;
+    let rendered = 0;
+    return new Promise((resolve) => {
+      let settled = false;
+      const finish = (complete) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        remove();
+        resolve(complete);
+      };
+      const remove = scene.postRender.addEventListener(() => {
+        rendered += 1;
+        if (rendered >= count) {
+          finish(true);
+          return;
+        }
         scene.requestRender();
       });
-  });
+      const timer = setTimeout(() => finish(false), 5000);
+      scene.requestRender();
+    });
+  }, frameCount);
 }
 
 // In-page helper (stringified and re-defined inside each evaluate that needs
@@ -361,21 +280,23 @@ const BEARING_SHIFT_SRC = `
  * @returns {Promise<boolean>} True if tilesLoaded was observed within the timeout.
  */
 function waitForTilesLoaded(page, timeoutMs = 15000) {
-  return waitForPredicate(
-    page,
-    () => {
-      const scene = window.__godsEyeView.viewer.scene;
-      const prims = scene.primitives;
-      for (let i = 0; i < prims.length; i++) {
-        const p = prims.get(i);
-        if (p && p.constructor && p.constructor.name === 'Cesium3DTileset') {
-          return p.tilesLoaded === true;
+  return page
+    .waitForFunction(
+      () => {
+        const scene = window.__godsEyeView.viewer.scene;
+        const prims = scene.primitives;
+        for (let i = 0; i < prims.length; i++) {
+          const p = prims.get(i);
+          if (p && p.constructor && p.constructor.name === 'Cesium3DTileset') {
+            return p.tilesLoaded === true;
+          }
         }
-      }
-      return true; // no tileset in the scene — nothing to wait for
-    },
-    { timeoutMs },
-  );
+        return true; // no tileset in the scene — nothing to wait for
+      },
+      { timeout: timeoutMs },
+    )
+    .then(() => true)
+    .catch(() => false);
 }
 
 /**
@@ -443,10 +364,6 @@ async function main() {
   const chromeExecutable = findChromeExecutable();
   const browser = await puppeteer.launch({
     headless: HEADFUL ? false : 'new',
-    protocolTimeout: PROTOCOL_TIMEOUT_MS,
-    // Talk CDP over a pipe, so no debugging port stays open on localhost for
-    // the length of a headful run.
-    pipe: true,
     ...(chromeExecutable ? { executablePath: chromeExecutable } : {}),
     args: [
       '--no-sandbox',
@@ -454,7 +371,6 @@ async function main() {
       ...(HEADFUL ? [] : ['--use-gl=angle', '--use-angle=swiftshader']),
       '--disable-dev-shm-usage',
       '--disable-web-security',
-      '--disable-backgrounding-occluded-windows',
       '--disable-background-timer-throttling',
       '--disable-renderer-backgrounding',
       '--window-size=1280,800',
@@ -481,18 +397,13 @@ async function main() {
     });
     console.log('Loading app...');
     await page.goto(APP_URL, { waitUntil: 'domcontentloaded', timeout: 60000 });
-    const appReady = await waitForPredicate(
-      page,
+    await page.waitForFunction(
       () =>
-        Boolean(
-          window.__godsEyeView &&
-          window.__godsEyeView.viewer &&
-          window.__godsEyeView.dataManager,
-        ),
-      { timeoutMs: 60000 },
+        window.__godsEyeView &&
+        window.__godsEyeView.viewer &&
+        window.__godsEyeView.dataManager,
+      { timeout: 60000 },
     );
-    if (!appReady) throw new Error('app did not initialise within 60s');
-    await installRenderFramesHelper(page);
     // Let the initial fly-to Austin and first tiles settle.
     await sleep(4000);
 
@@ -564,15 +475,18 @@ async function main() {
     console.log(
       `Waiting for geometry-load queue to drain (N=${camCount}, budget ${Math.round(drainBudgetMs / 1000)}s)...`,
     );
-    const drained = await waitForPredicate(
-      page,
-      () => {
-        const mod = window.__godsEyeView.dataManager.layers.get('cctv').module;
-        const ui = mod.getUIState();
-        return Boolean(ui.loading) && ui.loading.active === false;
-      },
-      { timeoutMs: drainBudgetMs, intervalMs: 1000 },
-    );
+    const drained = await page
+      .waitForFunction(
+        () => {
+          const mod =
+            window.__godsEyeView.dataManager.layers.get('cctv').module;
+          const ui = mod.getUIState();
+          return ui.loading && ui.loading.active === false;
+        },
+        { timeout: drainBudgetMs },
+      )
+      .then(() => true)
+      .catch(() => false);
     record(
       `geometry-load queue drains within ${Math.round(drainBudgetMs / 1000)}s (N=${camCount})`,
       drained ? true : HEADFUL ? false : null,
@@ -661,87 +575,27 @@ async function main() {
     // (existence, not just ceiling). The wait below tolerates the update-tick
     // latency of the completion pass (update interval is 10s).
     // -----------------------------------------------------------------------
-    const globeMode = await page.evaluate(
-      () => window.__godsEyeView.viewer.scene.globe?.show !== false,
-    );
-    if (globeMode) {
-      // Globe stacks intentionally perform no scene.sampleHeight query.
-      // Require independently fetched DEM heights and the actual rendered
-      // mount, so a catalog/geoid fallback cannot turn zero samples into a pass.
-      console.log(
-        'Checking terrain-globe completion against live DEM heights...',
-      );
-      const terrain = await page.evaluate(async () => {
-        const camera = window.__godsEyeView.dataManager.layers
-          .get('cctv')
-          .module.getUIState().activeCamera;
-        const exact = `${camera.lon.toFixed(5)},${camera.lat.toFixed(5)}`;
-        const cell = `${camera.lon.toFixed(3)},${camera.lat.toFixed(3)}`;
-        const response = await fetch(
-          `/api/terrain/heights?points=${encodeURIComponent(`${exact};${cell}`)}`,
-          { signal: AbortSignal.timeout(30000) },
-        );
-        const body = await response.json();
-        return { ok: response.ok, results: body.results };
-      });
-      const heights = terrain.results?.map((result) => result?.ellipsoid);
-      const terrainReady =
-        terrain.ok && heights?.length === 2 && heights.every(Number.isFinite);
-      const mountResolved =
-        terrainReady &&
-        (await waitForPredicate(
-          page,
-          (expected, base) => {
-            const { viewer, dataManager } = window.__godsEyeView;
-            const camera = dataManager.layers
-              .get('cctv')
-              .module.getUIState().activeCamera;
-            const ray = viewer.entities.getById(`cctv-${camera.id}-ray-tl`);
-            const mount = ray?.polyline?.positions.getValue(
-              viewer.clock.currentTime,
-            )?.[0];
-            const height =
-              mount &&
-              viewer.scene.globe.ellipsoid.cartesianToCartographic(mount)
-                .height;
-            return (
-              Number.isFinite(camera.groundPriorM) &&
-              Math.abs(camera.groundPriorM - expected[0]) < 0.01 &&
-              Number.isFinite(height) &&
-              expected.some(
-                (ground) =>
-                  Math.abs(height - ground - camera.mountHeightM) < 0.05,
-              ) &&
-              window.__qaCounters.sampleHeight === base
-            );
-          },
-          { timeoutMs: 30000, args: [heights, c0.sampleHeight] },
-        ));
-      record(
-        'terrain-globe completion uses a real DEM height at the rendered mount without mesh samples',
-        Boolean(mountResolved),
-        `terrain=${JSON.stringify(heights)}, mesh sample Δ=${(await readCounters()).sampleHeight - c0.sampleHeight}`,
-      );
-    } else {
-      console.log('Waiting for tiles + the one-shot completion pass...');
-      const tilesSeenLoaded = await waitForTilesLoaded(page, 45000);
-      let sampleFloorOk = false;
-      if (tilesSeenLoaded) {
-        sampleFloorOk = await waitForPredicate(
-          page,
+    console.log('Waiting for tiles + the one-shot completion pass...');
+    const tilesSeenLoaded = await waitForTilesLoaded(page, 45000);
+    let sampleFloorOk = false;
+    if (tilesSeenLoaded) {
+      sampleFloorOk = await page
+        .waitForFunction(
           (base) => window.__qaCounters.sampleHeight - base >= 1,
-          { timeoutMs: 30000, args: [c0.sampleHeight] },
-        );
-      }
-      const cFloor = await readCounters();
-      record(
-        '>=1 real ground sample once tilesLoaded observed (one-shot snap completed)',
-        tilesSeenLoaded ? sampleFloorOk : null,
-        tilesSeenLoaded
-          ? `total real samples since enable=${cFloor.sampleHeight - c0.sampleHeight}`
-          : 'tilesLoaded never observed within 45s — floor not assessable this run',
-      );
+          { timeout: 30000 },
+          c0.sampleHeight,
+        )
+        .then(() => true)
+        .catch(() => false);
     }
+    const cFloor = await readCounters();
+    record(
+      '>=1 real ground sample once tilesLoaded observed (one-shot snap completed)',
+      tilesSeenLoaded ? sampleFloorOk : null,
+      tilesSeenLoaded
+        ? `total real samples since enable=${cFloor.sampleHeight - c0.sampleHeight}`
+        : 'tilesLoaded never observed within 45s — floor not assessable this run',
+    );
 
     // Let the completion pass finish before the steady-state window: require
     // the sampleHeight counter quiet for 12s (> the 10s update interval, so
@@ -1504,7 +1358,18 @@ async function main() {
         },
       });
       window.__qaCctvSiblingOwner = owner;
-      const framesRendered = await window.__qaRenderFrames(3, 10000);
+      await new Promise((resolve) => {
+        let frames = 0;
+        const remove = scene.postRender.addEventListener(() => {
+          if (++frames < 3) {
+            scene.requestRender();
+            return;
+          }
+          remove();
+          resolve();
+        });
+        scene.requestRender();
+      });
       const rect = scene.canvas.getBoundingClientRect();
       const picked = scene.pick(canvasPoint);
       const pickedId = picked?.id?.id ?? picked?.id ?? null;
@@ -1517,33 +1382,26 @@ async function main() {
           typeof pickedId === 'string' ? pickedId : (pickedId?.id ?? null),
         ownerId: owner.id,
         ownsExactObject: picked?.id === owner,
-        framesRendered,
         projectionDelta: Math.hypot(
           projected.x - canvasPoint.x,
           projected.y - canvasPoint.y,
         ),
       };
     }, emptyClickPoint);
-    const siblingOwnsPick =
-      siblingTarget?.pickedId === 'qa-cctv-sibling-owner' &&
-      siblingTarget.ownsExactObject;
-    // No frame at all within the 10s cap points at a stalled renderer rather
-    // than at picking, though the harness can't rule out both. Fail it on the
-    // real-GPU sign-off path; leave it inconclusive under headless GL. A slow
-    // SwiftShader frame (1-2 of 3) still counts as a real miss.
-    const siblingRendererStalled =
-      siblingTarget && !siblingOwnsPick && siblingTarget.framesRendered === 0;
     record(
       'sibling test object owns its canvas pick',
-      !siblingTarget
-        ? null
-        : siblingOwnsPick ||
-            (siblingRendererStalled && !HEADFUL ? null : false),
       siblingTarget
-        ? `${siblingRendererStalled ? 'renderer stalled: ' : ''}frames=${siblingTarget.framesRendered}/3 picked=${siblingTarget.pickedId} exactOwner=${siblingTarget.ownsExactObject} projectionΔ=${siblingTarget.projectionDelta}`
+        ? siblingTarget.pickedId === 'qa-cctv-sibling-owner' &&
+            siblingTarget.ownsExactObject
+        : null,
+      siblingTarget
+        ? `picked=${siblingTarget.pickedId} exactOwner=${siblingTarget.ownsExactObject} projectionΔ=${siblingTarget.projectionDelta}`
         : 'no previously verified empty canvas ray was available',
     );
-    if (siblingOwnsPick) {
+    if (
+      siblingTarget?.pickedId === 'qa-cctv-sibling-owner' &&
+      siblingTarget.ownsExactObject
+    ) {
       await page.mouse.click(siblingTarget.x, siblingTarget.y);
       await sleep(250);
     }
@@ -1568,7 +1426,8 @@ async function main() {
     });
     record(
       'sibling canvas click passes through without CCTV selection or deselection',
-      siblingOwnsPick
+      siblingTarget?.pickedId === 'qa-cctv-sibling-owner' &&
+        siblingTarget.ownsExactObject
         ? siblingClick.activeId === clickEvidenceSetup.activeId &&
             siblingClick.transitions === siblingClick.baselineTransitions &&
             siblingClick.focusEvents === 0 &&
@@ -1767,7 +1626,10 @@ async function main() {
     );
 
     const viewshedShot = path.join(SHOTS_DIR, 'cctv-v3-viewshed.png');
-    await saveReviewShot(page, viewshedShot, 'visual review only');
+    await page.screenshot({ path: viewshedShot });
+    console.log(
+      `  screenshot (visual review only) → ${path.relative(REPO_ROOT, viewshedShot)}`,
+    );
 
     // =========================================================================
     // Group 7: calibration gizmo (v3 design §3c — ADJUST mode + drag)
@@ -2101,7 +1963,10 @@ async function main() {
     // -----------------------------------------------------------------------
     await sleep(1000);
     const shot = path.join(SHOTS_DIR, 'cctv-v2-active.png');
-    await saveReviewShot(page, shot, 'visual review only, not a gate');
+    await page.screenshot({ path: shot });
+    console.log(
+      `  screenshot (visual review only, not a gate) → ${path.relative(REPO_ROOT, shot)}`,
+    );
 
     // No console errors during the whole exercise.
     record(

scripts/qa-segmented-controls.mjs

@@ -1,322 +0,0 @@
-#!/usr/bin/env node
-/** Run against a dev server or built preview with QA_BASE_URL (default :4179). */
-import fs from 'node:fs';
-import puppeteer from 'puppeteer';
-
-const browser = await puppeteer.launch({
-  executablePath:
-    process.env.PUPPETEER_EXECUTABLE_PATH || (await puppeteer.executablePath()),
-  headless: true,
-  args: ['--use-gl=angle', '--use-angle=swiftshader'],
-});
-const page = await browser.newPage();
-const errors = [];
-const failures = [];
-page.on('pageerror', (error) => errors.push(error.message));
-const check = (name, passed, detail = '') => {
-  console.log(
-    `[${passed ? 'PASS' : 'FAIL'}] ${name}${detail ? ` — ${detail}` : ''}`,
-  );
-  if (!passed) failures.push(name);
-};
-const base = process.env.QA_BASE_URL || 'http://localhost:4179';
-const shots = process.env.QA_SHOTS_DIR || 'qa-shots/segmented-controls';
-fs.mkdirSync(shots, { recursive: true });
-
-try {
-  await page.setViewport({ width: 1440, height: 900 });
-  await page.goto(`${base}/?welcome=0`, { waitUntil: 'domcontentloaded' });
-  await page.waitForFunction(
-    () => window.__godsEyeView?.styleManager?._applicationShortcuts,
-    { timeout: 60000 },
-  );
-  await page.waitForFunction(
-    () =>
-      document.getElementById('loading-screen')?.classList.contains('hidden'),
-    { timeout: 60000 },
-  );
-  await page.evaluate(() =>
-    window.__godsEyeView.styleManager.setPanelCollapsed('pp-toggles', false, {
-      persist: false,
-      syncShare: false,
-    }),
-  );
-
-  const surface = await page.evaluate(() => {
-    const groups = [...document.querySelectorAll('[role="radiogroup"]')];
-    const buttons = groups.flatMap((group) => [
-      ...group.querySelectorAll('[role="radio"]'),
-    ]);
-    return {
-      groups: groups.length,
-      buttons: buttons.length,
-      shared:
-        groups.every((g) => g.classList.contains('gev-segmented')) &&
-        buttons.every((b) => {
-          const style = getComputedStyle(b);
-          return (
-            b.classList.contains('gev-segment') &&
-            style.fontSize === '9px' &&
-            style.minHeight === '24px' &&
-            style.borderRadius === '0px'
-          );
-        }),
-    };
-  });
-  check(
-    'all six one-of-many groups use the shared surface',
-    surface.groups === 6 && surface.buttons === 15 && surface.shared,
-    JSON.stringify(surface),
-  );
-
-  await page.evaluate(() =>
-    document.getElementById('models3d-mode-all').click(),
-  );
-  check(
-    'model selection reaches both aircraft layers',
-    await page.evaluate(() => {
-      const dm = window.__godsEyeView.dataManager;
-      return (
-        ['flights', 'military'].every(
-          (id) => dm.layers.get(id).module.getParams().models3dMode === 'all',
-        ) &&
-        document
-          .getElementById('models3d-mode-all')
-          .getAttribute('aria-checked') === 'true'
-      );
-    }),
-  );
-  await page.focus('#models3d-mode-all');
-  await page.keyboard.press('ArrowLeft');
-  check(
-    'Display retains its click-only arrow policy',
-    await page.evaluate(
-      () =>
-        document
-          .getElementById('models3d-mode-all')
-          .getAttribute('aria-checked') === 'true',
-    ),
-  );
-  await page.focus('#models3d-mode-proximity');
-  await page.keyboard.press('Space');
-  check(
-    'native Space selects model coverage',
-    await page.evaluate(
-      () =>
-        document
-          .getElementById('models3d-mode-proximity')
-          .getAttribute('aria-checked') === 'true',
-    ),
-  );
-  await page.evaluate(() =>
-    document.getElementById('detection-allocation-weighted').click(),
-  );
-  check(
-    'allocation selection still updates application tuning',
-    await page.evaluate(
-      () =>
-        window.__godsEyeView.styleManager._detectionAllocationPreference ===
-          'WEIGHTED' &&
-        document
-          .getElementById('detection-allocation-weighted')
-          .getAttribute('aria-checked') === 'true',
-    ),
-  );
-
-  await page.evaluate(() =>
-    document.querySelector('[data-shape="pin"]').click(),
-  );
-  check(
-    'drawing shape still uses its existing feature action',
-    await page.evaluate(
-      () =>
-        window.__gevDrawTool?.shape === 'pin' &&
-        document
-          .querySelector('[data-shape="pin"]')
-          .getAttribute('aria-checked') === 'true',
-    ),
-  );
-
-  // Off-layer controls still own params; no catalog/provider request is needed.
-  await page.evaluate(() =>
-    document.querySelector('[data-sl-pano="flat"]').click(),
-  );
-  check(
-    'panorama choice reaches the Street Level layer',
-    await page.evaluate(
-      () =>
-        window.__godsEyeView.dataManager.layers
-          .get('street-level')
-          .module.getParams().pano === 'flat',
-    ),
-  );
-  await page.evaluate(() =>
-    document.querySelector('[data-sl-pano="flat"]').dispatchEvent(
-      new KeyboardEvent('keydown', {
-        key: 'Home',
-        bubbles: true,
-        cancelable: true,
-      }),
-    ),
-  );
-  check(
-    'Street Level Home retains selection and roving tab state',
-    await page.evaluate(
-      () =>
-        window.__godsEyeView.dataManager.layers
-          .get('street-level')
-          .module.getParams().pano === 'all' &&
-        document
-          .querySelector('[data-sl-pano="all"]')
-          .getAttribute('tabindex') === '0',
-    ),
-  );
-  await page.evaluate(() =>
-    document.querySelector('[data-sl-render="fill"]').click(),
-  );
-  check(
-    'fit/fill keeps its stored render preference',
-    await page.evaluate(
-      () =>
-        localStorage.getItem('gev:street-level:render-mode') === 'fill' &&
-        document
-          .querySelector('[data-sl-render="fill"]')
-          .getAttribute('aria-checked') === 'true',
-    ),
-  );
-
-  await page.evaluate(() =>
-    document.querySelector('.ri-mode-btn[data-mode="ab"]').click(),
-  );
-  check(
-    'imagery mode reaches its controlled layer state',
-    await page.evaluate(
-      () =>
-        window.__godsEyeView.dataManager.layers
-          .get('recent-imagery')
-          .module.getSnapshot().mode === 'ab',
-    ),
-  );
-  await page.evaluate(() =>
-    document.getElementById('ri-mode').dispatchEvent(
-      new KeyboardEvent('keydown', {
-        key: 'ArrowRight',
-        bubbles: true,
-        cancelable: true,
-      }),
-    ),
-  );
-  check(
-    'imagery arrows wrap from the current selected value',
-    await page.evaluate(
-      () =>
-        window.__godsEyeView.dataManager.layers
-          .get('recent-imagery')
-          .module.getSnapshot().mode === 'image' &&
-        document
-          .querySelector('.ri-mode-btn[data-mode="image"]')
-          .getAttribute('aria-checked') === 'true',
-    ),
-  );
-
-  await page.evaluate(() => {
-    const manager = window.__godsEyeView.styleManager;
-    manager._setDetectionAllocation('ELASTIC', {
-      syncShare: false,
-      persist: false,
-    });
-    document
-      .getElementById('models3d-mode-proximity')
-      .scrollIntoView({ block: 'center' });
-  });
-  await page.screenshot({ path: `${shots}/desktop.png` });
-  await page.setViewport({ width: 620, height: 900 });
-  await page.evaluate(() =>
-    document
-      .getElementById('models3d-mode-proximity')
-      .scrollIntoView({ block: 'center' }),
-  );
-  await page.screenshot({ path: `${shots}/narrow.png` });
-  check(
-    'narrow selectors stay within their panel',
-    await page.evaluate(() =>
-      [...document.querySelectorAll('.pp-mode-seg')]
-        .filter((g) => g.getClientRects().length)
-        .every((group) => group.scrollWidth <= group.clientWidth + 1),
-    ),
-  );
-  const cyber = await page.evaluate(() => {
-    const root = document.documentElement;
-    const previous = root.getAttribute('data-ui-theme');
-    root.setAttribute('data-ui-theme', 'cyber');
-    const selected = [
-      ...document.querySelectorAll('.gev-segment[aria-checked="true"]'),
-    ];
-    // Check the final theme colors, independent of software-GL frame cadence.
-    for (const button of selected)
-      for (const animation of button.getAnimations()) animation.finish();
-    const backgrounds = selected.map(
-      (button) => getComputedStyle(button).backgroundColor,
-    );
-    const radii = [...document.querySelectorAll('.gev-segmented')].map(
-      (group) => getComputedStyle(group).borderRadius,
-    );
-    const consistent =
-      selected.length === 6 &&
-      backgrounds.every((color) => color === backgrounds[0]) &&
-      radii.every((radius) => radius === '1px');
-    if (previous === null) root.removeAttribute('data-ui-theme');
-    else root.setAttribute('data-ui-theme', previous);
-    return { consistent, count: selected.length, backgrounds, radii };
-  });
-  check(
-    'Cyber theme styles every selected segment consistently',
-    cyber.consistent,
-    JSON.stringify(cyber),
-  );
-  await page.evaluate(async () => {
-    const { dataManager, styleManager } = window.__godsEyeView;
-    await dataManager.setEnabled('recent-imagery', true);
-    styleManager.setPanelCollapsed('recent-imagery-panel', false, {
-      persist: false,
-      syncShare: false,
-    });
-  });
-  for (const width of [1440, 620, 390]) {
-    await page.setViewport({ width, height: 900 });
-    await page.focus('.ri-mode-btn[aria-checked="true"]');
-    const modeLayout = await page.evaluate(() => {
-      const group = document.getElementById('ri-mode');
-      const bounds = group.getBoundingClientRect();
-      const style = getComputedStyle(group);
-      const top = bounds.top + parseFloat(style.borderTopWidth);
-      const bottom = bounds.bottom - parseFloat(style.borderBottomWidth);
-      const buttons = [...group.querySelectorAll('[role="radio"]')];
-      return {
-        visible: bounds.width > 0 && bounds.height > 0,
-        contained: buttons.every((button) => {
-          const rect = button.getBoundingClientRect();
-          return rect.top >= top - 0.5 && rect.bottom <= bottom + 0.5;
-        }),
-        groupHeight: bounds.height,
-        buttonHeights: buttons.map(
-          (button) => button.getBoundingClientRect().height,
-        ),
-      };
-    });
-    check(
-      `imagery mode buttons and focus outline fit their row at ${width}px`,
-      modeLayout.visible && modeLayout.contained,
-      JSON.stringify(modeLayout),
-    );
-  }
-  check('no uncaught browser errors', errors.length === 0, errors.join(' | '));
-} catch (error) {
-  console.error('Browser errors:', errors);
-  await page.screenshot({ path: `${shots}/failure.png` }).catch(() => {});
-  throw error;
-} finally {
-  await browser.close();
-}
-console.log(`RESULT: ${failures.length} failures`);
-process.exitCode = failures.length ? 1 : 0;

scripts/qa-street-level.mjs

@@ -661,32 +661,6 @@ async function main() {
         },
       );
 
-      await step(
-        'FIT/FILL keeps native selection, keyboard focus and persistence with a photo open',
-        async () => {
-          await page.click('[data-sl-render="fill"]');
-          await uiUntil(page, (u) => u.street.renderMode === 'fill');
-          assert.equal(
-            await page.evaluate(() =>
-              localStorage.getItem('gev:street-level:render-mode'),
-            ),
-            'fill',
-          );
-          await page.keyboard.press('Home');
-          await uiUntil(page, (u) => u.street.renderMode === 'letterbox');
-          assert.deepEqual(
-            await page.$eval('[data-sl-render="letterbox"]', (node) => ({
-              selected: node.getAttribute('aria-checked'),
-              tabIndex: node.tabIndex,
-              focused: document.activeElement === node,
-            })),
-            { selected: 'true', tabIndex: 0, focused: true },
-          );
-          await page.keyboard.press('End');
-          await uiUntil(page, (u) => u.street.renderMode === 'fill');
-        },
-      );
-
       await step('× closes the photo and deselects its sequence', async () => {
         await press(page, '#sl-viewer-close');
         await uiUntil(
@@ -699,21 +673,6 @@ async function main() {
         );
       });
 
-      await step(
-        'panorama segments keep native arrow and Home navigation',
-        async () => {
-          await page.click('[data-sl-pano="flat"]');
-          await uiUntil(page, (u) => u.filter.pano === 'flat');
-          await page.keyboard.press('ArrowRight');
-          await uiUntil(page, (u) => u.filter.pano === 'all');
-          await page.keyboard.press('End');
-          await uiUntil(page, (u) => u.filter.pano === 'flat');
-          await page.keyboard.press('Home');
-          await uiUntil(page, (u) => u.filter.pano === 'all');
-          await waitForCoverage(page);
-        },
-      );
-
       await keylessProviderStep({
         id: 'kartaview',
         name: 'KartaView',

scripts/qa-visual-input.mjs

@@ -183,38 +183,6 @@ try {
       return manager.bloomEnabled !== before;
     }),
   );
-  const sliders = await page.evaluate(() => {
-    const ordinary = [
-      ...document.querySelectorAll('input[type="range"]'),
-    ].filter(
-      (input) => !input.matches('#radio-tuner-slider, .bhote-event-range'),
-    );
-    return {
-      count: ordinary.length,
-      shared: ordinary.every((input) =>
-        input.classList.contains('gev-quantitative-slider'),
-      ),
-      surface: ordinary.every((input) => {
-        const style = getComputedStyle(input);
-        return (
-          style.height === '18px' &&
-          style.appearance === 'none' &&
-          style.padding === '0px' &&
-          style.borderWidth === '0px' &&
-          (!input.disabled ||
-            (style.opacity === '0.42' && style.cursor === 'not-allowed'))
-        );
-      }),
-      tunerSeparate: !document
-        .getElementById('radio-tuner-slider')
-        .classList.contains('gev-quantitative-slider'),
-    };
-  });
-  check(
-    'ordinary sliders share one native surface',
-    sliders.count > 10 && sliders.shared && sliders.surface,
-  );
-  check('radio tuning keeps its specialized control', sliders.tunerSeparate);
   fs.mkdirSync('qa-shots/visual-input', { recursive: true });
   await page.screenshot({ path: 'qa-shots/visual-input/desktop.png' });
   await page.setViewport({ width: 620, height: 900 });

scripts/qa-voice-routing.mjs

@@ -1745,9 +1745,8 @@ async function runBehaviorLayer() {
       'behavior: analyst follow-up re-filters the remembered set',
       `count=${r?.count} followUp=${r?.coverage?.followUp}`,
     );
-    // Require the bundled boundary source and the existing whole-query limit.
-    // This elapsed time includes record acquisition and filtering; the region
-    // resolver has its own separate fallback budget.
+    // A marine region resolves from the bundled Natural Earth pack in the page,
+    // without the slower geocode fallback.
     const gulfStarted = Date.now();
     r = await run('analyst_query', {
       layers: ['flights'],
@@ -1758,10 +1757,9 @@ async function runBehaviorLayer() {
     report(
       r?.ok === true &&
         String(r?.coverage?.scope || '').includes('Gulf of Mexico') &&
-        r?.coverage?.scopeSource === 'natural-earth' &&
         gulfMs < 3000,
       'behavior: analyst resolves the Gulf of Mexico from the bundled pack',
-      `scope=${r?.coverage?.scope} source=${r?.coverage?.scopeSource} ms=${gulfMs} err=${r?.error || ''}`,
+      `scope=${r?.coverage?.scope} ms=${gulfMs} err=${r?.error || ''}`,
     );
 
     // (5) zoom_to_globe is ABSOLUTE full-earth (>12,000 km band)

server/providers/cctv.js

@@ -17,7 +17,6 @@ import {
   CCTV_MAX_SOURCES_CEILING,
 } from './cctv/constants.js';
 import { sanitizeCctvRangeHeader } from './cctv/range.js';
-import { admitSameSite } from './common/same-site.js';
 import { createHlsPuller } from './cctv/stream.js';
 import { googleServerApiKey } from './places/google-key.js';
 export { CCTV_FRAME_FETCH_TIMEOUT_MS, fetchCctvImageFromUpstream };
@@ -136,22 +135,15 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
     });
     server.middlewares.use('/api/cctv', async (req, res) => {
       try {
-        const url = new URL(req.url || '/', 'http://localhost');
-        // Refuse before catalog I/O, session creation, renewal or release.
-        if (url.pathname.startsWith('/media/') && admitSameSite(req, res))
-          return;
-        const clientId = String(req.socket?.remoteAddress || 'unknown').replace(
-          /^::ffff:/,
-          '',
-        );
         const sources = await getCctvSources();
         const sourceById = new Map(
           sources.map((source) => [source.id, source]),
         );
+        const url = new URL(req.url || '/', 'http://localhost');
 
         if (url.pathname === '/sources') {
           const body = {
-            trimmedPacks: getCctvSources.trimmedPacks?.(sources) ?? [],
+            trimmedPacks: getCctvSources.trimmedPacks?.() ?? [],
             sources: sources.map((source) => ({
               id: source.id,
               pack: source.pack,
@@ -246,7 +238,7 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
             return;
           }
           if (req.method === 'DELETE') {
-            if (leaseId) puller.release(cameraId, leaseId, clientId);
+            if (leaseId) puller.release(cameraId, leaseId);
             res.writeHead(204);
             res.end();
             return;
@@ -276,7 +268,6 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
                 url.searchParams.get('session'),
                 Number(match[3]),
                 leaseId,
-                clientId,
               );
               res.writeHead(body ? 200 : 404, {
                 'Content-Type': 'video/mp2t',
@@ -288,15 +279,10 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
             const downstream = watchDownstreamClose(res);
             let entry;
             const cancelPending = () => {
-              if (entry) puller.release(cameraId, leaseId, clientId);
+              if (entry) puller.release(cameraId, leaseId);
             };
             try {
-              entry = await puller.ensure(
-                cameraId,
-                mediaUrl,
-                leaseId,
-                clientId,
-              );
+              entry = await puller.ensure(cameraId, mediaUrl, leaseId);
               if (downstream.closed) {
                 cancelPending();
                 return;
@@ -310,7 +296,6 @@ export function cctvProxy({ sourceRoot = process.cwd() } = {}) {
                 entry,
                 cameraId,
                 leaseId,
-                clientId,
               );
               if (downstream.closed) return;
               if (!playlist) throw new Error('Stream unavailable');

server/providers/cctv/catalog.js

@@ -5,7 +5,6 @@ import { allocateSourceCap, resolveCatalogCap } from './cap.js';
 import { loadGroundHeights, joinGroundHeights } from './groundHeights.js';
 import { cameraRegion, normalizeSourceItem } from './normalize.js';
 import { loadLithuaniaSources } from './lithuania.js';
-import { loadTaiwanSources } from './taiwan.js';
 import {
   loadAustinSourcesFromOpenData,
   loadCaltransSourcesFromOpenData,
@@ -20,7 +19,6 @@ import {
   loadNswSourcesFromOpenData,
   loadCalgarySourcesFromOpenData,
   loadCataloniaSourcesFromOpenData,
-  loadHkSourcesFromOpenData,
   loadDelDOTSourcesFromOpenData,
   loadKingCountySourcesFromOpenData,
   loadWsdotSourcesFromOpenData,
@@ -108,11 +106,6 @@ const LIVE_PACKS = [
     enabled: () => envEnabled('CCTV_CATALONIA_ENABLED'),
     load: loadCataloniaSourcesFromOpenData,
   },
-  {
-    name: 'hk',
-    enabled: () => envEnabled('CCTV_HK_ENABLED'),
-    load: loadHkSourcesFromOpenData,
-  },
   {
     name: 'deldot',
     enabled: () => envEnabled('CCTV_DELDOT_ENABLED'),
@@ -160,11 +153,6 @@ const LIVE_PACKS = [
     enabled: () => envOptIn('CCTV_FLORIDA_ENABLED'),
     load: loadFloridaSourcesFromOpenData,
   },
-  {
-    name: 'taiwan',
-    enabled: () => envEnabled('CCTV_TAIWAN_ENABLED'),
-    load: loadTaiwanSources,
-  },
 ];
 /**
  * Load CCTV sources from a local JSON file (CCTV_SOURCES_FILE env or default).
@@ -216,19 +204,16 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
   /** @type {Promise<Array<object>>|null} In-flight refresh, shared by concurrent
    * callers so a post-TTL burst launches ONE refetch, not one per request. */
   let _cctvSourceInflight = null;
-  /** @type {WeakMap<Array<object>, Array<{pack: string, available: number, served: number}>>}
-   * Packs that serve fewer cameras than they offer, keyed by the source list
-   * they describe, so a request served the old list during a background
-   * refresh never pairs it with the new list's trim notes. */
-  const _cctvTrimmedPacks = new WeakMap();
+  /** @type {Array<{pack: string, available: number, served: number}>} Packs
+   * that serve fewer cameras than they offer. */
+  let _cctvTrimmedPacks = [];
 
   /**
    * Assemble and cache the merged CCTV source list.
    *
    * Merges every source pack (live open-data packs, local file, env
    * variable), deduplicates by ID, shares the catalog cap fairly across
-   * packs, and caches for CCTV_SOURCE_CACHE_MS. Past that, the cached list is
-   * returned while a background refresh replaces it; only a first load waits.
+   * packs, and caches for CCTV_SOURCE_CACHE_MS.
    *
    * @returns {Promise<Array<object>>} Deduplicated, capped source list.
    */
@@ -243,31 +228,11 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
     // Single-flight: a burst of requests arriving past the TTL shares ONE refresh
     // instead of each launching the full multi-provider refetch. The `.finally`
     // clears the ref so the next post-TTL cycle starts fresh.
-    if (!_cctvSourceInflight) {
-      _cctvSourceInflight = refreshCctvSources().finally(() => {
-        _cctvSourceInflight = null;
-      });
-      // A background refresh has no caller waiting on it: report its failure
-      // here, once per refresh rather than once per request it serves. Keep
-      // the old catalog for another TTL, as an empty refresh does, so a refresh
-      // that keeps failing is retried once per TTL, not back to back.
-      if (_cctvSourceCache.length) {
-        _cctvSourceInflight.catch((error) => {
-          _cctvSourceCacheAt = Date.now();
-          console.warn(
-            '[CCTV] background catalog refresh failed; serving',
-            _cctvSourceCache.length,
-            'cameras from the last catalog:',
-            error?.message || error,
-          );
-        });
-      }
-    }
-    // With a catalog in hand, answer with it while the refresh runs: the
-    // refresh lasts as long as the slowest pack (Tarktee's DATEX feeds take up
-    // to its 30 s timeout), and every /api/cctv request would otherwise wait
-    // for it. Only the first load, with nothing to serve yet, waits.
-    return _cctvSourceCache.length ? _cctvSourceCache : _cctvSourceInflight;
+    if (_cctvSourceInflight) return _cctvSourceInflight;
+    _cctvSourceInflight = refreshCctvSources().finally(() => {
+      _cctvSourceInflight = null;
+    });
+    return _cctvSourceInflight;
   }
 
   /**
@@ -357,7 +322,7 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
     }
     if (capped.length > 0 || _cctvSourceCache.length === 0) {
       _cctvSourceCache = capped;
-      _cctvTrimmedPacks.set(capped, trimmedPacks);
+      _cctvTrimmedPacks = trimmedPacks;
     } else {
       // Every source came back empty (all live packs timed out / upstream outage)
       // but a good catalog is already cached — serve it stale rather than blanking
@@ -371,10 +336,7 @@ export function createCctvCatalog({ sourceRoot = process.cwd() } = {}) {
     return _cctvSourceCache;
   }
 
-  /** Packs serving fewer cameras than they offer in `sources` (by default the
-   * current catalog). Pass the list a request was served to keep the two in
-   * step while a background refresh swaps the catalog. */
-  getCctvSources.trimmedPacks = (sources = _cctvSourceCache) =>
-    _cctvTrimmedPacks.get(sources) ?? [];
+  /** Packs serving fewer cameras than they offer, as of the last refresh. */
+  getCctvSources.trimmedPacks = () => _cctvTrimmedPacks;
   return getCctvSources;
 }

server/providers/cctv/constants.js

@@ -140,7 +140,7 @@ export const TFL_IMAGE_ORIGIN =
   'https://s3-eu-west-1.amazonaws.com/jamcams.tfl.gov.uk/';
 export const DEFAULT_TFL_MAX_SOURCES = 250;
 export const LONDON_CENTER = { lat: 51.5074, lon: -0.1278 };
-/** Ontario 511: CARS/511 camera catalog, which needs a developer key (ONTARIO_511_API_KEY); frame URLs are still images. */
+/** Ontario 511: keyless CARS/511 camera catalog; frame URLs are still images. */
 export const ONTARIO_511_CAMERAS_URL =
   'https://511on.ca/api/v2/get/cameras?format=json&lang=en';
 export const ONTARIO_511_IMAGE_ORIGIN = 'https://511on.ca/map/Cctv/';
@@ -209,8 +209,6 @@ export const TARKTEE_IMAGES_URL =
   'https://tarktee.transpordiamet.ee/api/v1/datex/roadCameraImages';
 export const TARKTEE_IMAGE_ORIGIN = 'https://tarktee.transpordiamet.ee/images/';
 export const DEFAULT_TARKTEE_MAX_SOURCES = 179;
-/** Hard ceiling per Tarktee DATEX XML document (~120–165 KB live). */
-export const TARKTEE_MAX_CATALOG_BYTES = 4 * 1024 * 1024;
 export const TARKTEE_ANCHORS = [
   { lat: 59.437, lon: 24.753 }, // Tallinn
   { lat: 58.378, lon: 26.729 }, // Tartu
@@ -309,36 +307,6 @@ export const CATALONIA_ANCHORS = [
   { lat: 41.5636, lon: 2.0111 }, // Terrassa
 ];
 
-/** Hong Kong Transport Department traffic snapshot cameras: keyless English
- * locations XML on DATA.GOV.HK; frames are stills on the TD CCTV host. */
-export const DEFAULT_HK_CAMERAS_URL =
-  'https://static.data.gov.hk/td/traffic-snapshot-images/code/Traffic_Camera_Locations_En.xml';
-/** The only origin HK camera frames may come from. Verified 2026-10-11: still
- * URLs answer 200 on this host with no redirect hop. */
-export const HK_IMAGE_ORIGIN = 'https://tdcctv.data.one.gov.hk/';
-/** Above the full TD English catalog (~1,013 cameras) so a default install
- * keeps nearly all of them. Catalog-wide round-robin still applies when the
- * sum of packs exceeds DEFAULT_CCTV_MAX_SOURCES (Norway-style). */
-export const DEFAULT_HK_MAX_SOURCES = 1100;
-/** Prioritization anchors across Hong Kong Island, Kowloon and the New
- * Territories so a lowered cap keeps territory-wide coverage rather than
- * only the harbour corridor. */
-export const HK_ANCHORS = [
-  { lat: 22.2819, lon: 114.158 }, // Central
-  { lat: 22.2976, lon: 114.1722 }, // Tsim Sha Tsui
-  { lat: 22.3827, lon: 114.19 }, // Sha Tin
-  { lat: 22.3701, lon: 114.114 }, // Tsuen Wan
-  { lat: 22.4503, lon: 114.1688 }, // Tai Po
-  { lat: 22.493, lon: 114.139 }, // Fanling
-  { lat: 22.391, lon: 113.977 }, // Tuen Mun
-  { lat: 22.4445, lon: 114.022 }, // Yuen Long
-  { lat: 22.307, lon: 114.26 }, // Tseung Kwan O
-];
-/** Hard ceiling on the locations XML body. The live English list is ~400 KB
- * for ~1,000 cameras; this only exists so an unbounded upstream cannot be
- * buffered without limit. */
-export const HK_MAX_CATALOG_BYTES = 4 * 1024 * 1024;
-
 /** Statens vegvesen (Norway) road cameras: the keyless OGC API Features view
  * of the official DATEX 3.1 CCTV site table, one GeoJSON request for the whole
  * country (~900 cameras). The raw DATEX node needs an account; this view does
@@ -370,49 +338,6 @@ export const NORWAY_ANCHORS = [
   { lat: 69.6492, lon: 18.9553 }, // Tromsø
 ];
 
-/** Kartverket's keyless point-height API (CC BY 4.0): terrain height above
- * sea level (NN2000), used as the Vegvesen cameras' ground prior because the
- * camera feed's points are 2D. */
-export const KARTVERKET_HEIGHT_URL =
-  'https://ws.geonorge.no/hoydedata/v1/punkt';
-/** Points per request. The API takes up to 50, but above ~20 it answers the
- * extra points from contour lines (`hoydekurver`, metres to ~20 m off) or not
- * at all; at 20 nearly every camera resolves from the 1 m terrain model. */
-export const KARTVERKET_MAX_POINTS = 20;
-/** Requests in flight at once. The whole country is ~36 requests of
- * 0.6-9.5 s each, so a cold lookup takes ~6-13 s. */
-export const KARTVERKET_CONCURRENCY = 8;
-/** Deadline for one complete lookup, shared by every request. A lookup cut
- * short by it is resumed on the next refresh, without a backoff. */
-export const KARTVERKET_LOOKUP_TIMEOUT_MS = 30 * 1000;
-/** One request that takes longer than this counts as a failing service. */
-export const KARTVERKET_REQUEST_TIMEOUT_MS = 10 * 1000;
-/** The Vegvesen lane's budget, measured from the start of the loader (catalog
- * fetch included), for waiting on heights. Under the 15 s per-provider fetch
- * timeout so this pack is never the catalog's slowest lane. A lookup still
- * running after it keeps filling the cache for the next refresh. */
-export const KARTVERKET_CATALOG_WAIT_MS = 12 * 1000;
-/** The lane only waits when more than this share of its cameras has no
- * answer yet (a cold cache). A few new cameras or expired misses are looked
- * up in the background instead of holding the refresh. */
-export const KARTVERKET_WAIT_MISSING_SHARE = 0.1;
-/** A point Kartverket has no height for (some ferry quays and bridges) is not
- * asked about again for this long. */
-export const KARTVERKET_NULL_TTL_MS = 6 * 60 * 60 * 1000;
-/** After a failing request (408, 429, 5xx, a network error, a request
- * timeout or an unreadable body), no lookup starts for this long, or for the
- * Retry-After the service sent, bounded to [1 min, 1 h]. Longer than the
- * 15-minute catalog refresh (CCTV_SOURCE_CACHE_MS), so a failing service
- * costs one attempt per backoff, not one per refresh. */
-export const KARTVERKET_FAILURE_BACKOFF_MS = 30 * 60 * 1000;
-export const KARTVERKET_MAX_BACKOFF_MS = 60 * 60 * 1000;
-export const KARTVERKET_MAX_RESPONSE_BYTES = 256 * 1024;
-/** Plausible Norwegian terrain: below sea level only at the shore, and no road
- * camera sits above ~1,500 m. Anything outside is treated as no height. */
-export const KARTVERKET_HEIGHT_RANGE_M = Object.freeze({ min: -20, max: 2500 });
-/** Same identity the other CCTV upstream requests send. */
-export const KARTVERKET_USER_AGENT = 'gods-eye-view-cctv-proxy/1.0';
-
 /** NYC DOT Traffic Management Center cameras: one keyless JSON list for the
  * five boroughs (~980 cameras). Frames are stills synthesized from each
  * camera UUID on the city's webcam host — never taken from the payload. */
@@ -535,10 +460,6 @@ export const CCTV_SOURCE_CACHE_MS = 15 * 60 * 1000;
  * pending forever — a hung fetch aborts, the loader returns [], and
  * serve-stale/other packs take over. */
 export const CCTV_SOURCE_FETCH_TIMEOUT_MS = 15 * 1000;
-/** Tarktee's two DATEX feeds (120 and 160 KB) answered in 2 to 16.6 s across
- * ten requests on 2026-10-18, so the shared 15 s timeout dropped the Estonian
- * pack on about a third of loads. Both must arrive for any camera to load. */
-export const TARKTEE_FETCH_TIMEOUT_MS = 30 * 1000;
 /** Individual CCTV image fetches must settle before the active 10-second
  * client refresh cadence. A bounded miss can fall through to Street View or
  * the synthetic frame instead of leaving the browser preview pending. */

server/providers/cctv/normalize.js

@@ -399,17 +399,6 @@ export function isLikelyNycCoordinate(lat, lon) {
   );
 }
 
-/** Hong Kong SAR extent, with slack for the outlying islands. */
-export function isLikelyHongKongCoordinate(lat, lon) {
-  return (
-    isPlausibleLatLon(lat, lon) &&
-    lat >= 22.15 &&
-    lat <= 22.6 &&
-    lon >= 113.8 &&
-    lon <= 114.45
-  );
-}
-
 /** Mainland Norway, with slack for the coast and the Finnmark border. */
 export function isLikelyNorwayCoordinate(lat, lon) {
   return (

server/providers/cctv/ontario511.test.mjs

@@ -1,129 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import {
-  _resetOntarioKeyWarningForTest,
-  loadOntarioSourcesFromOpenData,
-} from './sources.js';
-
-const ROW = {
-  Id: '42',
-  Latitude: 43.6532,
-  Longitude: -79.3832,
-  Location: 'Hwy 401 near Yonge St',
-  Direction: 'Eastbound',
-  Views: [
-    {
-      Status: 'Enabled',
-      Url: 'https://511on.ca/map/Cctv/4201',
-      Description: 'Eastbound',
-    },
-  ],
-};
-
-function captureConsole(t) {
-  const lines = [];
-  const capture = (...args) => lines.push(args.join(' '));
-  t.mock.method(console, 'warn', capture);
-  t.mock.method(console, 'log', capture);
-  return lines;
-}
-
-test.beforeEach(() => _resetOntarioKeyWarningForTest());
-
-test('without ONTARIO_511_API_KEY the Ontario pack is skipped, logged once', async (t) => {
-  const lines = captureConsole(t);
-  let fetches = 0;
-  t.mock.method(globalThis, 'fetch', async () => {
-    fetches += 1;
-    return Response.json([ROW]);
-  });
-  assert.deepEqual(await loadOntarioSourcesFromOpenData({}, {}), []);
-  assert.deepEqual(
-    await loadOntarioSourcesFromOpenData({}, { ONTARIO_511_API_KEY: '   ' }),
-    [],
-  );
-  assert.equal(fetches, 0);
-  assert.equal(lines.length, 1);
-  assert.match(lines[0], /ONTARIO_511_API_KEY/);
-});
-
-test('with a key the camera list is requested with it and parsed', async (t) => {
-  const lines = captureConsole(t);
-  const requested = [];
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    requested.push(String(url));
-    return Response.json([ROW]);
-  });
-  const cameras = await loadOntarioSourcesFromOpenData(
-    { sourceRoot: '/ignored' },
-    { ONTARIO_511_API_KEY: ' test-key ' },
-  );
-  assert.equal(requested.length, 1);
-  const url = new URL(requested[0]);
-  assert.equal(url.host, '511on.ca');
-  assert.equal(url.searchParams.get('key'), 'test-key');
-  assert.equal(url.searchParams.get('format'), 'json');
-  assert.equal(cameras.length, 1);
-  assert.equal(cameras[0].id, 'on-42');
-  assert.equal(cameras[0].url, 'https://511on.ca/map/Cctv/4201');
-  // The records go to the browser through /api/cctv; the key must stay on
-  // the server-side catalog request.
-  assert.doesNotMatch(JSON.stringify(cameras), /test-key/);
-  assert.doesNotMatch(lines.join('\n'), /test-key/);
-});
-
-test('the source cap is read from the same environment as the key', async (t) => {
-  captureConsole(t);
-  const rows = Array.from({ length: 12 }, (_, i) => ({
-    ...ROW,
-    Id: String(100 + i),
-    Latitude: ROW.Latitude + i * 0.01,
-    Views: [{ ...ROW.Views[0], Url: `https://511on.ca/map/Cctv/${100 + i}` }],
-  }));
-  t.mock.method(globalThis, 'fetch', async () => Response.json(rows));
-  const cameras = await loadOntarioSourcesFromOpenData(
-    {},
-    { ONTARIO_511_API_KEY: 'test-key', CCTV_ONTARIO_MAX_SOURCES: '8' },
-  );
-  assert.equal(cameras.length, 8);
-});
-
-for (const status of [400, 401, 403]) {
-  test(`a ${status} points at the key by name, never by value`, async (t) => {
-    const lines = captureConsole(t);
-    t.mock.method(globalThis, 'fetch', async () =>
-      Response.json({ Message: 'Invalid Key' }, { status }),
-    );
-    const cameras = await loadOntarioSourcesFromOpenData(
-      {},
-      { ONTARIO_511_API_KEY: 'secret-key-value' },
-    );
-    assert.deepEqual(cameras, []);
-    assert.match(
-      lines.join('\n'),
-      new RegExp(`failed: ${status} \\(check ONTARIO_511_API_KEY\\)`),
-    );
-    assert.doesNotMatch(lines.join('\n'), /secret-key-value/);
-  });
-}
-
-for (const status of [429, 500, 503]) {
-  test(`a ${status} is reported without blaming the key`, async (t) => {
-    const lines = captureConsole(t);
-    t.mock.method(globalThis, 'fetch', async () =>
-      Response.json({}, { status }),
-    );
-    const cameras = await loadOntarioSourcesFromOpenData(
-      {},
-      { ONTARIO_511_API_KEY: 'secret-key-value' },
-    );
-    assert.deepEqual(cameras, []);
-    assert.equal(lines.length, 1);
-    assert.equal(
-      lines[0],
-      `[CCTV] Ontario 511 camera download failed: ${status}`,
-    );
-    assert.doesNotMatch(lines[0], /secret-key-value/);
-  });
-}

server/providers/cctv/sources.js

@@ -42,7 +42,6 @@ import {
   TARKTEE_IMAGES_URL,
   TARKTEE_IMAGE_ORIGIN,
   DEFAULT_TARKTEE_MAX_SOURCES,
-  TARKTEE_MAX_CATALOG_BYTES,
   TARKTEE_ANCHORS,
   DEFAULT_WARENDORF_SOURCE_FILE,
   WARENDORF_IMAGE_ORIGINS,
@@ -76,13 +75,7 @@ import {
   TORONTO_DOWNTOWN,
   TORONTO_GROUND_ELEVATION_M,
   TORONTO_MAX_CATALOG_BYTES,
-  DEFAULT_HK_CAMERAS_URL,
-  HK_IMAGE_ORIGIN,
-  DEFAULT_HK_MAX_SOURCES,
-  HK_ANCHORS,
-  HK_MAX_CATALOG_BYTES,
   CCTV_SOURCE_FETCH_TIMEOUT_MS,
-  TARKTEE_FETCH_TIMEOUT_MS,
   DELDOT_CCTV_URL,
   DEFAULT_DELDOT_MAX_SOURCES,
   DELDOT_ANCHORS,
@@ -102,19 +95,6 @@ import {
   DEFAULT_VEGVESEN_MAX_SOURCES,
   VEGVESEN_MAX_CATALOG_BYTES,
   NORWAY_ANCHORS,
-  KARTVERKET_HEIGHT_URL,
-  KARTVERKET_MAX_POINTS,
-  KARTVERKET_CONCURRENCY,
-  KARTVERKET_LOOKUP_TIMEOUT_MS,
-  KARTVERKET_REQUEST_TIMEOUT_MS,
-  KARTVERKET_WAIT_MISSING_SHARE,
-  KARTVERKET_CATALOG_WAIT_MS,
-  KARTVERKET_NULL_TTL_MS,
-  KARTVERKET_FAILURE_BACKOFF_MS,
-  KARTVERKET_MAX_BACKOFF_MS,
-  KARTVERKET_USER_AGENT,
-  KARTVERKET_MAX_RESPONSE_BYTES,
-  KARTVERKET_HEIGHT_RANGE_M,
   NYC_CAMERAS_URL,
   NYC_IMAGE_URL,
   NYC_CAMERA_ID_RE,
@@ -143,7 +123,6 @@ import {
   isLikelyCataloniaCoordinate,
   decodeNumericEntities,
   isLikelyNycCoordinate,
-  isLikelyHongKongCoordinate,
   isLikelyNorwayCoordinate,
   isLikelyTorontoCoordinate,
   cameraDisplayCode,
@@ -530,56 +509,22 @@ function pickOntarioCctvView(views) {
   );
 }
 
-let ontarioKeyMissingLogged = false;
-
-/** Test seam: let the next keyless call log the missing-key line again. */
-export function _resetOntarioKeyWarningForTest() {
-  ontarioKeyMissingLogged = false;
-}
-
 /**
- * Fetch Ontario 511 CCTV cameras. The camera list comes from the 511 API,
- * which now requires a free developer key (511on.ca/developers/doc, "Requires a
- * developer key"; unkeyed calls answer 400 "Invalid Key"), read from
- * ONTARIO_511_API_KEY. Without one the pack is skipped with a single log line.
- * Frame URLs are stable still-image endpoints under 511on.ca/map/Cctv/. Only
- * rows with finite Ontario coords and at least one enabled official still
- * view are kept.
+ * Fetch Ontario 511 CCTV cameras. Keyless: the catalog is exposed by the
+ * public 511 API, while frame URLs are stable still-image endpoints under
+ * 511on.ca/map/Cctv/. Only rows with finite Ontario coords and at least one
+ * enabled official still view are kept.
  *
- * @param {object} [_options] The catalog's loader options (unused).
- * @param {object} [env] Environment to read the key and the source cap from.
  * @returns {Promise<Array<object>>} Normalized camera source objects.
  */
-export async function loadOntarioSourcesFromOpenData(
-  _options = {},
-  env = process.env,
-) {
-  const key = String(env.ONTARIO_511_API_KEY ?? '').trim();
-  if (!key) {
-    if (!ontarioKeyMissingLogged) {
-      ontarioKeyMissingLogged = true;
-      console.warn(
-        '[CCTV] Ontario 511 cameras skipped: the 511on.ca API needs a free developer key (set ONTARIO_511_API_KEY)',
-      );
-    }
-    return [];
-  }
+export async function loadOntarioSourcesFromOpenData() {
   try {
-    const url = new URL(ONTARIO_511_CAMERAS_URL);
-    url.searchParams.set('key', key);
-    const resp = await fetch(url, {
+    const resp = await fetch(ONTARIO_511_CAMERAS_URL, {
       headers: { Accept: 'application/json' },
       signal: AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS),
     });
     if (!resp.ok) {
-      // The API answers 400 "Invalid Key" to a wrong or revoked key.
-      const keyHint =
-        resp.status === 400 || resp.status === 401 || resp.status === 403
-          ? ' (check ONTARIO_511_API_KEY)'
-          : '';
-      console.warn(
-        `[CCTV] Ontario 511 camera download failed: ${resp.status}${keyHint}`,
-      );
+      console.warn('[CCTV] Ontario 511 camera download failed:', resp.status);
       return [];
     }
     const rows = await resp.json();
@@ -642,7 +587,7 @@ export async function loadOntarioSourcesFromOpenData(
       new Map(cameras.map((camera) => [camera.id, camera])).values(),
     );
     const maxRaw = Number(
-      env.CCTV_ONTARIO_MAX_SOURCES || DEFAULT_ONTARIO_MAX_SOURCES,
+      process.env.CCTV_ONTARIO_MAX_SOURCES || DEFAULT_ONTARIO_MAX_SOURCES,
     );
     const maxCount = Number.isFinite(maxRaw)
       ? Math.max(8, Math.min(1000, Math.floor(maxRaw)))
@@ -1253,73 +1198,28 @@ export function parseTarkteeDatexImages(xml) {
  */
 export async function loadTarkteeSourcesFromDatex() {
   try {
-    const responses = await Promise.allSettled([
+    const [locResp, imgResp] = await Promise.all([
       fetch(TARKTEE_LOCATIONS_URL, {
         headers: { Accept: 'application/xml,text/xml,*/*' },
-        redirect: 'manual',
-        signal: AbortSignal.timeout(TARKTEE_FETCH_TIMEOUT_MS),
+        signal: AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS),
       }),
       fetch(TARKTEE_IMAGES_URL, {
         headers: { Accept: 'application/xml,text/xml,*/*' },
-        redirect: 'manual',
-        signal: AbortSignal.timeout(TARKTEE_FETCH_TIMEOUT_MS),
+        signal: AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS),
       }),
     ]);
-    const [locResp, imgResp] = responses.map((result) =>
-      result.status === 'fulfilled' ? result.value : undefined,
-    );
-    // Both responses are fetched in parallel; if either is rejected or overflows
-    // its byte cap, both bodies must be released so neither transport leaks.
-    const discardBoth = async () => {
-      await Promise.allSettled([
-        locResp?.body?.cancel(),
-        imgResp?.body?.cancel(),
-      ]);
-      return [];
-    };
-    const rejected = responses.find((result) => result.status === 'rejected');
-    if (rejected) {
-      await discardBoth();
-      throw rejected.reason;
-    }
-    if (
-      (locResp.status >= 300 && locResp.status < 400) ||
-      (imgResp.status >= 300 && imgResp.status < 400)
-    ) {
-      console.warn(
-        '[CCTV] Tarktee DATEX catalog redirected; redirects are not followed',
-      );
-      return discardBoth();
-    }
     if (!locResp.ok) {
       console.warn('[CCTV] Tarktee locations download failed:', locResp.status);
-      return discardBoth();
+      return [];
     }
     if (!imgResp.ok) {
       console.warn('[CCTV] Tarktee images download failed:', imgResp.status);
-      return discardBoth();
-    }
-    let locXml;
-    let imgXml;
-    const readAbort = new AbortController();
-    try {
-      [locXml, imgXml] = await Promise.all([
-        readResponseTextCapped(
-          locResp,
-          TARKTEE_MAX_CATALOG_BYTES,
-          readAbort.signal,
-        ),
-        readResponseTextCapped(
-          imgResp,
-          TARKTEE_MAX_CATALOG_BYTES,
-          readAbort.signal,
-        ),
-      ]);
-    } catch (error) {
-      readAbort.abort();
-      await discardBoth();
-      throw error;
+      return [];
     }
+    const [locXml, imgXml] = await Promise.all([
+      locResp.text(),
+      imgResp.text(),
+    ]);
     const locations = parseTarkteeDatexLocations(locXml);
     const images = parseTarkteeDatexImages(imgXml);
     if (!locations.size || !images.size) {
@@ -1331,7 +1231,6 @@ export async function loadTarkteeSourcesFromDatex() {
     }
 
     const cameras = [];
-    const seen = new Set();
     for (const [locationId, loc] of locations.entries()) {
       const imageUrl = images.get(locationId);
       if (!imageUrl) continue;
@@ -1343,8 +1242,6 @@ export async function loadTarkteeSourcesFromDatex() {
       const cameraId = numMatch
         ? `ee-tarktee-${numMatch[1]}`
         : `ee-tarktee-${locationId}`;
-      if (seen.has(cameraId)) continue;
-      seen.add(cameraId);
       cameras.push({
         id: cameraId,
         name: loc.name,
@@ -2009,226 +1906,6 @@ export async function loadCataloniaSourcesFromOpenData() {
   }
 }
 
-/**
- * Read one XML child tag's text from an `<image>` block.
- *
- * @param {string} body
- * @param {string} tag
- * @returns {string}
- */
-function hkXmlTag(body, tag) {
-  const match = new RegExp(`<${tag}>\\s*([^<]*?)\\s*</${tag}>`, 'i').exec(
-    String(body || ''),
-  );
-  return match ? match[1].trim() : '';
-}
-
-/**
- * Parse the Transport Department English camera-locations XML into rows.
- *
- * Schema-specific: each `<image>` carries key, description, lat/lon and a
- * still URL. No XML dependency — same regex style as the Tarktee DATEX parser.
- *
- * @param {string} xml
- * @returns {Array<object>}
- */
-export function parseHkCameraLocationsXml(xml) {
-  const rows = [];
-  const blockRe = /<image>([\s\S]*?)<\/image>/gi;
-  let match;
-  while ((match = blockRe.exec(String(xml || ''))) !== null) {
-    const body = match[1];
-    rows.push({
-      key: hkXmlTag(body, 'key'),
-      region: hkXmlTag(body, 'region'),
-      district: hkXmlTag(body, 'district'),
-      description: hkXmlTag(body, 'description'),
-      latitude: hkXmlTag(body, 'latitude'),
-      longitude: hkXmlTag(body, 'longitude'),
-      url: hkXmlTag(body, 'url'),
-    });
-  }
-  return rows;
-}
-
-/**
- * Build a host-pinned still URL from a Transport Department camera key.
- *
- * The catalog also publishes a URL; the registered frame is always rebuilt
- * from the key so a catalog edit cannot steer the proxy off-origin.
- *
- * @param {string|null|undefined} key
- * @returns {?string}
- */
-export function hkImageUrlFromKey(key) {
-  const id = String(key ?? '')
-    .trim()
-    .toUpperCase();
-  if (!/^[A-Z0-9]{1,32}$/.test(id)) return null;
-  return `${HK_IMAGE_ORIGIN}${id}.JPG`;
-}
-
-/**
- * Pin a catalog frame URL to the Transport Department still host.
- *
- * @param {string|null|undefined} raw
- * @returns {?string}
- */
-export function normalizeHkImageUrl(raw) {
-  const text = String(raw ?? '').trim();
-  if (!text) return null;
-  let parsed;
-  try {
-    parsed = new URL(text);
-  } catch {
-    return null;
-  }
-  if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') return null;
-  parsed.protocol = 'https:';
-  const upgraded = parsed.toString();
-  return upgraded.startsWith(HK_IMAGE_ORIGIN) ? upgraded : null;
-}
-
-/**
- * Label for one HK camera: the published English description, else the key.
- *
- * @param {object} record
- * @param {string} cameraId
- * @returns {string}
- */
-export function hkCameraName(record, cameraId) {
-  const description = String(record?.description ?? '').trim();
-  if (description) return description;
-  const key = String(record?.key ?? '').trim();
-  if (key) return key;
-  return `HK Camera ${String(cameraId).replace(/^hk-/, '')}`;
-}
-
-/**
- * One Transport Department locations row -> one catalog source, or null.
- *
- * The dataset publishes no camera facing, so headings use the shared id-hash
- * fallback at low confidence and are corrected with the calibration gizmo.
- *
- * @param {object} record
- * @returns {?object}
- */
-export function hkCameraToSource(record) {
-  if (!record || typeof record !== 'object') return null;
-  const key = String(record.key ?? '')
-    .trim()
-    .toUpperCase();
-  if (!key) return null;
-  const lat = toFiniteNumber(record.latitude);
-  const lon = toFiniteNumber(record.longitude);
-  if (!isLikelyHongKongCoordinate(lat, lon)) return null;
-
-  const imageUrl = hkImageUrlFromKey(key);
-  if (!imageUrl) return null;
-  // If the catalog carries a URL, it must already be on the pinned host.
-  const catalogUrl = String(record.url ?? '').trim();
-  if (catalogUrl) {
-    const pinnedCatalog = normalizeHkImageUrl(catalogUrl);
-    if (!pinnedCatalog) return null;
-  }
-
-  const cameraId = `hk-${key.toLowerCase()}`;
-  const name = hkCameraName(record, cameraId);
-  const region = String(record.region ?? '').trim();
-
-  return {
-    id: cameraId,
-    name,
-    city: region || 'Hong Kong',
-    cityId: 'hk',
-    provider: 'Transport Department',
-    lat,
-    lon,
-    headingDeg: fallbackHeadingFromId(cameraId),
-    headingConfidence: 'low',
-    pitchDeg: -18,
-    fovDeg: 44,
-    rangeM: 145,
-    mountHeightM: 8,
-    // Coastal / harbour prior; the client's one-shot ground snap corrects.
-    groundElevationM: 15,
-    feedType: 'image',
-    url: imageUrl,
-    snapshotUrl: imageUrl,
-    sourceKind: 'hk-td-open-data',
-    license:
-      'Hong Kong Transport Department / DATA.GOV.HK — attribution required',
-    code: cameraDisplayCode(name.toUpperCase()),
-  };
-}
-
-/**
- * Fetch Hong Kong Transport Department traffic snapshot cameras from the
- * keyless DATA.GOV.HK English locations XML. Frames are stills on
- * tdcctv.data.one.gov.hk.
- *
- * @returns {Promise<Array<object>>} Normalized camera source objects.
- */
-export async function loadHkSourcesFromOpenData() {
-  try {
-    const endpoint = process.env.CCTV_HK_CAMERAS_URL || DEFAULT_HK_CAMERAS_URL;
-    const resp = await fetch(endpoint, {
-      headers: { Accept: 'application/xml,text/xml,*/*' },
-      redirect: 'manual',
-      signal: AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS),
-    });
-    const discard = async () => {
-      try {
-        await resp.body?.cancel();
-      } catch {
-        /* no-op */
-      }
-      return [];
-    };
-    if (resp.status >= 300 && resp.status < 400) {
-      console.warn('[CCTV] HK catalog redirected; redirects are not followed');
-      return discard();
-    }
-    if (!resp.ok) {
-      console.warn('[CCTV] HK camera download failed:', resp.status);
-      return discard();
-    }
-    let xml;
-    try {
-      xml = await readResponseTextCapped(resp, HK_MAX_CATALOG_BYTES);
-    } catch (error) {
-      if (error?.code === 'RESPONSE_TOO_LARGE') {
-        console.warn('[CCTV] HK catalog body exceeded byte ceiling');
-        return [];
-      }
-      throw error;
-    }
-    const rows = parseHkCameraLocationsXml(xml);
-    const cameras = [];
-    const seen = new Set();
-    for (const record of rows) {
-      const camera = hkCameraToSource(record);
-      if (!camera || seen.has(camera.id)) continue;
-      seen.add(camera.id);
-      cameras.push(camera);
-    }
-    const maxRaw = Number(
-      process.env.CCTV_HK_MAX_SOURCES || DEFAULT_HK_MAX_SOURCES,
-    );
-    const maxCount = Number.isFinite(maxRaw)
-      ? Math.max(8, Math.min(1200, Math.floor(maxRaw)))
-      : DEFAULT_HK_MAX_SOURCES;
-    const prioritized = prioritizeSources(cameras, maxCount, HK_ANCHORS);
-    console.log(
-      `[CCTV] Loaded HK camera sources: ${cameras.length} (using nearest ${prioritized.length})`,
-    );
-    return prioritized;
-  } catch (error) {
-    console.warn('[CCTV] HK camera download error:', error?.message || error);
-    return [];
-  }
-}
-
 export async function loadDelDOTSourcesFromOpenData() {
   try {
     const resp = await fetch(DELDOT_CCTV_URL, {
@@ -2716,11 +2393,14 @@ export function vegvesenCameraToSource(feature) {
     fovDeg: 44,
     rangeM: 145,
     mountHeightM: 8,
-    // The feed's coordinates are 2D. The loader replaces this flat prior with
-    // Kartverket's terrain height for each camera (applyVegvesenGroundHeights);
-    // it only survives when that lookup fails, and then a mountain-pass camera
-    // can sit below the terrain on a stack without 3D tiles, the same risk the
-    // Caltrans pack documents.
+    // KNOWN LIMITATION: the feed's coordinates are 2D, so this is one flat
+    // prior for the whole country, while cameras run from sea level to
+    // mountain passes near 1,000 m (Haukelifjell, Sjonfjellet, Rugeldalen).
+    // The point-height prior and the client's one-shot ground snap correct it
+    // where they resolve; on a stack where neither does (no 3D tiles), a pass
+    // camera stays hundreds of metres below the terrain, the same risk the
+    // Caltrans pack documents. A per-camera height (e.g. Kartverket's keyless
+    // point-height API) would remove it.
     groundElevationM: 150,
     feedType: videoUrl ? 'hls' : 'image',
     url: videoUrl || imageUrl,
@@ -2740,7 +2420,6 @@ export function vegvesenCameraToSource(feature) {
  * @returns {Promise<Array<object>>} Normalized camera source objects.
  */
 export async function loadVegvesenSourcesFromOpenData() {
-  const startedAt = Date.now();
   try {
     const endpoint = process.env.CCTV_VEGVESEN_URL || DEFAULT_VEGVESEN_CCTV_URL;
     const resp = await fetch(endpoint, {
@@ -2786,12 +2465,6 @@ export async function loadVegvesenSourcesFromOpenData() {
       ? Math.max(8, Math.min(1000, Math.floor(maxRaw)))
       : DEFAULT_VEGVESEN_MAX_SOURCES;
     const prioritized = prioritizeSources(cameras, maxCount, NORWAY_ANCHORS);
-    await applyVegvesenGroundHeights(prioritized, {
-      waitMs: Math.max(
-        0,
-        KARTVERKET_CATALOG_WAIT_MS - (Date.now() - startedAt),
-      ),
-    });
     console.log(
       `[CCTV] Loaded Vegvesen camera sources: ${cameras.length} (using nearest ${prioritized.length})`,
     );
@@ -2805,322 +2478,6 @@ export async function loadVegvesenSourcesFromOpenData() {
   }
 }
 
-/**
- * Kartverket answers by rounded position: `{z, expires}`, where z is metres or
- * null for "no height there". Heights never expire (camera positions barely
- * change); nulls expire after KARTVERKET_NULL_TTL_MS. The 15-minute catalog
- * refresh therefore only asks about new or moved cameras. Bounded well above
- * the ~900 cameras the pack can load.
- */
-const kartverketHeightCache = new Map();
-const KARTVERKET_CACHE_LIMIT = 5000;
-/** The lookup in flight, so overlapping catalog loads never start a second. */
-let kartverketPending = null;
-/** No lookup starts before this time (epoch ms) after a transport failure. */
-let kartverketBackoffUntil = 0;
-/** Bumped by clearKartverketHeightCache, so a lookup started before a clear
- * can no longer write to the cache, the backoff or the pending slot. */
-let kartverketGeneration = 0;
-
-/** Cache key for one position, at the ~0.1 m precision the request sends. */
-const kartverketKey = (lon, lat) => `${lon.toFixed(6)},${lat.toFixed(6)}`;
-
-/** Statuses that say the service, not the request, is failing. */
-const isKartverketTransportStatus = (status) =>
-  status === 408 || status === 429 || status >= 500;
-
-/** Forget cached heights, the backoff and any lookup in flight. Tests only. */
-export function clearKartverketHeightCache() {
-  kartverketGeneration += 1;
-  kartverketHeightCache.clear();
-  kartverketPending = null;
-  kartverketBackoffUntil = 0;
-}
-
-/**
- * How long to back off after a failed request: the Retry-After the service
- * sent (seconds or an HTTP date), else the default, bounded to [1 min, 1 h].
- *
- * @param {?string} retryAfter - The Retry-After header, if any.
- * @param {number} now - Epoch ms.
- * @returns {number} Milliseconds.
- */
-export function kartverketBackoffMs(retryAfter, now = Date.now()) {
-  let ms = KARTVERKET_FAILURE_BACKOFF_MS;
-  const text = String(retryAfter ?? '').trim();
-  if (/^\d+$/.test(text)) ms = Number(text) * 1000;
-  else if (text && Number.isFinite(Date.parse(text))) {
-    ms = Date.parse(text) - now;
-  }
-  return Math.max(60 * 1000, Math.min(KARTVERKET_MAX_BACKOFF_MS, ms));
-}
-
-/**
- * Terrain heights above sea level (NN2000) from Kartverket's keyless
- * point-height API, KARTVERKET_MAX_POINTS points per request. Each answer is
- * matched back by the coordinates the API echoes, and only for points that
- * request asked about, then reported through `into.set(key, z)` as its
- * request lands, so a caller that stops waiting keeps what has arrived. `z` is
- * metres, or null when the API has no usable height there. A point a 200
- * answer leaves out is reported as null too, so it is not asked again on
- * every refresh.
- *
- * Over water `/punkt` returns the depth of the sea floor (`datakilde:
- * dybdekurver`, `terreng: Havflate`; −547 m under Nordhordlandsbrua). Either
- * marker counts as 0 m, the water surface. For the ~14 bridge cameras that is
- * below the deck, but far closer than the sea floor or a flat prior.
- *
- * The first transport failure (a 408, 429 or 5xx, a network error, a request
- * past KARTVERKET_REQUEST_TIMEOUT_MS, an unreadable or oversized body, or the
- * shared deadline) stops the lookup: no further requests start, and the
- * failure is returned so the caller can back off. Points in failed requests
- * are not reported, so they are asked again later. Any other 4xx rejects that
- * request's points, not the service: they are reported as null and the lookup
- * carries on.
- *
- * @param {Array<{lon:number, lat:number}>} points
- * @param {{into?: {set: Function}, timeoutMs?: number, requestTimeoutMs?: number}} [options]
- * @returns {Promise<{heights: Map<string, ?number>, failure: ?{status: ?number, retryAfter: ?string, deadline: boolean}}>}
- *   `heights` is `into` when it is a Map, else a Map of what was reported.
- *   `failure.deadline` is true when only the shared deadline ran out.
- */
-export async function fetchKartverketHeights(
-  points,
-  {
-    into = new Map(),
-    timeoutMs = KARTVERKET_LOOKUP_TIMEOUT_MS,
-    requestTimeoutMs = KARTVERKET_REQUEST_TIMEOUT_MS,
-  } = {},
-) {
-  const heights = into instanceof Map ? into : new Map();
-  const report = (key, z) => {
-    if (heights !== into) heights.set(key, z);
-    into.set(key, z);
-  };
-  const unique = Array.from(
-    new Map(
-      (points || [])
-        .filter((p) => isLikelyNorwayCoordinate(p?.lat, p?.lon))
-        .map((p) => [kartverketKey(p.lon, p.lat), p]),
-    ).values(),
-  );
-  let failure = null;
-  if (!unique.length) return { heights, failure };
-  const batches = [];
-  for (let i = 0; i < unique.length; i += KARTVERKET_MAX_POINTS) {
-    batches.push(unique.slice(i, i + KARTVERKET_MAX_POINTS));
-  }
-  const deadline = AbortSignal.timeout(timeoutMs);
-  const fetchBatch = async (batch) => {
-    const asked = new Set(batch.map((p) => kartverketKey(p.lon, p.lat)));
-    const url = new URL(KARTVERKET_HEIGHT_URL);
-    url.searchParams.set(
-      'punkter',
-      JSON.stringify(
-        batch.map((p) => [Number(p.lon.toFixed(6)), Number(p.lat.toFixed(6))]),
-      ),
-    );
-    url.searchParams.set('koordsys', '4258');
-    const resp = await fetch(url, {
-      headers: {
-        Accept: 'application/json',
-        'User-Agent': KARTVERKET_USER_AGENT,
-      },
-      redirect: 'error',
-      signal: AbortSignal.any([
-        deadline,
-        AbortSignal.timeout(requestTimeoutMs),
-      ]),
-    });
-    if (!resp.ok) {
-      try {
-        await resp.body?.cancel();
-      } catch {
-        /* no-op */
-      }
-      if (!isKartverketTransportStatus(resp.status)) {
-        console.warn(
-          `[CCTV] Kartverket rejected ${asked.size} points: HTTP ${resp.status}`,
-        );
-        for (const key of asked) report(key, null);
-        return;
-      }
-      const error = new Error(`HTTP ${resp.status}`);
-      error.status = resp.status;
-      error.retryAfter = resp.headers.get('retry-after');
-      throw error;
-    }
-    const payload = await readResponseJsonCapped(
-      resp,
-      KARTVERKET_MAX_RESPONSE_BYTES,
-    );
-    for (const point of Array.isArray(payload?.punkter)
-      ? payload.punkter
-      : []) {
-      const x = toFiniteNumber(point?.x);
-      const y = toFiniteNumber(point?.y);
-      if (!Number.isFinite(x) || !Number.isFinite(y)) continue;
-      const key = kartverketKey(x, y);
-      // Only the points this request asked about: an odd answer can neither
-      // grow the cache nor overwrite another camera.
-      if (!asked.has(key)) continue;
-      asked.delete(key);
-      // `z: null` means no height there; Number(null) would read 0.
-      const raw = point?.z;
-      let z =
-        raw === null || raw === undefined || raw === ''
-          ? NaN
-          : toFiniteNumber(raw);
-      if (
-        Number.isFinite(z) &&
-        (point?.datakilde === 'dybdekurver' || point?.terreng === 'Havflate')
-      ) {
-        z = 0;
-      }
-      const usable =
-        Number.isFinite(z) &&
-        z >= KARTVERKET_HEIGHT_RANGE_M.min &&
-        z <= KARTVERKET_HEIGHT_RANGE_M.max;
-      report(key, usable ? z : null);
-    }
-    // A 200 that leaves a point out has no height for it either.
-    for (const key of asked) report(key, null);
-  };
-  let next = 0;
-  const worker = async () => {
-    while (next < batches.length && !failure) {
-      const batch = batches[next++];
-      try {
-        await fetchBatch(batch);
-      } catch (error) {
-        if (!failure) {
-          failure = {
-            status: Number.isFinite(error?.status) ? error.status : null,
-            retryAfter: error?.retryAfter ?? null,
-            deadline: deadline.aborted,
-          };
-          console.warn(
-            '[CCTV] Kartverket height lookup failed:',
-            error?.message || error,
-          );
-        }
-      }
-    }
-  };
-  await Promise.all(
-    Array.from(
-      { length: Math.min(KARTVERKET_CONCURRENCY, batches.length) },
-      worker,
-    ),
-  );
-  return { heights, failure };
-}
-
-/**
- * Give each Vegvesen camera its own terrain height as the ground prior, in
- * place. Waits at most `waitMs` for positions it has no answer for, and only
- * when more than KARTVERKET_WAIT_MISSING_SHARE of the cameras are missing
- * (a cold cache); a few new cameras or expired misses are looked up in the
- * background. A lookup still running when the wait ends keeps filling the
- * cache for the next catalog refresh. Cameras without a height keep the flat
- * prior. After a transport failure no lookup starts until the backoff ends,
- * which outlasts the 15-minute catalog refresh, so a failing Kartverket costs
- * one attempt per backoff, not one per refresh. A lookup cut short only by its
- * shared deadline is resumed on the next refresh without a backoff. Cameras
- * without finite coordinates are skipped. Never throws.
- * CCTV_VEGVESEN_HEIGHTS=0 turns it off.
- *
- * @param {Array<object>} cameras - Sources from vegvesenCameraToSource().
- * @param {{waitMs?: number, now?: () => number, timeoutMs?: number}} [options]
- *   `timeoutMs` is the lookup's shared deadline.
- * @returns {Promise<number>} How many cameras got a terrain height.
- */
-export async function applyVegvesenGroundHeights(
-  cameras,
-  {
-    waitMs = KARTVERKET_CATALOG_WAIT_MS,
-    now = Date.now,
-    timeoutMs = KARTVERKET_LOOKUP_TIMEOUT_MS,
-  } = {},
-) {
-  if (String(process.env.CCTV_VEGVESEN_HEIGHTS || '1').trim() === '0') return 0;
-  const list = (Array.isArray(cameras) ? cameras : []).filter(
-    (c) => Number.isFinite(c?.lon) && Number.isFinite(c?.lat),
-  );
-  const startedAt = now();
-  const missing = list.filter((c) => {
-    const entry = kartverketHeightCache.get(kartverketKey(c.lon, c.lat));
-    return !entry || entry.expires <= startedAt;
-  });
-  if (
-    missing.length &&
-    !kartverketPending &&
-    startedAt >= kartverketBackoffUntil
-  ) {
-    if (kartverketHeightCache.size + missing.length > KARTVERKET_CACHE_LIMIT) {
-      kartverketHeightCache.clear();
-    }
-    const generation = kartverketGeneration;
-    const current = () => generation === kartverketGeneration;
-    const sink = {
-      set: (key, z) => {
-        if (!current()) return;
-        kartverketHeightCache.set(key, {
-          z,
-          expires: z === null ? now() + KARTVERKET_NULL_TTL_MS : Infinity,
-        });
-      },
-    };
-    const pending = fetchKartverketHeights(missing, { into: sink, timeoutMs })
-      .then(({ failure }) => {
-        if (failure && !failure.deadline && current()) {
-          kartverketBackoffUntil =
-            now() + kartverketBackoffMs(failure.retryAfter, now());
-        }
-      })
-      .catch((error) => {
-        if (current()) {
-          kartverketBackoffUntil = now() + KARTVERKET_FAILURE_BACKOFF_MS;
-        }
-        console.warn(
-          '[CCTV] Kartverket height lookup error:',
-          error?.message || error,
-        );
-      })
-      .finally(() => {
-        if (kartverketPending === pending) kartverketPending = null;
-      });
-    kartverketPending = pending;
-  }
-  const cold = missing.length > list.length * KARTVERKET_WAIT_MISSING_SHARE;
-  if (cold && kartverketPending && waitMs > 0) {
-    let timer;
-    await Promise.race([
-      kartverketPending,
-      new Promise((resolve) => {
-        timer = setTimeout(resolve, waitMs);
-        timer.unref?.();
-      }),
-    ]);
-    clearTimeout(timer);
-  }
-  let applied = 0;
-  for (const camera of list) {
-    const z = kartverketHeightCache.get(
-      kartverketKey(camera.lon, camera.lat),
-    )?.z;
-    if (!Number.isFinite(z)) continue;
-    camera.groundElevationM = Math.round(z * 10) / 10;
-    applied += 1;
-  }
-  if (list.length) {
-    console.log(
-      `[CCTV] Kartverket ground heights: ${applied}/${list.length} Vegvesen cameras`,
-    );
-  }
-  return applied;
-}
-
 const NYC_BOROUGHS = new Set([
   'Manhattan',
   'Brooklyn',

server/providers/cctv/stream.js

@@ -4,7 +4,6 @@ import { randomUUID } from 'node:crypto';
 export const HLS_LIMITS = Object.freeze({
   sessions: 2,
   leasesPerSession: 8,
-  leasesPerClient: 8,
   playlistBytes: 256 * 1024,
   segmentBytes: 4 * 1024 * 1024,
   sessionBytes: 24 * 1024 * 1024,
@@ -139,37 +138,25 @@ export function createHlsPuller({
     entry.upstream.clear();
     entry.bytes = 0;
   };
-  const release = (cameraId, leaseId, clientId = 'legacy') => {
+  const release = (cameraId, leaseId) => {
     const entry = active.get(cameraId);
     const lease = entry?.leases.get(leaseId);
-    if (!lease || lease.clientId !== clientId) return;
+    if (!lease) return;
     clearTimeout(lease.timer);
     entry.leases.delete(leaseId);
     if (!entry.leases.size) stop(cameraId, entry.token);
   };
-  const touch = (entry, leaseId, create = false, clientId = 'legacy') => {
+  const touch = (entry, leaseId, create = false) => {
     let lease = entry.leases.get(leaseId);
-    if (lease && lease.clientId !== clientId)
-      throw new Error('HLS lease belongs to another client');
     if (!lease) {
-      const clientLeases = [...active.values()].reduce(
-        (count, session) =>
-          count +
-          [...session.leases.values()].filter(
-            (item) => item.clientId === clientId,
-          ).length,
-        0,
-      );
-      if (clientLeases >= limits.leasesPerClient)
-        throw new Error('HLS client lease capacity reached');
       if (!create || entry.leases.size >= limits.leasesPerSession)
         throw new Error('HLS lease capacity reached');
-      lease = { clientId };
+      lease = {};
       entry.leases.set(leaseId, lease);
     }
     clearTimeout(lease.timer);
     lease.timer = setTimeout(
-      () => release(entry.cameraId, leaseId, clientId),
+      () => release(entry.cameraId, leaseId),
       limits.idleMs,
     );
     lease.timer.unref?.();
@@ -261,12 +248,7 @@ export function createHlsPuller({
       }
     }
   };
-  const ensure = async (
-    cameraId,
-    url,
-    leaseId = 'legacy',
-    clientId = 'legacy',
-  ) => {
+  const ensure = async (cameraId, url, leaseId = 'legacy') => {
     if (closed) throw new Error('HLS service closed');
     sameOriginHlsUrl(url, url);
     let entry = active.get(cameraId);
@@ -275,7 +257,7 @@ export function createHlsPuller({
       entry = null;
     }
     if (entry) {
-      touch(entry, leaseId, true, clientId);
+      touch(entry, leaseId, true);
       return entry;
     }
     // Reserve synchronously, before any await: concurrent creation is singleflight.
@@ -297,8 +279,8 @@ export function createHlsPuller({
       pendingDiscontinuity: false,
       discontinuitiesRemoved: 0,
     };
-    touch(entry, leaseId, true, clientId);
     active.set(cameraId, entry);
+    touch(entry, leaseId, true);
     entry.polling = poll(entry);
     return entry;
   };
@@ -310,14 +292,9 @@ export function createHlsPuller({
     }
     return false;
   };
-  const buildPlaylist = async (
-    entry,
-    cameraId,
-    leaseId = 'legacy',
-    clientId = 'legacy',
-  ) => {
+  const buildPlaylist = async (entry, cameraId, leaseId = 'legacy') => {
     if (entry.stopping || entry.segments.size < 2) return null;
-    touch(entry, leaseId, false, clientId);
+    touch(entry, leaseId);
     const segments = [...entry.segments.values()].sort((a, b) => a.seq - b.seq);
     const lines = [
       '#EXTM3U',
@@ -341,22 +318,12 @@ export function createHlsPuller({
     }
     return lines.join('\n') + '\n';
   };
-  const getSegment = (
-    cameraId,
-    token,
-    seq,
-    leaseId = 'legacy',
-    clientId = 'legacy',
-  ) => {
+  const getSegment = (cameraId, token, seq, leaseId = 'legacy') => {
     const entry = active.get(cameraId);
-    if (
-      !entry ||
-      entry.token !== token ||
-      entry.leases.get(leaseId)?.clientId !== clientId
-    )
+    if (!entry || entry.token !== token || !entry.leases.has(leaseId))
       return null;
     const body = entry.segments.get(seq)?.body;
-    if (body) touch(entry, leaseId, false, clientId);
+    if (body) touch(entry, leaseId);
     return body || null;
   };
   const shutdown = async () => {

server/providers/cctv/taiwan.js

@@ -1,303 +0,0 @@
-import { CCTV_SOURCE_FETCH_TIMEOUT_MS } from './constants.js';
-import {
-  cameraDisplayCode,
-  fallbackHeadingFromId,
-  prioritizeSources,
-} from './normalize.js';
-import { readResponseTextCapped } from '../common/http.js';
-
-/** Freeway Bureau (MOTC) CCTV static table in the national MOTC 2.0 XML
- * standard, published keyless and refreshed daily (~1,800 cameras). */
-export const TAIWAN_FREEWAY_CCTV_URL =
-  'https://tisvcloud.freeway.gov.tw/history/motc20/CCTV.xml';
-/** The whole network is ~1.2 MB. */
-export const TAIWAN_MAX_CATALOG_BYTES = 6 * 1024 * 1024;
-export const DEFAULT_TAIWAN_MAX_SOURCES = 600;
-/** After a failed download, wait this long before asking again. The catalog
- * host does not answer from some networks outside Taiwan, and every attempt
- * there holds the shared catalog refresh until the connect timeout. */
-export const TAIWAN_RETRY_AFTER_FAILURE_MS = 60 * 60 * 1000;
-/** The table is republished daily; a good copy stands in for a failed
- * download for up to this long. */
-export const TAIWAN_LAST_GOOD_MAX_AGE_MS = 24 * 60 * 60 * 1000;
-
-// The table publishes each camera's MJPEG stream. The same camera servers
-// answer a single JPEG for the same camera ID on a sibling path, which is what
-// the frame proxy can relay; only these exact pairs are ever registered.
-const STREAM_TO_FRAME = new Map([
-  ['cctvn.freeway.gov.tw', ['/abs2mjpg/bmjpg', '/abs2mjpg/jpg']],
-  ['cctvn5.freeway.gov.tw', ['/abs2mjpg/bmjpg', '/abs2mjpg/jpg']],
-  ['cctvc.freeway.gov.tw', ['/abs2mjpg/bmjpg', '/abs2mjpg/jpg']],
-  [
-    'cctvs.freeway.gov.tw',
-    ['/live-view/mjpg/video.cgi', '/live-view/jpg/image.cgi'],
-  ],
-]);
-
-const DIRECTIONS = { N: 'N', S: 'S', E: 'E', W: 'W' };
-
-/** Prioritization anchors, north to south, so a cap keeps the whole island
- * rather than only greater Taipei. */
-const ANCHORS = [
-  { lat: 25.033, lon: 121.5654 }, // Taipei
-  { lat: 24.9936, lon: 121.301 }, // Taoyuan
-  { lat: 24.8138, lon: 120.9675 }, // Hsinchu
-  { lat: 24.7021, lon: 121.7378 }, // Yilan
-  { lat: 24.1477, lon: 120.6736 }, // Taichung
-  { lat: 22.9999, lon: 120.227 }, // Tainan
-  { lat: 22.6273, lon: 120.3014 }, // Kaohsiung
-];
-
-/** Taiwan main island with slack for the coast; the freeway network has no
- * offshore-island cameras. */
-export function isLikelyTaiwanCoordinate(lat, lon) {
-  return (
-    Number.isFinite(lat) &&
-    Number.isFinite(lon) &&
-    lat >= 21.8 &&
-    lat <= 25.4 &&
-    lon >= 119.9 &&
-    lon <= 122.1
-  );
-}
-
-const XML_ENTITIES = {
-  amp: '&',
-  lt: '<',
-  gt: '>',
-  quot: '"',
-  apos: "'",
-};
-
-function codePoint(value, radix) {
-  const code = parseInt(value, radix);
-  return Number.isInteger(code) && code > 0 && code <= 0x10ffff
-    ? String.fromCodePoint(code)
-    : '';
-}
-
-function decodeXml(text) {
-  return String(text ?? '')
-    .replace(
-      /&(?:(amp|lt|gt|quot|apos)|#(\d{1,7})|#x([0-9a-fA-F]{1,6}));/g,
-      (_, name, dec, hex) =>
-        name ? XML_ENTITIES[name] : codePoint(dec ?? hex, dec ? 10 : 16),
-    )
-    .trim();
-}
-
-function tag(block, name) {
-  const match = new RegExp(`<${name}>([^<]*)</${name}>`).exec(block);
-  return match ? decodeXml(match[1]) : '';
-}
-
-/**
- * Parse the MOTC 2.0 `CCTVList` document into flat rows. Regex-based like the
- * Catalonia and Tarktee parsers: the schema is flat, and only the fields used
- * below are read.
- *
- * @param {string} xml
- * @returns {Array<object>}
- */
-export function parseTaiwanCctvXml(xml) {
-  const rows = [];
-  const blockRe = /<CCTV>([\s\S]*?)<\/CCTV>/g;
-  let match;
-  while ((match = blockRe.exec(String(xml || ''))) !== null) {
-    const block = match[1];
-    rows.push({
-      cctvId: tag(block, 'CCTVID'),
-      streamUrl: tag(block, 'VideoStreamURL'),
-      lat: Number(tag(block, 'PositionLat')),
-      lon: Number(tag(block, 'PositionLon')),
-      roadName: tag(block, 'RoadName'),
-      direction: tag(block, 'RoadDirection'),
-      sectionStart: tag(block, 'Start'),
-      sectionEnd: tag(block, 'End'),
-      mile: tag(block, 'LocationMile'),
-    });
-  }
-  return rows;
-}
-
-/**
- * Published MJPEG stream URL -> the same camera's still, plus the host and
- * camera number that identify it, or null.
- *
- * @param {string} streamUrl
- * @returns {?{frameUrl: string, host: string, camera: string}}
- */
-export function taiwanFrame(streamUrl) {
-  let url;
-  try {
-    url = new URL(String(streamUrl ?? ''));
-  } catch {
-    return null;
-  }
-  if (url.protocol !== 'https:' || url.username || url.password || url.port)
-    return null;
-  const paths = STREAM_TO_FRAME.get(url.hostname);
-  if (!paths || url.pathname !== paths[0]) return null;
-  const camera = url.searchParams.get('camera') || '';
-  if (!/^[A-Za-z0-9-]{1,40}$/.test(camera)) return null;
-  return {
-    // Reconstruct so extra query parameters cannot alter the request.
-    frameUrl: `https://${url.hostname}${paths[1]}?camera=${camera}`,
-    host: url.hostname.split('.')[0],
-    camera,
-  };
-}
-
-/**
- * One parsed Freeway Bureau row -> one catalog source, or null.
- *
- * @param {object} row - Output of parseTaiwanCctvXml.
- * @returns {?object}
- */
-export function taiwanCameraToSource(row) {
-  if (!row || typeof row !== 'object') return null;
-  const { lat, lon } = row;
-  if (!isLikelyTaiwanCoordinate(lat, lon)) return null;
-  const frame = taiwanFrame(row.streamUrl);
-  if (!frame) return null;
-  const imageUrl = frame.frameUrl;
-  // CCTVID carries Chinese place names and a few IDs repeat across distinct
-  // cameras, so the stable key is the camera server plus its camera number.
-  const rawId = String(row.cctvId ?? '')
-    .trim()
-    .slice(0, 80);
-  const cameraId = `tw-freeway-${frame.host}-${frame.camera.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('→');
-  // A bare carriageway letter is not a name; fall back to the published ID.
-  const name =
-    (road || mile || section
-      ? [road, direction, mile, section].filter(Boolean).join(' ')
-      : '') ||
-    rawId ||
-    `Freeway camera ${frame.camera}`;
-
-  return {
-    id: cameraId,
-    name: name.slice(0, 160),
-    // One island-wide category in the camera picker, like Finland and Norway.
-    city: 'Taiwan / 臺灣',
-    cityId: 'taiwan',
-    provider: 'Freeway Bureau, MOTC',
-    lat,
-    lon,
-    // The table gives the carriageway direction, not the camera's bearing,
-    // so the pose uses the shared low-confidence prior.
-    headingDeg: fallbackHeadingFromId(cameraId),
-    headingConfidence: 'low',
-    pitchDeg: -18,
-    fovDeg: 44,
-    rangeM: 145,
-    mountHeightM: 8,
-    feedType: 'image',
-    url: imageUrl,
-    snapshotUrl: imageUrl,
-    sourceKind: 'tw-freeway-motc',
-    license:
-      'Freeway Bureau, MOTC open data, Open Government Data License, Taiwan (Version 1.0)',
-    code: cameraDisplayCode(
-      `${road} ${mile}`.trim().toUpperCase() || frame.camera,
-    ),
-  };
-}
-
-let lastGood = null;
-let lastGoodAt = 0;
-let retryAfter = 0;
-
-/** Forget the last good table and any failure backoff (tests only). */
-export function resetTaiwanSourcesCache() {
-  lastGood = null;
-  lastGoodAt = 0;
-  retryAfter = 0;
-}
-
-function fallbackSources() {
-  return lastGood && Date.now() - lastGoodAt <= TAIWAN_LAST_GOOD_MAX_AGE_MS
-    ? lastGood
-    : [];
-}
-
-function taiwanSourceCap() {
-  const rawCap = Number(
-    process.env.CCTV_TAIWAN_MAX_SOURCES || DEFAULT_TAIWAN_MAX_SOURCES,
-  );
-  return Number.isFinite(rawCap)
-    ? Math.max(1, Math.min(2000, Math.floor(rawCap)))
-    : DEFAULT_TAIWAN_MAX_SOURCES;
-}
-
-/**
- * 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
- * last good table (up to a day old) and is not retried for an hour, so a host
- * that cannot reach the Freeway Bureau does not wait on it every refresh.
- *
- * @returns {Promise<Array<object>>}
- */
-export async function loadTaiwanSources() {
-  if (Date.now() < retryAfter) return fallbackSources();
-  try {
-    const signal = AbortSignal.timeout(CCTV_SOURCE_FETCH_TIMEOUT_MS);
-    const response = await fetch(
-      process.env.CCTV_TAIWAN_URL || TAIWAN_FREEWAY_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
-          ? 'catalog redirected; redirects are not followed'
-          : `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 = taiwanCameraToSource(row);
-      if (camera && !cameras.has(camera.id)) cameras.set(camera.id, camera);
-    }
-    if (!cameras.size) throw new Error('no usable cameras in the table');
-    const sources = prioritizeSources(
-      [...cameras.values()],
-      taiwanSourceCap(),
-      ANCHORS,
-    );
-    console.log(
-      `[CCTV] Loaded Taiwan camera sources: ${cameras.size} (using ${sources.length})`,
-    );
-    lastGood = sources;
-    lastGoodAt = Date.now();
-    retryAfter = 0;
-    return sources;
-  } catch (error) {
-    retryAfter = Date.now() + TAIWAN_RETRY_AFTER_FAILURE_MS;
-    const fallback = fallbackSources();
-    console.warn(
-      `[CCTV] Taiwan camera download failed (${error?.message || error}); ` +
-        (fallback.length
-          ? `serving the last good ${fallback.length} cameras`
-          : 'no Taiwan cameras') +
-        ', next attempt in 1 h',
-    );
-    return fallback;
-  }
-}

src/annotations/adminOutline.test.mjs

@@ -120,93 +120,6 @@ test('Georgia resolves from camera geography without a geocoder', async () => {
   assert.deepEqual(geocodes, []);
 });
 
-test('Gold Coast in Australia cannot acquire its West African namesake outline', async () => {
-  for (const types of [['locality', 'political'], ['natural_feature']]) {
-    const { resolve, geocodes } = harness({
-      lat: -28.0167,
-      lng: 153.4,
-      label: 'Gold Coast, Australia',
-      name: 'Gold Coast',
-      types,
-    });
-    const resolved = await resolve('Gold Coast', viewerAt(-28.0167, 153.4));
-    assert.equal(resolved?.source, 'geocode');
-    assert.equal(resolved.lat, -28.0167);
-    assert.equal(resolved.lon, 153.4);
-    assert.equal(resolved.naturalRegion, undefined);
-    const outline = await resolved.resolveOutline();
-    assert.equal(outline?.naturalRegion, undefined);
-    assert.deepEqual(geocodes, ['Gold Coast']);
-  }
-});
-
-test('natural annotation outlines require a geocoded anchor', async () => {
-  for (const viewer of [AUSTIN, {}, viewerAt(46.5, 10, 248_000)]) {
-    const miss = harness();
-    assert.equal(await miss.resolve('the Alps', viewer), null);
-    assert.ok(miss.geocodes.includes('the Alps'));
-  }
-  const anchored = harness({
-    lat: 46.5,
-    lng: 10,
-    label: 'Alps',
-    name: 'Alps',
-    types: ['natural_feature'],
-  });
-  const resolved = await anchored.resolve('the Alps', {});
-  assert.equal(resolved.source, 'geocode');
-  const outline = await resolved.resolveOutline();
-  assert.equal(outline.naturalRegion, 'Alps');
-  assert.ok(outline.ring.length >= 8);
-});
-
-test('overlapping natural candidates continue through geocoding without choosing a ring', async () => {
-  const { resolve, geocodes } = harness({
-    lat: 45.6336,
-    lng: -74.86493,
-    label: 'Canadian Shield',
-    name: 'Canadian Shield',
-    types: ['natural_feature'],
-  });
-  const resolved = await resolve(
-    'Canadian Shield',
-    viewerAt(45.6336, -74.86493),
-  );
-  assert.equal(resolved?.source, 'geocode');
-  assert.equal((await resolved.resolveOutline())?.naturalRegion, undefined);
-  assert.deepEqual(geocodes, ['Canadian Shield']);
-});
-
-test('geocoded natural outlines respect district and around intent', async () => {
-  for (const extra of [
-    { entityKind: 'district' },
-    { intent: 'around_the_thing' },
-  ]) {
-    const { resolve, geocodes } = harness({
-      lat: 46.5,
-      lng: 10,
-      label: 'Alps',
-      name: 'Alps',
-      types:
-        extra.entityKind === 'district' ? ['locality'] : ['natural_feature'],
-    });
-    const resolved = await resolve('the Alps', viewerAt(46.5, 10), extra);
-    assert.ok(geocodes.includes('the Alps'));
-    assert.equal((await resolved.resolveOutline())?.naturalRegion, undefined);
-  }
-});
-
-test('cancellation while a bundled admin lookup is pending cannot publish an annotation', async () => {
-  const controller = new AbortController();
-  const { resolve, geocodes } = harness();
-  const pending = resolve('the Alps', viewerAt(46.5, 10), {
-    signal: controller.signal,
-  });
-  controller.abort();
-  await assert.rejects(pending, { name: 'AbortError' });
-  assert.deepEqual(geocodes, []);
-});
-
 test('country asks and geocoded country scopes use the bundled outline', async () => {
   const direct = harness();
   for (const name of ['Switzerland', 'Iran', 'France', 'Japan']) {

src/annotations/drawTool.js

@@ -30,7 +30,6 @@
  * at finish, deliberately and in one place — see `finishSpec` in drawMode.js.
  */
 import * as Cesium from 'cesium';
-import { createSegmentedControl } from '../ui/segmentedControl.js';
 import { pickWorldFromScreen } from './annotationResolver.js';
 import {
   claimPointer,
@@ -433,21 +432,22 @@ export function initDrawTool({ viewer, annotations }) {
   const shapeButtons = [
     ...(modeRow?.querySelectorAll('.pp-mode-btn[data-shape]') || []),
   ];
-  const shapeControl = createSegmentedControl({
-    buttons: shapeButtons,
-    valueOf: (button) => button.dataset.shape,
-    listen,
-    onChange: (value) => {
-      shape = normalizeShape(value);
-      shapeControl.update(shape);
+  for (const btn of shapeButtons) {
+    listen(btn, 'click', () => {
+      shape = normalizeShape(btn.dataset.shape);
+      for (const other of shapeButtons) {
+        const on = other === btn;
+        other.classList.toggle('active', on);
+        other.setAttribute('aria-checked', String(on));
+      }
       if (active) {
         generation += 1;
         session = createDrawSession(shape);
         cursor = null;
         syncPreview();
       }
-    },
-  });
+    });
+  }
   listen(colorSelect, 'change', () => {
     color = COLORS.includes(colorSelect.value) ? colorSelect.value : 'primary';
     syncPreview();

src/annotations/regionRing.test.mjs

@@ -44,115 +44,10 @@ test('region ring: Natural Earth names resolve without a geocoder', async () =>
   for (const name of ['Gulf of Mexico', 'the Alps']) {
     const region = await resolveRegionRingForQuery(name);
     assert.ok(region?.ring?.length >= 3, `${name} resolves to a ring`);
-    assert.equal(region.source, 'natural-earth');
     assert.equal(region.error, undefined);
   }
 });
 
-test('region ring: duplicate natural names need a containing geocoded anchor', async () => {
-  const { resolveRegionRingForQuery } = createAnnotationResolver({
-    featureSource: featureSource(),
-  });
-  const miss = geocoderFor(null);
-  assert.equal(
-    await resolveRegionRingForQuery('Cordillera Oriental', undefined, miss),
-    null,
-  );
-  assert.deepEqual(miss.calls, ['Cordillera Oriental']);
-
-  const inside = geocoderFor({
-    lat: 5,
-    lng: -73,
-    label: 'Cordillera Oriental',
-    name: 'Cordillera Oriental',
-    types: ['natural_feature'],
-  });
-  const region = await resolveRegionRingForQuery(
-    'Cordillera Oriental',
-    undefined,
-    inside,
-  );
-  assert.equal(region?.source, 'natural-earth');
-  assert.equal(region.name, 'Cordillera Oriental');
-  assert.ok(region.ring.length >= 8);
-  assert.deepEqual(inside.calls, ['Cordillera Oriental']);
-});
-
-test('region ring: outside and overlapping geocoded natural anchors stay unresolved', async () => {
-  const { resolveRegionRingForQuery } = createAnnotationResolver({
-    featureSource: featureSource(),
-  });
-  for (const [name, lat, lng] of [
-    ['Cordillera Oriental', 30.27, -97.74],
-    ['Canadian Shield', 45.6336, -74.86493],
-  ]) {
-    const geocoder = geocoderFor({
-      lat,
-      lng,
-      label: name,
-      name,
-      types: ['natural_feature'],
-    });
-    assert.equal(
-      await resolveRegionRingForQuery(name, undefined, geocoder),
-      null,
-    );
-    assert.deepEqual(geocoder.calls, [name]);
-  }
-});
-
-test('region ring: geocoded administrative scope wins over duplicate natural geography', async () => {
-  const lookups = [];
-  const { resolveRegionRingForQuery } = createAnnotationResolver({
-    featureSource: featureSource({
-      getAdministrativeAreas: async (point) => {
-        lookups.push(point);
-        return [];
-      },
-    }),
-  });
-  const geo = geocoderFor({
-    lat: 5,
-    lng: -73,
-    label: 'Cordillera Oriental',
-    name: 'Cordillera Oriental',
-    types: ['locality'],
-  });
-  const resolved = await resolveRegionRingForQuery(
-    'Cordillera Oriental',
-    undefined,
-    geo,
-  );
-  assert.equal(
-    resolved,
-    null,
-    'an unavailable city boundary is not a natural-region outline',
-  );
-  assert.deepEqual(lookups, [{ lat: 5, lon: -73 }]);
-  assert.deepEqual(geo.calls, ['Cordillera Oriental']);
-});
-
-test('region ring: cancellation during bundled lookup and geocode never returns a region', async () => {
-  const { resolveRegionRingForQuery } = createAnnotationResolver({
-    featureSource: featureSource(),
-  });
-  const controller = new AbortController();
-  const pending = resolveRegionRingForQuery('the Alps', controller.signal);
-  controller.abort();
-  await assert.rejects(pending, { name: 'AbortError' });
-
-  const later = new AbortController();
-  await assert.rejects(
-    resolveRegionRingForQuery('Cordillera Oriental', later.signal, {
-      async geocode() {
-        later.abort();
-        return { place: null };
-      },
-    }),
-    { name: 'AbortError' },
-  );
-});
-
 test('region ring: a slow admin-boundary lookup returns region-timeout within the budget', async () => {
   let adminSignal;
   let release;
@@ -224,7 +119,6 @@ test('region ring: bundled states and counties resolve without a geocoder', asyn
   ]) {
     const region = await resolveRegionRingForQuery(query, undefined, geocoder);
     assert.equal(region?.name, name, query);
-    assert.equal(region.source, 'bundled-admin');
     assert.ok(region.ring.length >= 8, `${query} has a real ring`);
   }
   assert.deepEqual(geocoder.calls, [], 'no geocoding');

src/annotations/resolver.js

@@ -444,7 +444,6 @@ export function createAnnotationResolver({
      * AFTER the anchor mark is drawn and upgrade the mark in place.
      */
     const resolveOutline = async () => {
-      signal?.throwIfAborted();
       let scope = baseScope;
       const isAdmin =
         scope === 'country' ||
@@ -470,7 +469,6 @@ export function createAnnotationResolver({
         const ne = await lookupNaturalRegionOutline(target, lat, lon).catch(
           () => null,
         );
-        signal?.throwIfAborted();
         if (ne) {
           registerDynamicCredit(viewer, NATURAL_EARTH_CREDIT);
           const neCentroid = ringCentroid(ne.ring);
@@ -2006,8 +2004,8 @@ export function createAnnotationResolver({
   /**
    * Region ring for ANALYST queries ("how many flights over Texas / the Alps") —
    * a name-only entry point that reuses this module's boundary machinery
-   * without the annotation pipeline. Unique Natural Earth names resolve first
-   * (offline); duplicate names require a geocoded containment anchor, then
+   * without the annotation pipeline. Natural Earth pack first (offline,
+   * instant; largest-area match is correct for a global name-only ask), then
    * geocode + admin boundary for states/countries/counties (Tier A disk-cached
    * Overpass, so repeat asks are instant). Returns null when the name doesn't
    * resolve to a region-like boundary — the analyst engine reports that
@@ -2022,7 +2020,7 @@ export function createAnnotationResolver({
    * @param {AbortSignal} [signal]
    * @param {object} [placeSearch]
    * @param {{budgetMs?: number}} [options]  `Infinity` waits for the lookup.
-   * @returns {Promise<{name:string, ring:Array<[number,number]>, source:string}|{name:string, ring:null, error:'region-timeout'}|null>}
+   * @returns {Promise<{name:string, ring:Array<[number,number]>}|{name:string, ring:null, error:'region-timeout'}|null>}
    */
   async function resolveRegionRingForQuery(
     name,
@@ -2039,24 +2037,16 @@ export function createAnnotationResolver({
     const q = String(name || '').trim();
     if (!q) return null;
     const ne = await findNaturalRegion(q).catch(() => null);
-    signal?.throwIfAborted();
-    if (ne?.candidates === 1 && ne.polygons?.length) {
+    if (ne?.polygons?.length) {
       // Largest ring carries the query scope; multi-ring regions (Andes) keep
       // their main cordillera — good enough for containment counting.
       const ring = [...ne.polygons].sort((a, b) => b.length - a.length)[0];
-      if (ring?.length >= 3)
-        return { name: ne.name, ring, source: 'natural-earth' };
+      if (ring?.length >= 3) return { name: ne.name, ring };
     }
     // Bundled states/provinces/counties by name (offline); the main part only,
     // like the Natural Earth rung above.
     const admin = await findAdminArea(q).catch(() => null);
-    signal?.throwIfAborted();
-    if (admin)
-      return {
-        name: admin.name,
-        ring: [...admin.ring],
-        source: 'bundled-admin',
-      };
+    if (admin) return { name: admin.name, ring: [...admin.ring] };
     const lookup = resolveAdminRegionRing(q, signal, placeSearch);
     if (!Number.isFinite(budgetMs)) return lookup;
     let timer;
@@ -2077,26 +2067,8 @@ export function createAnnotationResolver({
     const geo = await geocodePlace(q, null, signal, placeSearch).catch(
       () => null,
     );
-    signal?.throwIfAborted();
     if (!geo) return null;
     const scope = scopeFromTypes(geo.types);
-    if (
-      scope === 'auto' ||
-      (scope === 'compound' && geo.types?.includes('natural_feature'))
-    ) {
-      const natural = await lookupNaturalRegionOutline(
-        q,
-        geo.lat,
-        geo.lon,
-      ).catch(() => null);
-      signal?.throwIfAborted();
-      if (natural)
-        return {
-          name: natural.name,
-          ring: natural.ring,
-          source: 'natural-earth',
-        };
-    }
     if (!['country', 'state', 'county', 'city'].includes(scope)) return null;
     if (scope === 'state' || scope === 'county' || scope === 'country') {
       const admin = await findAdminAreaAt(
@@ -2105,16 +2077,12 @@ export function createAnnotationResolver({
         geo.lon,
         scope,
       ).catch(() => null);
-      signal?.throwIfAborted();
-      if (admin)
-        return { name: q, ring: [...admin.ring], source: 'bundled-admin' };
+      if (admin) return { name: q, ring: [...admin.ring] };
     }
     const fp = await fetchAdminArea(geo.lat, geo.lon, q, scope, signal).catch(
       () => null,
     );
-    signal?.throwIfAborted();
-    if (fp?.ring?.length >= 3)
-      return { name: q, ring: fp.ring, source: 'remote-boundary' };
+    if (fp?.ring?.length >= 3) return { name: q, ring: fp.ring };
     return null;
   }
 

src/cockpitMarkup.test.mjs

@@ -693,7 +693,10 @@ test('fresh Cockpit entry temporarily collapses map panels and exit restores the
   }
 
   assert.match(ui, /onEntered: \(\) => this\.enterPanels\(\)/);
-  assert.match(ui, /enterPanels: \(\) => this\._panelChrome\.enterCockpit\(\)/);
+  assert.match(
+    ui,
+    /enterPanels: \(\) => \{[^}]*this\._panelChrome\.enterCockpit\(\);\s*\}/,
+  );
   const callback = { 1: shellMethod('enterCockpit').toString() };
   assert.ok(callback, 'Cockpit onEntered callback is missing');
   assert.match(

src/data/analystEngine.js

@@ -881,7 +881,6 @@ export function createAnalystEngine(providers) {
       followUp && !spec.scope ? lastResult.distanceOf || null : null;
     let resolvedScope = null;
     let scopeNote = rememberedScope?.coverage || 'anywhere';
-    let scopeSource = rememberedScope?.source || null;
     // Human phrasing for the same scope, so every spoken count can name what it
     // measured ("8 in view", "about 30 within 250 km of Austin") instead of
     // arriving as a bare number that contradicts the panel.
@@ -891,16 +890,8 @@ export function createAnalystEngine(providers) {
     // further when a new scope is given.
     const scope = spec.scope || { kind: followUp ? 'anywhere' : 'view' };
     if (scope.kind === 'region') {
-      let region;
-      try {
-        region = await providers.resolveRegionRing(scope.name, signal);
-      } catch (error) {
-        // Cancellation belongs to the query owner, not an error's name: a
-        // resource-local AbortError from a current lookup still propagates.
-        if (signal?.aborted || !isCurrent()) return cancelled();
-        throw error;
-      }
-      if (signal?.aborted || !isCurrent()) return cancelled();
+      const region = await providers.resolveRegionRing(scope.name, signal);
+      if (!isCurrent()) return cancelled();
       if (region?.error === 'region-timeout') {
         return {
           ok: false,
@@ -919,7 +910,6 @@ export function createAnalystEngine(providers) {
       }
       resolvedScope = region;
       scopeNote = `region:${region.name}`;
-      scopeSource = region.source || null;
       scopeLabel = `over ${region.name}`;
       scopeDetail = scopeLabel;
     } else if (scope.kind === 'radius') {
@@ -1059,7 +1049,6 @@ export function createAnalystEngine(providers) {
         layersQueried,
         records: totals,
         scope: scopeNote,
-        ...(scopeSource ? { scopeSource } : {}),
         ...(rememberedScope?.note ? { note: rememberedScope.note } : {}),
         ...(queriedSnapshots.length
           ? { feedProvenance: feedProvenanceEnvelope(queriedSnapshots) }
@@ -1092,7 +1081,6 @@ export function createAnalystEngine(providers) {
         label: memoryOverride?.scopeLabel || result.scopeLabel,
         detail: memoryOverride?.scopeDetail || result.display.scope,
         coverage: committedCoverage.scope,
-        source: committedCoverage.scopeSource || null,
         note: committedCoverage.note || null,
       },
     };

src/data/analystEngine.test.mjs

@@ -1,8 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { createAnalystEngine, applyScope, haversineKm } from './analystEngine.js';
-import { createAnnotationResolver } from '../annotations/resolver.js';
-import { FEATURE_SOURCE_METHODS } from '../sources/featureSource.js';
 
 // Stub world: a square "Texland" region, flights + ships + fires around it.
 const TEXLAND = { name: 'Texland', ring: [[-100, 28], [-94, 28], [-94, 33], [-100, 33]] };
@@ -133,175 +131,6 @@ test('analyst: count flights over a region', async () => {
   assert.ok(r.coverage.scope.includes('Texland'));
 });
 
-test('analyst: region coverage identifies the source of the boundary used for counting', async () => {
-  for (const source of ['natural-earth', 'bundled-admin', 'remote-boundary']) {
-    const engine = createAnalystEngine({
-      getRecords: () => FLIGHTS,
-      resolveRegionRing: async () => ({ ...TEXLAND, source }),
-    });
-    const result = await engine.query({
-      layers: ['flights'],
-      scope: { kind: 'region', name: 'Texland' },
-    });
-
-    assert.equal(result.ok, true);
-    assert.equal(result.count, 3, 'the boundary excludes the Oregon flight');
-    assert.equal(result.coverage.scope, 'region:Texland');
-    assert.equal(result.coverage.scopeSource, source);
-  }
-});
-
-test('analyst: filter-only follow-ups retain the region source without resolving again', async () => {
-  const lookups = [];
-  const engine = createAnalystEngine({
-    getRecords: () => FLIGHTS,
-    resolveRegionRing: async (name) => {
-      lookups.push(name);
-      return { ...TEXLAND, source: 'natural-earth' };
-    },
-  });
-  const first = await engine.query({
-    layers: ['flights'],
-    scope: { kind: 'region', name: 'Texland' },
-  });
-  const airborne = await engine.query({
-    followUp: true,
-    filters: [{ field: 'onGround', op: 'eq', value: false }],
-  });
-  const military = await engine.query({
-    followUp: true,
-    filters: [{ field: 'military', op: 'eq', value: true }],
-  });
-
-  assert.equal(first.count, 3);
-  assert.equal(airborne.count, 2);
-  assert.deepEqual(military.items.map((item) => item.id), ['RCH01']);
-  for (const result of [first, airborne, military]) {
-    assert.equal(result.coverage.scope, 'region:Texland');
-    assert.equal(result.scopeLabel, 'over Texland');
-    assert.equal(result.coverage.scopeSource, 'natural-earth');
-  }
-  assert.deepEqual(lookups, ['Texland']);
-});
-
-test('analyst: an explicit replacement region replaces retained provenance', async () => {
-  const engine = createAnalystEngine({
-    getRecords: () => FLIGHTS,
-    resolveRegionRing: async (name) => name === 'Texland'
-      ? { ...TEXLAND, source: 'natural-earth' }
-      : {
-        name,
-        ring: [[-98, 30.5], [-96, 30.5], [-96, 31.5], [-98, 31.5]],
-        source: 'remote-boundary',
-      },
-  });
-  await engine.query({
-    layers: ['flights'],
-    scope: { kind: 'region', name: 'Texland' },
-  });
-  const replacement = await engine.query({
-    followUp: true,
-    scope: { kind: 'region', name: 'Northern Texland' },
-  });
-  const followUp = await engine.query({ followUp: true });
-
-  for (const result of [replacement, followUp]) {
-    assert.deepEqual(result.items.map((item) => item.id), ['RCH01']);
-    assert.equal(result.coverage.scope, 'region:Northern Texland');
-    assert.equal(result.coverage.scopeSource, 'remote-boundary');
-  }
-});
-
-test('analyst: an explicit scope without provenance clears the retained region source', async () => {
-  for (const scope of [
-    { kind: 'anywhere' },
-    { kind: 'view' },
-    { kind: 'radius', km: 150 },
-    { kind: 'region', name: 'Uncredited Texland' },
-  ]) {
-    const engine = createAnalystEngine({
-      getRecords: () => FLIGHTS,
-      resolveRegionRing: async (name) => ({
-        ...TEXLAND,
-        name,
-        ...(name === 'Texland' ? { source: 'natural-earth' } : {}),
-      }),
-      getViewContext: () => ({ lat: 30.27, lon: -97.74, viewRadiusKm: 150 }),
-    });
-    const first = await engine.query({
-      layers: ['flights'],
-      scope: { kind: 'region', name: 'Texland' },
-    });
-    const replacement = await engine.query({ followUp: true, scope });
-    const followUp = await engine.query({ followUp: true });
-
-    assert.equal(first.coverage.scopeSource, 'natural-earth');
-    for (const result of [replacement, followUp]) {
-      assert.equal(result.ok, true, scope.kind);
-      assert.equal(result.count, 3, scope.kind);
-      assert.equal(Object.hasOwn(result.coverage, 'scopeSource'), false, scope.kind);
-      assert.notEqual(result.coverage.scope, first.coverage.scope, scope.kind);
-    }
-  }
-});
-
-for (const [label, committedScope, scopeSource] of [
-  ['replacement boundary source', 'region:Presented Texland', 'remote-boundary'],
-  ['window without a boundary source', 'window:presented', null],
-]) {
-  test(`analyst: pre-commit displayed cohort retains ${label} and its feed provenance`, async () => {
-    const committedSnapshot = {
-      id: 'flights', enabled: true, feedState: 'stale',
-      source: 'displayed-cohort-feed', lastUpdate: 1_800_000_000_000,
-    };
-    let reads = 0;
-    let lookups = 0;
-    const engine = createAnalystEngine({
-      getRecords: () => { reads++; return FLIGHTS; },
-      getLayerSnapshot: () => ({
-        id: 'flights', enabled: true, feedState: 'nominal', source: 'current-feed',
-      }),
-      resolveRegionRing: async () => {
-        lookups++;
-        return { ...TEXLAND, source: 'natural-earth' };
-      },
-    });
-    await engine.query(
-      { layers: ['flights'], scope: { kind: 'region', name: 'Texland' } },
-      {
-        beforeCommit: async (result) => {
-          assert.equal(result.count, 3);
-          assert.equal(result.coverage.scopeSource, 'natural-earth');
-          const { scopeSource: _originalSource, ...coverage } = result.coverage;
-          return {
-            matched: [{ key: 'flights', rows: [FLIGHTS[1]] }],
-            scopeLabel: 'the presented cohort',
-            scopeDetail: 'the presented cohort window',
-            coverage: {
-              ...coverage,
-              scope: committedScope,
-              ...(scopeSource ? { scopeSource } : {}),
-              feedProvenance: { layers: [committedSnapshot] },
-            },
-          };
-        },
-      },
-    );
-    const followUp = await engine.query({ followUp: true });
-    assert.equal(followUp.count, 1);
-    assert.deepEqual(followUp.items.map((item) => item.id), ['RCH01']);
-    assert.equal(followUp.scopeLabel, 'the presented cohort');
-    assert.equal(followUp.display.scope, 'the presented cohort window');
-    assert.equal(followUp.coverage.scope, committedScope);
-    if (scopeSource) assert.equal(followUp.coverage.scopeSource, scopeSource);
-    else assert.equal(Object.hasOwn(followUp.coverage, 'scopeSource'), false);
-    assert.equal(followUp.coverage.feedProvenance.overall, 'stale');
-    assert.deepEqual(followUp.coverage.feedProvenance.layers, [committedSnapshot]);
-    assert.equal(reads, 1, 'displayed cohort is not replaced by another feed read');
-    assert.equal(lookups, 1, 'follow-up retains the committed scope without resolving again');
-  });
-}
-
 test('analyst: attribute filter — above 40,000 ft (~12,192 m)', async () => {
   const r = await makeEngine().query({
     layers: ['flights'], scope: { kind: 'anywhere' },
@@ -488,138 +317,6 @@ test('analyst: region lookup receives and obeys the owning action signal', async
   assert.equal(result.cancelled, true);
 });
 
-for (const [label, reason, trackAuthority] of [
-  ['default abort reason', undefined, false],
-  ['custom error reason', new Error('operator stopped'), false],
-  ['primitive reason and revoked authority', 'operator stopped', true],
-]) {
-  test(`analyst: real region resolver cancellation preserves memory (${label})`, async () => {
-    const started = Promise.withResolvers();
-    const geocode = Promise.withResolvers();
-    const controller = new AbortController();
-    const lookups = [];
-    const { resolveRegionRingForQuery } = createAnnotationResolver({
-      featureSource: Object.fromEntries(FEATURE_SOURCE_METHODS.map((method) => [
-        method,
-        async () => { throw new Error('offline region query reached feature source'); },
-      ])),
-    });
-    const placeSearch = {
-      geocode(name, { signal }) {
-        lookups.push(name);
-        assert.equal(signal, controller.signal);
-        started.resolve();
-        return geocode.promise;
-      },
-    };
-    const engine = createAnalystEngine({
-      getRecords: () => FLIGHTS,
-      resolveRegionRing: (name, signal) => resolveRegionRingForQuery(
-        name, signal, placeSearch, { budgetMs: Infinity },
-      ),
-    });
-    const first = await engine.query({
-      layers: ['flights'], scope: { kind: 'region', name: 'Texas' },
-    });
-    assert.equal(first.ok, true);
-    assert.equal(first.coverage.scopeSource, 'bundled-admin');
-    assert.deepEqual(first.items.map((item) => item.id), ['SWA1', 'RCH01', 'GND1']);
-    let commits = 0;
-    const pending = engine.query(
-      { layers: ['flights'], scope: { kind: 'region', name: 'Cordillera Oriental' } },
-      {
-        signal: controller.signal,
-        ...(trackAuthority ? { isCurrent: () => !controller.signal.aborted } : {}),
-        beforeCommit: async () => { commits++; },
-      },
-    );
-    await started.promise;
-    controller.abort(reason);
-    // Let an actual late geocode result cross the resolver's post-await check.
-    geocode.resolve({ place: {
-      lat: 5, lng: -73, label: 'Cordillera Oriental',
-      name: 'Cordillera Oriental', types: ['natural_feature'],
-    } });
-    const result = await pending;
-    assert.equal(result.ok, false);
-    assert.equal(result.code, 'CANCELLED');
-    assert.equal(result.cancelled, true);
-    assert.equal(commits, 0);
-    const followUp = await engine.query({ followUp: true });
-    assert.deepEqual(followUp.items.map((item) => item.id), first.items.map((item) => item.id));
-    assert.equal(followUp.coverage.scope, first.coverage.scope);
-    assert.equal(followUp.coverage.scopeSource, 'bundled-admin');
-    assert.equal(followUp.scopeLabel, first.scopeLabel);
-    assert.deepEqual(lookups, ['Cordillera Oriental'], 'follow-up does not resolve again');
-  });
-}
-
-test('analyst: a rejected superseded region lookup returns cancellation and retains its prior cohort', async () => {
-  const lookup = Promise.withResolvers();
-  let current = true;
-  const engine = createAnalystEngine({
-    getRecords: () => FLIGHTS,
-    resolveRegionRing: (name) => name === 'Texland'
-      ? { ...TEXLAND, source: 'natural-earth' }
-      : lookup.promise,
-  });
-  const first = await engine.query({ layers: ['flights'], scope: { kind: 'region', name: 'Texland' } });
-  const pending = engine.query(
-    { layers: ['flights'], scope: { kind: 'region', name: 'Replacement' } },
-    { isCurrent: () => current },
-  );
-  current = false;
-  lookup.reject(new Error('late lookup failed'));
-  assert.equal((await pending).code, 'CANCELLED');
-  const followUp = await engine.query({ followUp: true });
-  assert.deepEqual(followUp.items.map((item) => item.id), first.items.map((item) => item.id));
-  assert.equal(followUp.coverage.scopeSource, 'natural-earth');
-  assert.equal(followUp.coverage.scope, first.coverage.scope);
-});
-
-test('analyst: an aborted owner cannot commit a region provider that returns a late success', async () => {
-  const controller = new AbortController();
-  const lookup = Promise.withResolvers();
-  const engine = createAnalystEngine({
-    getRecords: () => FLIGHTS,
-    resolveRegionRing: () => lookup.promise,
-  });
-  const pending = engine.query(
-    { layers: ['flights'], scope: { kind: 'region', name: 'Texland' } },
-    { signal: controller.signal },
-  );
-  controller.abort();
-  lookup.resolve({ ...TEXLAND, source: 'natural-earth' });
-  assert.equal((await pending).code, 'CANCELLED');
-  assert.equal(engine.hasMemory(), false);
-});
-
-for (const error of [new Error('live lookup failed'), new DOMException('resource stopped', 'AbortError')]) {
-  test(`analyst: live region ${error.name} propagates without changing memory`, async () => {
-    const controller = new AbortController();
-    const engine = createAnalystEngine({
-      getRecords: () => FLIGHTS,
-      resolveRegionRing: async (name) => {
-        if (name === 'Texland') return { ...TEXLAND, source: 'natural-earth' };
-        throw error;
-      },
-    });
-    const first = await engine.query({ layers: ['flights'], scope: { kind: 'region', name: 'Texland' } });
-    await assert.rejects(
-      engine.query(
-        { layers: ['flights'], scope: { kind: 'region', name: 'Replacement' } },
-        { signal: controller.signal },
-      ),
-      (thrown) => thrown === error,
-    );
-    assert.equal(controller.signal.aborted, false);
-    const followUp = await engine.query({ followUp: true });
-    assert.deepEqual(followUp.items.map((item) => item.id), first.items.map((item) => item.id));
-    assert.equal(followUp.coverage.scope, first.coverage.scope);
-    assert.equal(followUp.coverage.scopeSource, 'natural-earth');
-  });
-}
-
 test('analyst: route fields queryable from cached enrichment only', async () => {
   const r = await makeEngine().query({
     layers: ['flights'], scope: { kind: 'anywhere' },

src/data/cctvCatalogCap.test.mjs

@@ -6,7 +6,6 @@ import {
 } from '../../server/providers/cctv/cap.js';
 import {
   CCTV_MAX_SOURCES_CEILING,
-  CCTV_SOURCE_CACHE_MS,
   DEFAULT_CCTV_MAX_SOURCES,
 } from '../../server/providers/cctv/constants.js';
 import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
@@ -161,224 +160,3 @@ test('a pack trimmed to its nearest cameras reports how many it offered', async
   assert.equal(kept.available, 5);
   assert.deepEqual(kept.region, { west: 0, south: 0, east: 0, north: 4 });
 });
-
-/** A CCTV_SOURCES_JSON value with `count` cameras named `<prefix>-<i>`. */
-const envSources = (prefix, count = 3) =>
-  JSON.stringify(
-    Array.from({ length: count }, (_, i) => ({
-      id: `${prefix}-${i}`,
-      name: `${prefix} ${i}`,
-      lat: 30 + i * 0.01,
-      lon: -97,
-      url: `https://example.test/${prefix}-${i}.jpg`,
-    })),
-  );
-
-/** Let a background refresh that needs no timers run to completion. */
-const settle = () => new Promise((resolve) => setTimeout(resolve, 10));
-
-/** Restore process.env to a snapshot taken with `{ ...process.env }`. */
-const restoreEnv = (saved) => {
-  for (const key of Object.keys(process.env)) {
-    if (!(key in saved)) delete process.env[key];
-  }
-  Object.assign(process.env, saved);
-};
-
-test('an expired catalog is served at once while a slow pack refreshes in the background', async (t) => {
-  const saved = { ...process.env };
-  try {
-    // Live packs run alongside the env pack, so one slow upstream can hold
-    // the refresh open.
-    process.env.CCTV_FORCE_AUSTIN = '1';
-    process.env.CCTV_SOURCES_FILE = '/nonexistent/cctv.json';
-    process.env.CCTV_SOURCES_JSON = envSources('old');
-    let now = 1_000_000;
-    t.mock.method(Date, 'now', () => now);
-    t.mock.method(console, 'warn', () => {});
-    t.mock.method(console, 'log', () => {});
-    const hung = [];
-    let hang = false;
-    t.mock.method(globalThis, 'fetch', () =>
-      hang
-        ? new Promise((_, reject) => {
-            hung.push(() => reject(new Error('upstream gave up')));
-          })
-        : Promise.reject(new Error('offline')),
-    );
-    const getSources = createCctvCatalog({ sourceRoot: '/nonexistent' });
-    assert.deepEqual(
-      (await getSources()).map((s) => s.id),
-      ['old-0', 'old-1', 'old-2'],
-    );
-
-    // Past the TTL, with every live pack's upstream hanging.
-    now += CCTV_SOURCE_CACHE_MS + 1;
-    hang = true;
-    process.env.CCTV_SOURCES_JSON = envSources('new');
-    let timer;
-    const served = await Promise.race([
-      getSources(),
-      new Promise((resolve) => {
-        timer = setTimeout(() => resolve('waited'), 200);
-      }),
-    ]);
-    clearTimeout(timer);
-    assert.notEqual(
-      served,
-      'waited',
-      'a stale request waited for the background refresh',
-    );
-    assert.deepEqual(
-      served.map((s) => s.id),
-      ['old-0', 'old-1', 'old-2'],
-    );
-
-    // Requests during the refresh share it rather than starting another.
-    const pause = () => new Promise((resolve) => setTimeout(resolve, 50));
-    await pause();
-    const inFlight = hung.length;
-    assert.ok(inFlight > 0, 'the refresh reached the hanging upstreams');
-    await getSources();
-    await getSources();
-    await pause();
-    assert.equal(hung.length, inFlight, 'only one refresh ran');
-
-    // When the slow pack gives up, the refreshed catalog replaces the old one.
-    hang = false;
-    for (const giveUp of hung) giveUp();
-    for (let i = 0; i < 50; i += 1) {
-      const ids = (await getSources()).map((s) => s.id);
-      if (ids[0] === 'new-0') break;
-      await new Promise((resolve) => setTimeout(resolve, 10));
-    }
-    assert.deepEqual(
-      (await getSources()).map((s) => s.id),
-      ['new-0', 'new-1', 'new-2'],
-    );
-  } finally {
-    restoreEnv(saved);
-  }
-});
-
-test('a failed background refresh keeps the catalog, warns once, and waits a TTL to retry', async (t) => {
-  const saved = { ...process.env };
-  const unhandled = [];
-  const onUnhandled = (reason) => unhandled.push(reason);
-  process.on('unhandledRejection', onUnhandled);
-  try {
-    process.env.CCTV_PREFER_AUSTIN = '0';
-    process.env.CCTV_SOURCES_FILE = '/nonexistent/cctv.json';
-    process.env.CCTV_SOURCES_JSON = envSources('old', 9);
-    process.env.CCTV_MAX_SOURCES = '8';
-    let now = 1_000_000;
-    t.mock.method(Date, 'now', () => now);
-    // Nine cameras over a cap of eight make every refresh warn; throwing from
-    // that warning is how this test makes a refresh reject.
-    let failRefresh = false;
-    let failedRefreshes = 0;
-    const warnings = [];
-    t.mock.method(console, 'warn', (...args) => {
-      const text = args.join(' ');
-      if (failRefresh && text.includes('exceeds cap')) {
-        failedRefreshes += 1;
-        throw new Error('refresh broke');
-      }
-      warnings.push(text);
-    });
-    const getSources = createCctvCatalog({ sourceRoot: '/nonexistent' });
-    const old = await getSources();
-    assert.equal(old.length, 8);
-
-    // Past the TTL the refresh throws: the old catalog is still served.
-    now += CCTV_SOURCE_CACHE_MS + 1;
-    failRefresh = true;
-    assert.equal(await getSources(), old);
-    await settle();
-    assert.equal(failedRefreshes, 1);
-    assert.equal(
-      warnings.filter((w) => w.includes('background catalog refresh failed'))
-        .length,
-      1,
-    );
-
-    // The failure is not retried on every request until the next TTL.
-    assert.equal(await getSources(), old);
-    assert.equal(await getSources(), old);
-    await settle();
-    assert.equal(failedRefreshes, 1, 'a failed refresh was retried at once');
-
-    // After it, a refresh that works replaces the catalog. With no live packs
-    // the refresh finishes before the request that started it returns.
-    now += CCTV_SOURCE_CACHE_MS + 1;
-    failRefresh = false;
-    process.env.CCTV_SOURCES_JSON = envSources('new');
-    await getSources();
-    await settle();
-    const fresh = await getSources();
-    assert.deepEqual(
-      fresh.map((s) => s.id),
-      ['new-0', 'new-1', 'new-2'],
-    );
-    // Trim notes stay with the list they describe, so a request served the
-    // old list during the refresh never reports the new list's notes.
-    assert.deepEqual(
-      getSources.trimmedPacks(old).map((p) => [p.pack, p.available, p.served]),
-      [['env', 9, 8]],
-    );
-    assert.deepEqual(getSources.trimmedPacks(fresh), []);
-    assert.deepEqual(getSources.trimmedPacks(), []);
-    assert.deepEqual(unhandled, []);
-  } finally {
-    process.off('unhandledRejection', onUnhandled);
-    restoreEnv(saved);
-  }
-});
-
-test('an empty background refresh keeps the catalog and waits a TTL before fetching again', async (t) => {
-  const saved = { ...process.env };
-  try {
-    process.env.CCTV_FORCE_AUSTIN = '1';
-    process.env.CCTV_SOURCES_FILE = '/nonexistent/cctv.json';
-    process.env.CCTV_SOURCES_JSON = envSources('old');
-    let now = 1_000_000;
-    t.mock.method(Date, 'now', () => now);
-    t.mock.method(console, 'log', () => {});
-    const warnings = [];
-    t.mock.method(console, 'warn', (...args) => warnings.push(args.join(' ')));
-    let fetches = 0;
-    t.mock.method(globalThis, 'fetch', () => {
-      fetches += 1;
-      return Promise.reject(new Error('offline'));
-    });
-    const getSources = createCctvCatalog({ sourceRoot: '/nonexistent' });
-    const old = await getSources();
-
-    // Past the TTL every pack comes back empty, as in an upstream outage.
-    now += CCTV_SOURCE_CACHE_MS + 1;
-    process.env.CCTV_SOURCES_JSON = '[]';
-    assert.equal(await getSources(), old);
-    for (let i = 0; i < 50; i += 1) {
-      if (warnings.some((w) => w.includes('source refresh returned empty')))
-        break;
-      await settle();
-    }
-    assert.ok(
-      warnings.some((w) => w.includes('serving 3 stale cameras')),
-      'the empty refresh kept the old catalog',
-    );
-
-    // Until the next TTL, requests are served without touching any upstream.
-    const fetchesAfterRefresh = fetches;
-    assert.equal(await getSources(), old);
-    assert.equal(await getSources(), old);
-    await settle();
-    assert.equal(
-      fetches,
-      fetchesAfterRefresh,
-      'an empty refresh reran at once',
-    );
-  } finally {
-    restoreEnv(saved);
-  }
-});

src/data/cctvEstonia.test.mjs

@@ -1,23 +1,11 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import {
-  TARKTEE_IMAGES_URL,
-  TARKTEE_LOCATIONS_URL,
-  TARKTEE_MAX_CATALOG_BYTES,
-} from '../../server/providers/cctv/constants.js';
 import {
   loadTallinnSourcesFromCatalog,
-  loadTarkteeSourcesFromDatex,
   parseTarkteeDatexImages,
   parseTarkteeDatexLocations,
 } from '../../server/providers/cctv/sources.js';
 
-/** Silence the loaders' progress and failure logging. */
-function quiet(t) {
-  t.mock.method(console, 'log', () => {});
-  t.mock.method(console, 'warn', () => {});
-}
-
 const SAMPLE_LOCATIONS_XML = `<?xml version="1.0" encoding="UTF-8"?>
 <d2LogicalModel xmlns="http://datex2.eu/schema/2/2_0">
   <payloadPublication>
@@ -96,193 +84,3 @@ test('Tarktee DATEX image parser rejects non-official hosts', () => {
   const images = parseTarkteeDatexImages(xml);
   assert.equal(images.size, 0);
 });
-
-test('Tarktee loader deduplicates cameras sharing an image number before the cap', async (t) => {
-  quiet(t);
-  const dupLocationsXml = `<?xml version="1.0" encoding="UTF-8"?>
-<d2LogicalModel xmlns="http://datex2.eu/schema/2/2_0">
-  <payloadPublication>
-    <predefinedLocationContainer id="TRAFFIC_CAMERAS" version="0">
-      <predefinedLocation id="loc-1" version="0">
-        <predefinedLocationName><values><value lang="et">Tallinn Ringtee</value></values></predefinedLocationName>
-        <location><pointByCoordinates><pointCoordinates><latitude>59.4370</latitude><longitude>24.7530</longitude></pointCoordinates></pointByCoordinates></location>
-      </predefinedLocation>
-      <predefinedLocation id="loc-2" version="0">
-        <predefinedLocationName><values><value lang="et">Tallinn Ringtee duplicate</value></values></predefinedLocationName>
-        <location><pointByCoordinates><pointCoordinates><latitude>59.4371</latitude><longitude>24.7531</longitude></pointCoordinates></pointByCoordinates></location>
-      </predefinedLocation>
-    </predefinedLocationContainer>
-  </payloadPublication>
-</d2LogicalModel>`;
-  const dupImagesXml = `<?xml version="1.0" encoding="UTF-8"?>
-<d2LogicalModel xmlns="http://datex2.eu/schema/2/2_0">
-  <payloadPublication>
-    <trafficView id="1"><linearTrafficView id="1"><linearPredefinedLocationReference id="loc-1"/><trafficViewRecord id="1-1"><urlLink><urlLinkAddress>https://tarktee.transpordiamet.ee/images/42/42_1.jpg</urlLinkAddress></urlLink></trafficViewRecord></linearTrafficView></trafficView>
-    <trafficView id="2"><linearTrafficView id="2"><linearPredefinedLocationReference id="loc-2"/><trafficViewRecord id="2-1"><urlLink><urlLinkAddress>https://tarktee.transpordiamet.ee/images/42/42_2.jpg</urlLinkAddress></urlLink></trafficViewRecord></linearTrafficView></trafficView>
-  </payloadPublication>
-</d2LogicalModel>`;
-
-  const seen = [];
-  t.mock.method(globalThis, 'fetch', async (url, init) => {
-    seen.push([String(url), init?.redirect]);
-    const body =
-      String(url) === TARKTEE_LOCATIONS_URL ? dupLocationsXml : dupImagesXml;
-    return new Response(body, {
-      status: 200,
-      headers: { 'Content-Type': 'application/xml' },
-    });
-  });
-
-  const cameras = await loadTarkteeSourcesFromDatex();
-  assert.deepEqual(seen, [
-    [TARKTEE_LOCATIONS_URL, 'manual'],
-    [TARKTEE_IMAGES_URL, 'manual'],
-  ]);
-  assert.equal(cameras.length, 1);
-  assert.equal(cameras[0].id, 'ee-tarktee-42');
-  assert.equal(cameras[0].name, 'Tallinn Ringtee');
-});
-
-test('Tarktee loader refuses a redirect and cancels both response bodies', async (t) => {
-  quiet(t);
-  const cancelled = { locations: false, images: false };
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    const isLocations = String(url) === TARKTEE_LOCATIONS_URL;
-    const body = new ReadableStream({
-      start(controller) {
-        controller.enqueue(new TextEncoder().encode('<xml/>'));
-      },
-      cancel() {
-        if (isLocations) cancelled.locations = true;
-        else cancelled.images = true;
-      },
-    });
-    return new Response(body, {
-      status: isLocations ? 302 : 200,
-      headers: isLocations ? { location: 'https://evil.example/loc.xml' } : {},
-    });
-  });
-
-  assert.deepEqual(await loadTarkteeSourcesFromDatex(), []);
-  assert.equal(cancelled.locations, true, 'redirected body is cancelled');
-  assert.equal(cancelled.images, true, 'sibling 200 body is also cancelled');
-});
-
-test('Tarktee loader cancels fulfilled bodies when either fetch rejects', async (t) => {
-  for (const failedUrl of [TARKTEE_LOCATIONS_URL, TARKTEE_IMAGES_URL]) {
-    for (const delayedSibling of [false, true]) {
-      await t.test(
-        `${failedUrl}, delayed sibling: ${delayedSibling}`,
-        async (t) => {
-          quiet(t);
-          let cancelled = false;
-          const response = new Response(
-            new ReadableStream({
-              start(controller) {
-                controller.enqueue(new TextEncoder().encode('<xml/>'));
-              },
-              cancel() {
-                cancelled = true;
-              },
-            }),
-          );
-          t.mock.method(globalThis, 'fetch', async (url) => {
-            if (String(url) === failedUrl) throw new TypeError('fetch failed');
-            if (delayedSibling) await new Promise(setImmediate);
-            return response;
-          });
-
-          try {
-            assert.deepEqual(await loadTarkteeSourcesFromDatex(), []);
-            assert.equal(
-              cancelled,
-              true,
-              'fulfilled sibling body is cancelled',
-            );
-          } finally {
-            await response.body.cancel();
-          }
-        },
-      );
-    }
-  }
-});
-
-test('Tarktee loader cancels the sibling body when one feed fails or overflows the byte cap', async (t) => {
-  quiet(t);
-  let siblingCancelled = false;
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    const isLocations = String(url) === TARKTEE_LOCATIONS_URL;
-    if (isLocations) {
-      return new Response('', { status: 503 });
-    }
-    const body = new ReadableStream({
-      start(controller) {
-        controller.enqueue(new TextEncoder().encode(SAMPLE_IMAGES_XML));
-      },
-      cancel() {
-        siblingCancelled = true;
-      },
-    });
-    return new Response(body, { status: 200 });
-  });
-
-  assert.deepEqual(await loadTarkteeSourcesFromDatex(), []);
-  assert.equal(
-    siblingCancelled,
-    true,
-    'sibling 200 stream is cancelled on 503',
-  );
-
-  let overflowSiblingCancelled = false;
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    const isLocations = String(url) === TARKTEE_LOCATIONS_URL;
-    if (isLocations) {
-      const padded =
-        SAMPLE_LOCATIONS_XML + ' '.repeat(TARKTEE_MAX_CATALOG_BYTES);
-      return new Response(padded, {
-        status: 200,
-        headers: { 'Content-Length': String(padded.length) },
-      });
-    }
-    const body = new ReadableStream({
-      start(controller) {
-        controller.enqueue(new TextEncoder().encode(SAMPLE_IMAGES_XML));
-      },
-      cancel() {
-        overflowSiblingCancelled = true;
-      },
-    });
-    return new Response(body, { status: 200 });
-  });
-
-  assert.deepEqual(await loadTarkteeSourcesFromDatex(), []);
-  assert.equal(
-    overflowSiblingCancelled,
-    true,
-    'sibling stream is cancelled when the other feed exceeds the byte cap',
-  );
-});
-
-test('Tarktee DATEX requests wait 30 s, past the slow answers measured live', async (t) => {
-  const timeouts = [];
-  const timeout = AbortSignal.timeout;
-  t.mock.method(AbortSignal, 'timeout', (ms) => {
-    timeouts.push(ms);
-    return timeout.call(AbortSignal, ms);
-  });
-  t.mock.method(console, 'log', () => {});
-  t.mock.method(
-    globalThis,
-    'fetch',
-    async (url) =>
-      new Response(
-        String(url).includes('roadCameraLocations')
-          ? SAMPLE_LOCATIONS_XML
-          : SAMPLE_IMAGES_XML,
-      ),
-  );
-  const cameras = await loadTarkteeSourcesFromDatex();
-  assert.deepEqual(timeouts, [30_000, 30_000]);
-  assert.equal(cameras.length, 1);
-});

src/data/cctvHk.test.mjs

@@ -1,464 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import {
-  hkCameraName,
-  hkCameraToSource,
-  hkImageUrlFromKey,
-  loadHkSourcesFromOpenData,
-  normalizeHkImageUrl,
-  parseHkCameraLocationsXml,
-} from '../../server/providers/cctv/sources.js';
-import {
-  DEFAULT_CCTV_MAX_SOURCES,
-  DEFAULT_HK_CAMERAS_URL,
-  DEFAULT_HK_MAX_SOURCES,
-  HK_ANCHORS,
-  HK_IMAGE_ORIGIN,
-  HK_MAX_CATALOG_BYTES,
-} from '../../server/providers/cctv/constants.js';
-import {
-  CAMERA_CODE_MAX_CHARS,
-  prioritizeSources,
-} from '../../server/providers/cctv/normalize.js';
-import { allocateSourceCap } from '../../server/providers/cctv/cap.js';
-import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
-
-/**
- * A response whose body is a live stream, plus a flag that flips when the
- * stream is cancelled. A rejection path that returns without cancelling holds
- * the transport open, so the flag is what the refusal tests actually assert.
- */
-const streamingResponse = (init = {}) => {
-  const state = { cancelled: false };
-  const body = new ReadableStream({
-    start(controller) {
-      controller.enqueue(new TextEncoder().encode('<image-list>'));
-    },
-    cancel() {
-      state.cancelled = true;
-    },
-  });
-  return { response: new Response(body, init), state };
-};
-
-/** One Transport Department `<image>` block as a parsed row. */
-const row = (overrides = {}) => ({
-  key: 'BC101F',
-  region: 'New Territories',
-  district: 'North',
-  description: 'San Tin Highway near Lok Ma Chau [BC101F]',
-  latitude: '22.508',
-  longitude: '114.078',
-  url: 'https://tdcctv.data.one.gov.hk/BC101F.JPG',
-  ...overrides,
-});
-
-/** Fixture XML matching the published English locations schema. */
-const fixtureXml = (...records) => {
-  const images = records
-    .map(
-      (record) => `
-	<image>
-		<key>${record.key}</key>
-		<region>${record.region}</region>
-		<district>${record.district}</district>
-		<description>${record.description}</description>
-		<latitude>${record.latitude}</latitude>
-		<longitude>${record.longitude}</longitude>
-		<url>${record.url}</url>
-	</image>`,
-    )
-    .join('');
-  return `<?xml version="1.0" encoding="UTF-8"?>\n<image-list>${images}\n</image-list>\n`;
-};
-
-test('an HK row maps to a source on the pinned HTTPS frame host', () => {
-  const source = hkCameraToSource(row());
-  assert.equal(source.id, 'hk-bc101f');
-  assert.equal(source.name, 'San Tin Highway near Lok Ma Chau [BC101F]');
-  assert.equal(source.cityId, 'hk');
-  assert.equal(source.provider, 'Transport Department');
-  assert.equal(source.lat, 22.508);
-  assert.equal(source.lon, 114.078);
-  assert.equal(source.feedType, 'image');
-  assert.equal(source.sourceKind, 'hk-td-open-data');
-  assert.equal(
-    source.license,
-    'Hong Kong Transport Department / DATA.GOV.HK — attribution required',
-  );
-  assert.equal(source.headingConfidence, 'low');
-  assert.ok(Number.isFinite(source.headingDeg));
-  assert.equal(source.url, 'https://tdcctv.data.one.gov.hk/BC101F.JPG');
-  assert.equal(source.url, source.snapshotUrl);
-  assert.ok(source.url.startsWith(HK_IMAGE_ORIGIN));
-});
-
-test('rows outside Hong Kong, off-host frames and unusable keys are dropped', () => {
-  assert.equal(
-    hkCameraToSource(row({ latitude: '43.6532', longitude: '-79.3832' })),
-    null,
-  );
-  assert.equal(hkCameraToSource(row({ latitude: '0', longitude: '0' })), null);
-  assert.equal(hkCameraToSource(row({ key: '' })), null);
-  assert.equal(hkCameraToSource(row({ key: 'bad key!' })), null);
-  assert.equal(
-    hkCameraToSource(row({ url: 'https://evil.example/BC101F.JPG' })),
-    null,
-  );
-  assert.equal(
-    hkCameraToSource(
-      row({
-        url: 'https://tdcctv.data.one.gov.hk.evil.test/BC101F.JPG',
-      }),
-    ),
-    null,
-  );
-  assert.equal(hkCameraToSource(row({ url: 'file:///etc/passwd' })), null);
-  assert.equal(hkCameraToSource(null), null);
-});
-
-test('frame URLs are rebuilt from the key and pinned to the TD host', () => {
-  assert.equal(
-    hkImageUrlFromKey('bc101f'),
-    'https://tdcctv.data.one.gov.hk/BC101F.JPG',
-  );
-  assert.equal(hkImageUrlFromKey(''), null);
-  assert.equal(hkImageUrlFromKey('bad/key'), null);
-
-  assert.equal(
-    normalizeHkImageUrl('http://tdcctv.data.one.gov.hk/H429F.JPG'),
-    'https://tdcctv.data.one.gov.hk/H429F.JPG',
-  );
-  assert.equal(
-    normalizeHkImageUrl('https://tdcctv.data.one.gov.hk/H429F.JPG'),
-    'https://tdcctv.data.one.gov.hk/H429F.JPG',
-  );
-  assert.equal(normalizeHkImageUrl(''), null);
-  assert.equal(normalizeHkImageUrl('not a url'), null);
-  assert.equal(normalizeHkImageUrl('https://evil.example/H429F.JPG'), null);
-});
-
-test('a nameless row still gets a label', () => {
-  assert.equal(
-    hkCameraName(
-      { description: '  Aberdeen Praya Road near Fish Market [H429F] ' },
-      'hk-h429f',
-    ),
-    'Aberdeen Praya Road near Fish Market [H429F]',
-  );
-  assert.equal(hkCameraName({ key: 'H429F' }, 'hk-h429f'), 'H429F');
-  assert.equal(hkCameraName({}, 'hk-h429f'), 'HK Camera h429f');
-});
-
-test('the XML parser reads each image block', () => {
-  const rows = parseHkCameraLocationsXml(
-    fixtureXml(
-      row(),
-      row({
-        key: 'H429F',
-        region: 'Hong Kong Island',
-        district: 'Southern',
-        description: 'Aberdeen Praya Road near Fish Market [H429F]',
-        latitude: '22.24845',
-        longitude: '114.1505',
-        url: 'https://tdcctv.data.one.gov.hk/H429F.JPG',
-      }),
-    ),
-  );
-  assert.equal(rows.length, 2);
-  assert.equal(rows[0].key, 'BC101F');
-  assert.equal(rows[1].key, 'H429F');
-  assert.equal(rows[1].latitude, '22.24845');
-});
-
-test('the loader reads the keyless catalog and collapses duplicate ids', async (t) => {
-  t.mock.method(console, 'log', () => {});
-  const requested = [];
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    requested.push(String(url));
-    return new Response(
-      fixtureXml(
-        row(),
-        row({ description: 'San Tin Highway near Lok Ma Chau (duplicate)' }),
-        row({
-          key: 'H210F',
-          region: 'Hong Kong Island',
-          district: 'Wan Chai',
-          description: 'Aberdeen Tunnel - Wan Chai Side [H210F]',
-          latitude: '22.2747',
-          longitude: '114.17936',
-          url: 'https://tdcctv.data.one.gov.hk/H210F.JPG',
-        }),
-        row({ url: 'https://evil.example/x.jpg' }),
-      ),
-      { headers: { 'Content-Type': 'application/xml' } },
-    );
-  });
-  const cameras = await loadHkSourcesFromOpenData();
-  assert.deepEqual(requested, [DEFAULT_HK_CAMERAS_URL]);
-  assert.deepEqual(
-    cameras.map((camera) => camera.id),
-    // Nearest Central/TST first: Wan Chai before the northern New Territories.
-    ['hk-h210f', 'hk-bc101f'],
-  );
-  assert.equal(cameras[0].name, 'Aberdeen Tunnel - Wan Chai Side [H210F]');
-});
-
-test('an upstream failure yields an empty pack and releases the response', async (t) => {
-  t.mock.method(console, 'warn', () => {});
-  const failed = streamingResponse({ status: 503 });
-  t.mock.method(globalThis, 'fetch', async () => failed.response);
-  assert.deepEqual(await loadHkSourcesFromOpenData(), []);
-  assert.equal(failed.state.cancelled, true, 'the failed body is cancelled');
-
-  t.mock.restoreAll();
-  t.mock.method(console, 'warn', () => {});
-  t.mock.method(globalThis, 'fetch', async () => {
-    throw new Error('network down');
-  });
-  assert.deepEqual(await loadHkSourcesFromOpenData(), []);
-});
-
-test('the unselected label is the description, trimmed to the code width', () => {
-  assert.equal(
-    hkCameraToSource(row({ description: 'San Tin Highway [BC101F]' })).code,
-    'SAN TIN HIGHWAY [BC101F]',
-  );
-  const long = hkCameraToSource(
-    row({
-      description:
-        'Bow Trail & Old Banff Coach Rd SW / Strathcona Blvd SW [BC101F]',
-    }),
-  );
-  assert.equal(long.code.length, CAMERA_CODE_MAX_CHARS);
-  assert.ok(long.code.endsWith('…'));
-  assert.ok(long.code.startsWith('BOW TRAIL & OLD BANFF'));
-});
-
-test('the catalog fetch refuses redirects and oversized bodies', async (t) => {
-  t.mock.method(console, 'warn', () => {});
-  const seen = [];
-  const redirected = streamingResponse({
-    status: 302,
-    headers: { location: 'https://evil.example/cameras.xml' },
-  });
-  t.mock.method(globalThis, 'fetch', async (url, init) => {
-    seen.push([String(url), init.redirect]);
-    return redirected.response;
-  });
-  assert.deepEqual(await loadHkSourcesFromOpenData(), []);
-  assert.deepEqual(seen, [[DEFAULT_HK_CAMERAS_URL, 'manual']]);
-  assert.equal(
-    redirected.state.cancelled,
-    true,
-    'the redirect body is cancelled',
-  );
-
-  t.mock.restoreAll();
-  t.mock.method(console, 'warn', () => {});
-  t.mock.method(globalThis, 'fetch', async () => {
-    const body = fixtureXml(row());
-    return new Response(body, {
-      headers: {
-        'Content-Type': 'application/xml',
-        'content-length': String(HK_MAX_CATALOG_BYTES + 1),
-      },
-    });
-  });
-  assert.deepEqual(await loadHkSourcesFromOpenData(), []);
-
-  t.mock.restoreAll();
-  t.mock.method(console, 'warn', () => {});
-  t.mock.method(globalThis, 'fetch', async () => {
-    const oversized = 'x'.repeat(HK_MAX_CATALOG_BYTES + 1024);
-    return new Response(
-      new ReadableStream({
-        start(controller) {
-          controller.enqueue(new TextEncoder().encode(oversized));
-          controller.close();
-        },
-      }),
-      { headers: { 'Content-Type': 'application/xml' } },
-    );
-  });
-  assert.deepEqual(await loadHkSourcesFromOpenData(), []);
-});
-
-test('a reduced catalog cap thins every pack instead of dropping HK', () => {
-  const lane = (name, count) => ({
-    name,
-    sources: Array.from({ length: count }, (_, i) => ({ id: `${name}-${i}` })),
-  });
-  const { sources, packs } = allocateSourceCap(
-    [
-      lane('austin', 250),
-      lane('calgary', 215),
-      lane('hk', DEFAULT_HK_MAX_SOURCES),
-    ],
-    30,
-  );
-  assert.equal(sources.length, 30);
-  assert.deepEqual(
-    packs.map((p) => [p.name, p.kept]),
-    [
-      ['austin', 10],
-      ['calgary', 10],
-      ['hk', 10],
-    ],
-  );
-  assert.deepEqual(
-    sources.filter((s) => s.id.startsWith('hk-')).map((s) => s.id),
-    Array.from({ length: 10 }, (_, i) => `hk-${i}`),
-  );
-});
-
-/**
- * Serve the HK catalog to the HK endpoint and an empty payload to every other
- * pack, so one catalog refresh exercises the registration without reaching the
- * network. Returns the URLs that were requested.
- */
-const runCatalogWithMockedUpstreams = async (t) => {
-  const requested = [];
-  t.mock.method(console, 'log', () => {});
-  t.mock.method(console, 'warn', () => {});
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    const href = String(url);
-    requested.push(href);
-    if (href.includes('Traffic_Camera_Locations_En.xml')) {
-      return new Response(
-        fixtureXml(
-          row(),
-          row({
-            key: 'H210F',
-            region: 'Hong Kong Island',
-            district: 'Wan Chai',
-            description: 'Aberdeen Tunnel - Wan Chai Side [H210F]',
-            latitude: '22.2747',
-            longitude: '114.17936',
-            url: 'https://tdcctv.data.one.gov.hk/H210F.JPG',
-          }),
-        ),
-        { headers: { 'Content-Type': 'application/xml' } },
-      );
-    }
-    return Response.json([]);
-  });
-  const sources = await createCctvCatalog({ sourceRoot: '/nonexistent' })();
-  return { requested, sources };
-};
-
-test('the HK lane is wired into the catalog and its loader runs', async (t) => {
-  const saved = { ...process.env };
-  try {
-    delete process.env.CCTV_SOURCES_FILE;
-    delete process.env.CCTV_SOURCES_JSON;
-    delete process.env.CCTV_HK_ENABLED;
-    const { requested, sources } = await runCatalogWithMockedUpstreams(t);
-    assert.ok(
-      requested.includes(DEFAULT_HK_CAMERAS_URL),
-      'the catalog refresh invokes the HK loader',
-    );
-    assert.deepEqual(
-      sources.filter((s) => s.cityId === 'hk').map((s) => s.id),
-      ['hk-h210f', 'hk-bc101f'],
-      'HK cameras reach the served catalog through the registered lane',
-    );
-  } finally {
-    for (const key of Object.keys(process.env)) {
-      if (!(key in saved)) delete process.env[key];
-    }
-    Object.assign(process.env, saved);
-  }
-});
-
-test('CCTV_HK_ENABLED=0 keeps the lane from being loaded at all', async (t) => {
-  const saved = { ...process.env };
-  try {
-    delete process.env.CCTV_SOURCES_FILE;
-    delete process.env.CCTV_SOURCES_JSON;
-    process.env.CCTV_HK_ENABLED = '0';
-    const { requested, sources } = await runCatalogWithMockedUpstreams(t);
-    assert.equal(
-      requested.includes(DEFAULT_HK_CAMERAS_URL),
-      false,
-      'the disabled lane never reaches its upstream',
-    );
-    assert.deepEqual(
-      sources.filter((s) => s.cityId === 'hk'),
-      [],
-    );
-  } finally {
-    for (const key of Object.keys(process.env)) {
-      if (!(key in saved)) delete process.env[key];
-    }
-    Object.assign(process.env, saved);
-  }
-});
-
-test('the shipped catalog ceiling is not raised to make room for this pack', () => {
-  assert.equal(DEFAULT_CCTV_MAX_SOURCES, 4000);
-});
-
-test('the HK pack default sits above the full TD catalog and anchors the New Territories', () => {
-  assert.ok(
-    DEFAULT_HK_MAX_SOURCES >= 1013,
-    'default cap should keep nearly all published TD cameras',
-  );
-  assert.ok(
-    DEFAULT_HK_MAX_SOURCES <= DEFAULT_CCTV_MAX_SOURCES,
-    'a single pack must not outgrow the catalog-wide ceiling alone',
-  );
-  const places = HK_ANCHORS.map(
-    (a) => `${a.lat.toFixed(2)},${a.lon.toFixed(2)}`,
-  );
-  assert.ok(places.includes('22.38,114.19'), 'Sha Tin anchor');
-  assert.ok(places.includes('22.37,114.11'), 'Tsuen Wan anchor');
-  assert.ok(places.includes('22.45,114.17'), 'Tai Po anchor');
-  assert.ok(places.includes('22.49,114.14'), 'Fanling anchor');
-  assert.ok(places.includes('22.39,113.98'), 'Tuen Mun anchor');
-  assert.ok(places.includes('22.44,114.02'), 'Yuen Long anchor');
-  assert.ok(places.includes('22.31,114.26'), 'Tseung Kwan O anchor');
-  assert.ok(places.includes('22.28,114.16'), 'Central anchor');
-  assert.ok(places.includes('22.30,114.17'), 'Tsim Sha Tsui anchor');
-});
-
-test('a lowered HK cap still keeps Sha Tin when New Territories anchors are set', () => {
-  const cameras = [
-    hkCameraToSource(
-      row({
-        key: 'H001F',
-        region: 'Hong Kong Island',
-        district: 'Central & Western',
-        description: 'Central harbour [H001F]',
-        latitude: '22.2819',
-        longitude: '114.158',
-      }),
-    ),
-    hkCameraToSource(
-      row({
-        key: 'ST101F',
-        region: 'New Territories',
-        district: 'Sha Tin',
-        description: 'Sha Tin Road [ST101F]',
-        latitude: '22.3827',
-        longitude: '114.19',
-      }),
-    ),
-    hkCameraToSource(
-      row({
-        key: 'K999F',
-        region: 'Kowloon',
-        district: 'Yau Tsim Mong',
-        description: 'Far Kowloon filler [K999F]',
-        latitude: '22.32',
-        longitude: '114.18',
-      }),
-    ),
-  ].filter(Boolean);
-  const kept = prioritizeSources(cameras, 2, HK_ANCHORS);
-  assert.deepEqual(kept.map((camera) => camera.id).sort(), [
-    'hk-h001f',
-    'hk-st101f',
-  ]);
-});

src/data/cctvHlsStream.test.mjs

@@ -223,40 +223,3 @@ test('an abandoned consumer expires while a renewed consumer keeps the session',
   assert.equal(entry.controller.signal.aborted, false);
   await manager.shutdown();
 });
-
-test('client lease ownership covers refresh, segments and release, with a bounded client budget', async (t) => {
-  const manager = createHlsPuller({
-    limits: { ...HLS_LIMITS, leasesPerClient: 1, pollMs: 100000 },
-    fetchImpl: async (url) =>
-      new Response(url.endsWith('.m3u8') ? playlist : 'abc'),
-  });
-  t.after(() => manager.shutdown());
-  const entry = await manager.ensure('a', base, 'lease-a', 'peer-a');
-  await manager.waitReady(entry);
-  await assert.rejects(
-    manager.ensure('a', base, 'lease-a', 'peer-b'),
-    /another client/,
-  );
-  assert.equal(
-    manager.getSegment('a', entry.token, 0, 'lease-a', 'peer-b'),
-    null,
-  );
-  await assert.rejects(
-    manager.buildPlaylist(entry, 'a', 'lease-a', 'peer-b'),
-    /another client/,
-  );
-  manager.release('a', 'lease-a', 'peer-b');
-  assert.equal(entry.leases.size, 1);
-  await assert.rejects(
-    manager.ensure('b', base, 'lease-b', 'peer-a'),
-    /client lease capacity/,
-  );
-  assert.equal(
-    manager.stats().sessions,
-    1,
-    'failed admission reserves no session',
-  );
-  await manager.ensure('b', base, 'lease-b', 'peer-b');
-  manager.release('a', 'lease-a', 'peer-a');
-  assert.equal(entry.stopping, true);
-});

src/data/cctvMediaFeedType.test.mjs

@@ -268,46 +268,3 @@ test('/frame does not follow a still camera off its origin', async (t) => {
     [STILL.url],
   );
 });
-
-test('cross-site media creation, segment reads and release fail before any catalog or media fetch', async (t) => {
-  let handler;
-  const originalFetch = globalThis.fetch;
-  let calls = 0;
-  globalThis.fetch = async () => {
-    calls++;
-    throw new Error('must not fetch');
-  };
-  t.after(() => {
-    globalThis.fetch = originalFetch;
-  });
-  cctvProxy().configureServer({
-    middlewares: {
-      use: (_path, fn) => {
-        handler = fn;
-      },
-    },
-  });
-  for (const headers of [
-    { origin: 'https://foreign.example' },
-    { origin: 'null' },
-    { 'sec-fetch-site': 'cross-site' },
-    { 'sec-fetch-site': 'same-site' },
-  ]) {
-    for (const [method, url] of [
-      ['GET', '/media/camera?lease=test'],
-      ['DELETE', '/media/camera?lease=test'],
-      ['GET', '/media/camera/seg_0.ts?lease=test'],
-    ]) {
-      const { res } = recordingResponse();
-      res.setHeader = (name, value) => {
-        res.headers[name] = value;
-      };
-      await handler(
-        { method, url, headers: { host: 'localhost:4173', ...headers } },
-        res,
-      );
-      assert.equal(res.statusCode, 403);
-    }
-  }
-  assert.equal(calls, 0);
-});

src/data/cctvTaiwan.test.mjs

@@ -1,342 +0,0 @@
-import { afterEach, beforeEach, test } from 'node:test';
-import assert from 'node:assert/strict';
-import {
-  loadTaiwanSources,
-  parseTaiwanCctvXml,
-  resetTaiwanSourcesCache,
-  taiwanCameraToSource,
-  taiwanFrame,
-  TAIWAN_FREEWAY_CCTV_URL,
-  TAIWAN_MAX_CATALOG_BYTES,
-  TAIWAN_RETRY_AFTER_FAILURE_MS,
-} from '../../server/providers/cctv/taiwan.js';
-import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
-
-// Settings that would steer the loader or the catalog away from the mocks.
-const ISOLATED_ENV = [
-  'CCTV_SOURCES_FILE',
-  'CCTV_SOURCES_JSON',
-  'CCTV_PREFER_AUSTIN',
-  'CCTV_FORCE_AUSTIN',
-  'CCTV_TAIWAN_ENABLED',
-  'CCTV_TAIWAN_URL',
-  'CCTV_TAIWAN_MAX_SOURCES',
-];
-
-let savedEnv = {};
-
-beforeEach(() => {
-  resetTaiwanSourcesCache();
-  savedEnv = Object.fromEntries(
-    ISOLATED_ENV.map((key) => [key, process.env[key]]),
-  );
-  for (const key of ISOLATED_ENV) delete process.env[key];
-});
-
-afterEach(() => {
-  for (const [key, value] of Object.entries(savedEnv)) {
-    if (value === undefined) delete process.env[key];
-    else process.env[key] = value;
-  }
-});
-
-function cctvXml(...blocks) {
-  return `<?xml version='1.0' encoding='utf-8'?>
-<CCTVList xmlns="http://traffic.transportdata.tw/standard/traffic/schema/">
-  <AuthorityCode>NFB</AuthorityCode>
-  <CCTVs>${blocks.join('')}</CCTVs>
-</CCTVList>`;
-}
-
-function block({
-  id = 'CCTV-N1-S-0.000-M',
-  stream = 'https://cctvn.freeway.gov.tw/abs2mjpg/bmjpg?camera=10000',
-  lat = '25.1229931',
-  lon = '121.735695',
-} = {}) {
-  return `<CCTV>
-    <CCTVID>${id}</CCTVID>
-    <VideoStreamURL>${stream}</VideoStreamURL>
-    <PositionLon>${lon}</PositionLon>
-    <PositionLat>${lat}</PositionLat>
-    <RoadName>國道1號</RoadName>
-    <RoadDirection>S</RoadDirection>
-    <RoadSection><Start>基隆端</Start><End>基隆交流道</End></RoadSection>
-    <LocationMile>0K+000</LocationMile>
-  </CCTV>`;
-}
-
-test('parses the MOTC 2.0 table and registers the same camera still', () => {
-  const [row] = parseTaiwanCctvXml(cctvXml(block()));
-  const camera = taiwanCameraToSource(row);
-  assert.equal(camera.id, 'tw-freeway-cctvn-10000');
-  assert.equal(camera.lat, 25.1229931);
-  assert.equal(camera.lon, 121.735695);
-  assert.equal(camera.name, '國道1號 S 0K+000 基隆端→基隆交流道');
-  assert.equal(camera.cityId, 'taiwan');
-  assert.equal(camera.feedType, 'image');
-  assert.equal(camera.headingConfidence, 'low');
-  assert.equal(
-    camera.url,
-    'https://cctvn.freeway.gov.tw/abs2mjpg/jpg?camera=10000',
-  );
-  assert.equal(camera.snapshotUrl, camera.url);
-  assert.match(camera.license, /Open Government Data License, Taiwan/);
-});
-
-test('each camera server maps its stream path to its own still path only', () => {
-  assert.equal(
-    taiwanFrame(
-      'https://cctvs.freeway.gov.tw/live-view/mjpg/video.cgi?camera=373',
-    ).frameUrl,
-    'https://cctvs.freeway.gov.tw/live-view/jpg/image.cgi?camera=373',
-  );
-  assert.equal(
-    taiwanFrame(
-      'https://cctvn5.freeway.gov.tw/abs2mjpg/bmjpg?camera=c3a580c9-0232-46a1-bfc6-927590758ab4',
-    ).frameUrl,
-    'https://cctvn5.freeway.gov.tw/abs2mjpg/jpg?camera=c3a580c9-0232-46a1-bfc6-927590758ab4',
-  );
-  assert.equal(
-    taiwanFrame(
-      'https://cctvc.freeway.gov.tw/abs2mjpg/bmjpg?camera=495&extra=1',
-    ).frameUrl,
-    'https://cctvc.freeway.gov.tw/abs2mjpg/jpg?camera=495',
-  );
-});
-
-test('off-host, downgraded or malformed stream URLs never enter the proxy registry', () => {
-  for (const stream of [
-    'http://cctvn.freeway.gov.tw/abs2mjpg/bmjpg?camera=10000',
-    'https://cctvn.freeway.gov.tw.evil.test/abs2mjpg/bmjpg?camera=10000',
-    'https://user:[email protected]/abs2mjpg/bmjpg?camera=10000',
-    'https://cctvn.freeway.gov.tw:8443/abs2mjpg/bmjpg?camera=10000',
-    'https://cctvn.freeway.gov.tw/live-view/mjpg/video.cgi?camera=10000',
-    'https://cctvs.freeway.gov.tw/abs2mjpg/bmjpg?camera=373',
-    'https://cctvn.freeway.gov.tw/abs2mjpg/bmjpg?camera=../../admin',
-    'https://cctvs.freeway.gov.tw/live-view/mjpg/video.cgi?cacamera=373',
-    'http://127.0.0.1/private',
-    '',
-  ]) {
-    assert.equal(taiwanFrame(stream), null, stream);
-    const [row] = parseTaiwanCctvXml(cctvXml(block({ stream })));
-    assert.equal(taiwanCameraToSource(row), null, stream);
-  }
-});
-
-test('coordinates outside Taiwan, swapped or missing are rejected', () => {
-  for (const [lat, lon] of [
-    ['121.735695', '25.1229931'],
-    ['35.68', '139.76'],
-    ['', '121.7'],
-    ['NaN', '121.7'],
-  ]) {
-    const [row] = parseTaiwanCctvXml(cctvXml(block({ lat, lon })));
-    assert.equal(taiwanCameraToSource(row), null, `${lat},${lon}`);
-  }
-  assert.equal(taiwanCameraToSource(null), null);
-});
-
-test('Chinese place names in CCTVID stay in the record without shaping the key', () => {
-  const [row] = parseTaiwanCctvXml(
-    cctvXml(block({ id: 'CCTV-N1-N-55-R-中壢服務區&amp;(北)' })),
-  );
-  const camera = taiwanCameraToSource(row);
-  assert.equal(camera.id, 'tw-freeway-cctvn-10000');
-  assert.equal(row.cctvId, 'CCTV-N1-N-55-R-中壢服務區&(北)');
-});
-
-function mockCatalog(t, xml) {
-  const requested = [];
-  t.mock.method(console, 'log', () => {});
-  t.mock.method(console, 'warn', () => {});
-  t.mock.method(globalThis, 'fetch', async (url, options) => {
-    requested.push(String(url));
-    if (String(url) === TAIWAN_FREEWAY_CCTV_URL) {
-      assert.equal(options.redirect, 'manual');
-      return new Response(xml, {
-        headers: { 'content-type': 'application/xml' },
-      });
-    }
-    return Response.json([]);
-  });
-  return requested;
-}
-
-test('loader deduplicates cameras that share a camera number', async (t) => {
-  mockCatalog(
-    t,
-    cctvXml(
-      block(),
-      block({ id: 'CCTV-N1-S-0.000-M-dup' }),
-      block({
-        stream: 'https://cctvc.freeway.gov.tw/abs2mjpg/bmjpg?camera=495',
-        lat: '24.1',
-        lon: '120.6',
-      }),
-    ),
-  );
-  assert.deepEqual((await loadTaiwanSources()).map((c) => c.id).sort(), [
-    'tw-freeway-cctvc-495',
-    'tw-freeway-cctvn-10000',
-  ]);
-});
-
-test('a redirected or failed catalog contributes an empty pack', async (t) => {
-  t.mock.method(console, 'warn', () => {});
-  for (const status of [302, 503]) {
-    t.mock.method(
-      globalThis,
-      'fetch',
-      async () =>
-        new Response(cctvXml(block()), {
-          status,
-          headers: status === 302 ? { location: 'https://evil.test/' } : {},
-        }),
-    );
-    resetTaiwanSourcesCache();
-    assert.deepEqual(await loadTaiwanSources(), []);
-  }
-});
-
-async function runCatalogWithTaiwanFlag(t, flag) {
-  const requested = mockCatalog(t, cctvXml(block()));
-  if (flag !== undefined) process.env.CCTV_TAIWAN_ENABLED = flag;
-  const sources = await createCctvCatalog({ sourceRoot: '/nonexistent' })();
-  return { requested, sources };
-}
-
-test('the Taiwan pack is in the catalog by default', async (t) => {
-  const { sources } = await runCatalogWithTaiwanFlag(t, undefined);
-  assert.equal(
-    sources.find((c) => c.id === 'tw-freeway-cctvn-10000')?.cityId,
-    'taiwan',
-  );
-});
-
-test('CCTV_TAIWAN_ENABLED=0 makes no Freeway Bureau request', async (t) => {
-  const { requested, sources } = await runCatalogWithTaiwanFlag(t, '0');
-  assert.ok(requested.length > 0, 'the other packs still refreshed');
-  assert.equal(
-    requested.some((href) => href.includes('freeway.gov.tw')),
-    false,
-  );
-  assert.ok(!sources.some((c) => c.cityId === 'taiwan'));
-});
-
-test('a catalog over the byte cap or a failed request contributes an empty pack', async (t) => {
-  t.mock.method(console, 'warn', () => {});
-  const padding = `<!--${'x'.repeat(TAIWAN_MAX_CATALOG_BYTES)}-->`;
-  t.mock.method(
-    globalThis,
-    'fetch',
-    async () => new Response(cctvXml(block()) + padding),
-  );
-  assert.deepEqual(await loadTaiwanSources(), []);
-  resetTaiwanSourcesCache();
-  t.mock.method(globalThis, 'fetch', async () => {
-    throw new TypeError('fetch failed');
-  });
-  assert.deepEqual(await loadTaiwanSources(), []);
-});
-
-test('a failed download is not retried until the backoff ends', async (t) => {
-  t.mock.method(console, 'warn', () => {});
-  let calls = 0;
-  t.mock.method(globalThis, 'fetch', async () => {
-    calls += 1;
-    throw new TypeError('fetch failed');
-  });
-  t.mock.method(Date, 'now', () => 1_000_000);
-  assert.deepEqual(await loadTaiwanSources(), []);
-  assert.deepEqual(await loadTaiwanSources(), []);
-  assert.equal(calls, 1, 'the second refresh made no request');
-  Date.now.mock.mockImplementation(
-    () => 1_000_000 + TAIWAN_RETRY_AFTER_FAILURE_MS + 1,
-  );
-  await loadTaiwanSources();
-  assert.equal(calls, 2, 'the backoff ends after an hour');
-});
-
-test('a failed download serves the last good table', async (t) => {
-  t.mock.method(console, 'log', () => {});
-  t.mock.method(console, 'warn', () => {});
-  const fetchMock = t.mock.method(
-    globalThis,
-    'fetch',
-    async () => new Response(cctvXml(block())),
-  );
-  const first = await loadTaiwanSources();
-  assert.deepEqual(
-    first.map((c) => c.id),
-    ['tw-freeway-cctvn-10000'],
-  );
-  fetchMock.mock.mockImplementation(
-    async () => new Response('', { status: 503 }),
-  );
-  assert.deepEqual(
-    (await loadTaiwanSources()).map((c) => c.id),
-    ['tw-freeway-cctvn-10000'],
-  );
-});
-
-test('CCTV_TAIWAN_MAX_SOURCES is clamped to 1-2000', async (t) => {
-  t.mock.method(console, 'log', () => {});
-  const rows = Array.from({ length: 3 }, (_, i) =>
-    block({
-      stream: `https://cctvn.freeway.gov.tw/abs2mjpg/bmjpg?camera=${i + 1}`,
-    }),
-  );
-  t.mock.method(
-    globalThis,
-    'fetch',
-    async () => new Response(cctvXml(...rows)),
-  );
-  for (const [value, expected] of [
-    ['0', 1],
-    ['2', 2],
-    ['5000', 3],
-    ['abc', 3],
-  ]) {
-    resetTaiwanSourcesCache();
-    process.env.CCTV_TAIWAN_MAX_SOURCES = value;
-    const sources = await loadTaiwanSources();
-    assert.equal(sources.length, expected, value);
-    assert.equal(sources.available, 3, value);
-  }
-});
-
-test('names fall back to the published ID when the row has no road details', () => {
-  const xml = cctvXml(block({ id: 'CCTV-N3-N-100-M' }))
-    .replace('<RoadName>國道1號</RoadName>', '<RoadName></RoadName>')
-    .replace('<LocationMile>0K+000</LocationMile>', '')
-    .replace('<Start>基隆端</Start><End>基隆交流道</End>', '');
-  const camera = taiwanCameraToSource(parseTaiwanCctvXml(xml)[0]);
-  assert.equal(camera.name, 'CCTV-N3-N-100-M');
-});
-
-test('numeric character references in the table are decoded', () => {
-  const xml = cctvXml(block()).replace(
-    '<RoadName>國道1號</RoadName>',
-    '<RoadName>&#22283;&#x9053;1號</RoadName>',
-  );
-  assert.equal(parseTaiwanCctvXml(xml)[0].roadName, '國道1號');
-});
-
-test('camera numbers that are UUIDs keep their case in the frame URL only', () => {
-  const camera = taiwanCameraToSource(
-    parseTaiwanCctvXml(
-      cctvXml(
-        block({
-          stream:
-            'https://cctvn5.freeway.gov.tw/abs2mjpg/bmjpg?camera=C3A580C9-0232-46A1-BFC6-927590758AB4',
-        }),
-      ),
-    )[0],
-  );
-  assert.equal(
-    camera.id,
-    'tw-freeway-cctvn5-c3a580c9-0232-46a1-bfc6-927590758ab4',
-  );
-  assert.match(camera.url, /camera=C3A580C9-0232-46A1-BFC6-927590758AB4$/);
-});

src/data/cctvVegvesen.test.mjs

@@ -2,24 +2,11 @@ import { test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import {
-  applyVegvesenGroundHeights,
-  clearKartverketHeightCache,
-  fetchKartverketHeights,
-  kartverketBackoffMs,
   loadVegvesenSourcesFromOpenData,
   vegvesenCameraToSource,
 } from '../../server/providers/cctv/sources.js';
 import {
   DEFAULT_VEGVESEN_CCTV_URL,
-  KARTVERKET_HEIGHT_URL,
-  KARTVERKET_CATALOG_WAIT_MS,
-  KARTVERKET_CONCURRENCY,
-  KARTVERKET_FAILURE_BACKOFF_MS,
-  KARTVERKET_MAX_POINTS,
-  KARTVERKET_MAX_RESPONSE_BYTES,
-  KARTVERKET_NULL_TTL_MS,
-  KARTVERKET_USER_AGENT,
-  CCTV_SOURCE_CACHE_MS,
   VEGVESEN_IMAGE_ORIGIN,
 } from '../../server/providers/cctv/constants.js';
 import { createCctvCatalog } from '../../server/providers/cctv/catalog.js';
@@ -117,8 +104,6 @@ test('faulty cameras, off-host frames and bad geometry are dropped', () => {
 });
 
 test('the loader dedupes, and failures degrade to an empty pack', async (t) => {
-  clearKartverketHeightCache();
-  t.after(clearKartverketHeightCache);
   t.mock.method(console, 'log', () => {});
   t.mock.method(console, 'warn', () => {});
   const requested = [];
@@ -142,11 +127,7 @@ test('the loader dedupes, and failures degrade to an empty pack', async (t) => {
     });
   });
   const cameras = await loadVegvesenSourcesFromOpenData();
-  // The catalog first; the rest is the Kartverket height lookup.
-  assert.equal(requested[0], DEFAULT_VEGVESEN_CCTV_URL);
-  // Two unique positions: one Kartverket request.
-  assert.equal(requested.length, 2);
-  assert.ok(requested[1].startsWith(KARTVERKET_HEIGHT_URL));
+  assert.deepEqual(requested, [DEFAULT_VEGVESEN_CCTV_URL]);
   // Nearest-to-anchor first: Oslo leads.
   assert.deepEqual(
     cameras.map((c) => c.id),
@@ -219,604 +200,3 @@ test('CCTV_VEGVESEN_ENABLED=0 keeps the lane from being loaded', async (t) => {
     );
   });
 });
-
-/** Answer a Kartverket request the way the live API does: echo every point,
- * with the height `heightFor(x, y)` returns (null = outside coverage). */
-const kartverketResponse = (url, heightFor) => {
-  const points = JSON.parse(new URL(url).searchParams.get('punkter'));
-  return Response.json({
-    koordsys: 4258,
-    punkter: points.map(([x, y]) => ({ x, y, z: heightFor(x, y) })),
-  });
-};
-
-/** Cameras at distinct Norwegian positions. */
-const cameraAt = (i) => ({
-  id: `no-vegvesen-${i}`,
-  lat: 60 + i * 0.001,
-  lon: 7 + i * 0.001,
-  groundElevationM: 150,
-});
-
-const withHeightsEnv = (t) => {
-  const saved = process.env.CCTV_VEGVESEN_HEIGHTS;
-  delete process.env.CCTV_VEGVESEN_HEIGHTS;
-  clearKartverketHeightCache();
-  t.after(() => {
-    clearKartverketHeightCache();
-    if (saved === undefined) delete process.env.CCTV_VEGVESEN_HEIGHTS;
-    else process.env.CCTV_VEGVESEN_HEIGHTS = saved;
-  });
-  t.mock.method(console, 'log', () => {});
-  t.mock.method(console, 'warn', () => {});
-};
-
-const sentPoints = (url) =>
-  JSON.parse(new URL(url).searchParams.get('punkter'));
-
-test('Kartverket heights come in batches of 20, matched by echoed coordinates', async (t) => {
-  withHeightsEnv(t);
-  const requested = [];
-  t.mock.method(globalThis, 'fetch', async (url, init) => {
-    requested.push(String(url));
-    assert.ok(String(url).startsWith(KARTVERKET_HEIGHT_URL));
-    assert.equal(init.headers['User-Agent'], KARTVERKET_USER_AGENT);
-    // Redirects are refused, so a request can never leave the fixed host.
-    assert.equal(init.redirect, 'error');
-    // Reply in reverse order: matching must not depend on list position.
-    const response = kartverketResponse(url, (x) =>
-      x > 7.04 ? null : Math.round((x - 7) * 10000),
-    );
-    const body = await response.json();
-    body.punkter.reverse();
-    return Response.json(body);
-  });
-  const { heights, failure } = await fetchKartverketHeights(
-    Array.from({ length: 50 }, (_, i) => cameraAt(i)),
-  );
-  assert.equal(failure, null);
-  // One pass, no retries: 20 + 20 + 10.
-  assert.deepEqual(
-    requested.map((url) => sentPoints(url).length),
-    [KARTVERKET_MAX_POINTS, 20, 10],
-  );
-  for (const url of requested) {
-    assert.equal(new URL(url).searchParams.get('koordsys'), '4258');
-  }
-  assert.equal(heights.size, 50);
-  assert.equal(heights.get('7.010000,60.010000'), 100);
-  // Past x = 7.04 the API has no height: recorded as null, never as 0.
-  assert.equal(heights.get('7.049000,60.049000'), null);
-});
-
-test('only the points a request asked about are recorded', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    const points = sentPoints(url);
-    return Response.json({
-      koordsys: 4258,
-      punkter: [
-        ...points.map(([x, y]) => ({ x, y, z: 10 })),
-        { x: 7.5, y: 60.5, z: 999 }, // never asked
-      ],
-    });
-  });
-  const { heights } = await fetchKartverketHeights([cameraAt(0)]);
-  assert.deepEqual([...heights.entries()], [['7.000000,60.000000', 10]]);
-});
-
-test('either water marker counts as the surface', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    const [a, b, c] = sentPoints(url);
-    return Response.json({
-      koordsys: 4258,
-      punkter: [
-        {
-          x: a[0],
-          y: a[1],
-          z: -547.1,
-          datakilde: 'dybdekurver',
-          terreng: null,
-        },
-        { x: b[0], y: b[1], z: -9.2, datakilde: 'dtm1', terreng: 'Havflate' },
-        {
-          x: c[0],
-          y: c[1],
-          z: -0.2,
-          datakilde: 'dtm1',
-          terreng: 'ÅpentOmråde',
-        },
-      ],
-    });
-  });
-  const { heights } = await fetchKartverketHeights([
-    cameraAt(0),
-    cameraAt(1),
-    cameraAt(2),
-  ]);
-  assert.equal(heights.get('7.000000,60.000000'), 0);
-  assert.equal(heights.get('7.001000,60.001000'), 0);
-  // A quay just below the datum on land data stays as measured.
-  assert.equal(heights.get('7.002000,60.002000'), -0.2);
-});
-
-test('heights outside -20..2500 m and points outside Norway are not used', async (t) => {
-  withHeightsEnv(t);
-  const requested = [];
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    requested.push(String(url));
-    const zs = [-20, -20.5, 2500, 2500.5];
-    const points = sentPoints(url);
-    return Response.json({
-      koordsys: 4258,
-      punkter: points.map(([x, y], i) => ({ x, y, z: zs[i] })),
-    });
-  });
-  const { heights } = await fetchKartverketHeights([
-    cameraAt(0),
-    cameraAt(1),
-    cameraAt(2),
-    cameraAt(3),
-    { lat: 55.68, lon: 12.57 }, // Copenhagen: never sent
-  ]);
-  assert.equal(requested.length, 1);
-  assert.equal(sentPoints(requested[0]).length, 4);
-  assert.deepEqual(
-    [0, 1, 2, 3].map((i) =>
-      heights.get(
-        `${(7 + i * 0.001).toFixed(6)},${(60 + i * 0.001).toFixed(6)}`,
-      ),
-    ),
-    [-20, null, 2500, null],
-  );
-});
-
-test('no more than eight requests are in flight', async (t) => {
-  withHeightsEnv(t);
-  let inFlight = 0;
-  let peak = 0;
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    inFlight += 1;
-    peak = Math.max(peak, inFlight);
-    await new Promise((resolve) => setTimeout(resolve, 5));
-    inFlight -= 1;
-    return kartverketResponse(url, () => 1);
-  });
-  const { heights } = await fetchKartverketHeights(
-    Array.from({ length: 400 }, (_, i) => cameraAt(i)),
-  );
-  assert.equal(heights.size, 400);
-  assert.equal(peak, KARTVERKET_CONCURRENCY);
-});
-
-test('a transport failure stops the lookup: no retries, no new requests', async (t) => {
-  withHeightsEnv(t);
-  let calls = 0;
-  t.mock.method(globalThis, 'fetch', async () => {
-    calls += 1;
-    return new Response('busy', {
-      status: 429,
-      headers: { 'Retry-After': '120' },
-    });
-  });
-  const { heights, failure } = await fetchKartverketHeights(
-    Array.from({ length: 400 }, (_, i) => cameraAt(i)),
-  );
-  // The first wave is already in flight when the first failure lands; nothing
-  // after it starts, and no point is resent.
-  assert.equal(calls, KARTVERKET_CONCURRENCY);
-  assert.equal(heights.size, 0);
-  assert.deepEqual(failure, {
-    status: 429,
-    retryAfter: '120',
-    deadline: false,
-  });
-});
-
-/** A fetch that never answers, and rejects only when its signal aborts. */
-const hangingFetch = (url, init) => {
-  assert.ok(init.signal instanceof AbortSignal);
-  return new Promise((_, reject) => {
-    init.signal.addEventListener('abort', () => reject(init.signal.reason));
-  });
-};
-
-test('the lookup deadline bounds a hanging service', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', hangingFetch);
-  const started = Date.now();
-  const { heights, failure } = await fetchKartverketHeights([cameraAt(0)], {
-    timeoutMs: 30,
-  });
-  const elapsed = Date.now() - started;
-  assert.ok(elapsed >= 25 && elapsed < 2000, `elapsed ${elapsed} ms`);
-  assert.equal(heights.size, 0);
-  assert.deepEqual(failure, { status: null, retryAfter: null, deadline: true });
-});
-
-test('one hanging request times out on its own, as a failing service', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', hangingFetch);
-  const { failure } = await fetchKartverketHeights([cameraAt(0)], {
-    timeoutMs: 60_000,
-    requestTimeoutMs: 20,
-  });
-  assert.deepEqual(failure, {
-    status: null,
-    retryAfter: null,
-    deadline: false,
-  });
-});
-
-test('the deadline is shared: later requests do not get a fresh one', async (t) => {
-  withHeightsEnv(t);
-  let calls = 0;
-  t.mock.method(globalThis, 'fetch', (url, init) => {
-    calls += 1;
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(
-        () => resolve(kartverketResponse(url, () => 1)),
-        40,
-      );
-      init.signal.addEventListener('abort', () => {
-        clearTimeout(timer);
-        reject(init.signal.reason);
-      });
-    });
-  });
-  // Five waves of 40 ms against a 100 ms deadline for the whole lookup.
-  const { heights, failure } = await fetchKartverketHeights(
-    Array.from({ length: 5 * KARTVERKET_CONCURRENCY * 20 }, (_, i) =>
-      cameraAt(i),
-    ),
-    { timeoutMs: 100 },
-  );
-  assert.equal(failure?.deadline, true);
-  assert.ok(heights.size < 5 * KARTVERKET_CONCURRENCY * 20);
-  assert.ok(calls < 5 * KARTVERKET_CONCURRENCY, `calls ${calls}`);
-});
-
-test('a 503, an unreadable or an oversized body stops the lookup', async (t) => {
-  withHeightsEnv(t);
-  const answers = {
-    503: () => new Response('down', { status: 503 }),
-    'not json': () =>
-      new Response('<html>maintenance</html>', {
-        headers: { 'Content-Type': 'text/html' },
-      }),
-    oversized: () =>
-      Response.json({
-        punkter: [],
-        pad: 'x'.repeat(KARTVERKET_MAX_RESPONSE_BYTES + 1),
-      }),
-  };
-  for (const [label, answer] of Object.entries(answers)) {
-    clearKartverketHeightCache();
-    let calls = 0;
-    t.mock.method(globalThis, 'fetch', async () => {
-      calls += 1;
-      return answer();
-    });
-    const { heights, failure } = await fetchKartverketHeights(
-      Array.from({ length: 400 }, (_, i) => cameraAt(i)),
-    );
-    assert.equal(calls, KARTVERKET_CONCURRENCY, label);
-    assert.equal(heights.size, 0, label);
-    assert.equal(failure?.deadline, false, label);
-    assert.equal(failure?.status, label === '503' ? 503 : null, label);
-  }
-});
-
-test('a 4xx rejects that request only: its points get no height, the rest go on', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', async (url) =>
-    sentPoints(url)[0][0] === 7
-      ? new Response('bad point', { status: 400 })
-      : kartverketResponse(url, () => 42),
-  );
-  const { heights, failure } = await fetchKartverketHeights(
-    Array.from({ length: 40 }, (_, i) => cameraAt(i)),
-  );
-  assert.equal(failure, null);
-  assert.equal(heights.size, 40);
-  assert.equal(heights.get('7.000000,60.000000'), null);
-  assert.equal(heights.get('7.020000,60.020000'), 42);
-});
-
-test('a point a 200 answer leaves out is cached as no height', async (t) => {
-  withHeightsEnv(t);
-  const fetchMock = t.mock.method(globalThis, 'fetch', async (url) => {
-    const points = sentPoints(url).slice(1); // drop the first point
-    return Response.json({
-      koordsys: 4258,
-      punkter: points.map(([x, y]) => ({ x, y, z: 7 })),
-    });
-  });
-  const cameras = [cameraAt(0), cameraAt(1)];
-  assert.equal(await applyVegvesenGroundHeights(cameras), 1);
-  assert.equal(cameras[0].groundElevationM, 150);
-  // The next refresh asks nothing: the left-out point is a cached miss.
-  assert.equal(await applyVegvesenGroundHeights([cameraAt(0), cameraAt(1)]), 1);
-  assert.equal(fetchMock.mock.callCount(), 1);
-});
-
-test('Retry-After sets the backoff, bounded to [1 min, 1 h]', () => {
-  const now = Date.parse('2026-10-06T12:00:00Z');
-  assert.equal(kartverketBackoffMs('120', now), 120_000);
-  assert.equal(kartverketBackoffMs('5', now), 60_000);
-  assert.equal(kartverketBackoffMs('86400', now), 3_600_000);
-  assert.equal(
-    kartverketBackoffMs('Mon, 06 Oct 2026 12:05:00 GMT', now),
-    300_000,
-  );
-  assert.equal(kartverketBackoffMs(null, now), KARTVERKET_FAILURE_BACKOFF_MS);
-  assert.equal(kartverketBackoffMs('soon', now), KARTVERKET_FAILURE_BACKOFF_MS);
-});
-
-test('heights are cached, and misses are not asked again until they expire', async (t) => {
-  withHeightsEnv(t);
-  let clock = 1_000_000;
-  const now = () => clock;
-  const asked = [];
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    asked.push(sentPoints(url).length);
-    return kartverketResponse(url, (x) => (x < 7.002 ? 1043.26 : null));
-  });
-  const cameras = [cameraAt(0), cameraAt(1), cameraAt(5)];
-  assert.equal(await applyVegvesenGroundHeights(cameras, { now }), 2);
-  assert.deepEqual(
-    cameras.map((c) => c.groundElevationM),
-    [1043.3, 1043.3, 150],
-  );
-  // The next refresh asks nothing: heights and the miss are both cached.
-  assert.equal(
-    await applyVegvesenGroundHeights([cameraAt(0), cameraAt(1), cameraAt(5)], {
-      now,
-    }),
-    2,
-  );
-  assert.deepEqual(asked, [3]);
-  // Once the miss expires, only that point is asked again.
-  clock += KARTVERKET_NULL_TTL_MS + 1;
-  await applyVegvesenGroundHeights([cameraAt(0), cameraAt(5)], { now });
-  assert.deepEqual(asked, [3, 1]);
-});
-
-test('after a failure no lookup starts until the backoff ends', async (t) => {
-  withHeightsEnv(t);
-  let clock = 1_000_000;
-  const now = () => clock;
-  const fetchMock = t.mock.method(globalThis, 'fetch', async () => {
-    throw new Error('offline');
-  });
-  const cameras = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(cameras, { now }), 0);
-  assert.equal(cameras[0].groundElevationM, 150);
-  assert.equal(fetchMock.mock.callCount(), 1);
-
-  // The default backoff outlasts the catalog refresh, so the next refresh
-  // and every one inside the backoff cost nothing.
-  assert.ok(KARTVERKET_FAILURE_BACKOFF_MS > CCTV_SOURCE_CACHE_MS);
-  clock += CCTV_SOURCE_CACHE_MS;
-  assert.equal(await applyVegvesenGroundHeights([cameraAt(0)], { now }), 0);
-  clock += KARTVERKET_FAILURE_BACKOFF_MS - CCTV_SOURCE_CACHE_MS - 1;
-  assert.equal(await applyVegvesenGroundHeights([cameraAt(0)], { now }), 0);
-  assert.equal(fetchMock.mock.callCount(), 1);
-
-  // After it, the failed point is asked again.
-  clock += 2;
-  fetchMock.mock.mockImplementation(async (url) =>
-    kartverketResponse(url, () => 321),
-  );
-  const later = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(later, { now }), 1);
-  assert.equal(later[0].groundElevationM, 321);
-  assert.equal(fetchMock.mock.callCount(), 2);
-});
-
-test('a 429 backs off for its Retry-After, not the default', async (t) => {
-  withHeightsEnv(t);
-  let clock = 1_000_000;
-  const now = () => clock;
-  const retryAfterS = 50 * 60;
-  const fetchMock = t.mock.method(
-    globalThis,
-    'fetch',
-    async () =>
-      new Response('busy', {
-        status: 429,
-        headers: { 'Retry-After': String(retryAfterS) },
-      }),
-  );
-  await applyVegvesenGroundHeights([cameraAt(0)], { now });
-  assert.equal(fetchMock.mock.callCount(), 1);
-  clock += KARTVERKET_FAILURE_BACKOFF_MS + 1;
-  await applyVegvesenGroundHeights([cameraAt(0)], { now });
-  assert.equal(fetchMock.mock.callCount(), 1);
-  clock += retryAfterS * 1000 - KARTVERKET_FAILURE_BACKOFF_MS;
-  await applyVegvesenGroundHeights([cameraAt(0)], { now });
-  assert.equal(fetchMock.mock.callCount(), 2);
-});
-
-test('a lookup cut short by its deadline resumes on the next refresh', async (t) => {
-  withHeightsEnv(t);
-  let clock = 1_000_000;
-  const now = () => clock;
-  t.mock.method(globalThis, 'fetch', hangingFetch);
-  // The lookup runs out of time; that is not a failing service.
-  assert.equal(
-    await applyVegvesenGroundHeights([cameraAt(0)], {
-      now,
-      timeoutMs: 10,
-      waitMs: 1000,
-    }),
-    0,
-  );
-  const fetchMock = t.mock.method(globalThis, 'fetch', async (url) =>
-    kartverketResponse(url, () => 64),
-  );
-  clock += CCTV_SOURCE_CACHE_MS;
-  const cameras = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(cameras, { now }), 1);
-  assert.equal(cameras[0].groundElevationM, 64);
-  assert.equal(fetchMock.mock.callCount(), 1);
-});
-
-test('overlapping refreshes share one lookup', async (t) => {
-  withHeightsEnv(t);
-  let release;
-  const gate = new Promise((resolve) => {
-    release = resolve;
-  });
-  const fetchMock = t.mock.method(globalThis, 'fetch', async (url) => {
-    await gate;
-    return kartverketResponse(url, () => 3);
-  });
-  await Promise.all([
-    applyVegvesenGroundHeights([cameraAt(0)], { waitMs: 5 }),
-    applyVegvesenGroundHeights([cameraAt(0)], { waitMs: 5 }),
-  ]);
-  assert.equal(fetchMock.mock.callCount(), 1);
-  release();
-});
-
-test('a warm cache does not wait for a few new cameras', async (t) => {
-  withHeightsEnv(t);
-  const cameras = Array.from({ length: 20 }, (_, i) => cameraAt(i));
-  t.mock.method(globalThis, 'fetch', async (url) =>
-    kartverketResponse(url, () => 500),
-  );
-  assert.equal(await applyVegvesenGroundHeights(cameras), 20);
-  let release;
-  const gate = new Promise((resolve) => {
-    release = resolve;
-  });
-  const fetchMock = t.mock.method(globalThis, 'fetch', async (url) => {
-    await gate;
-    return kartverketResponse(url, () => 600);
-  });
-  const refresh = [...cameras, cameraAt(20)];
-  const started = Date.now();
-  assert.equal(
-    await applyVegvesenGroundHeights(refresh, { waitMs: 5_000 }),
-    20,
-  );
-  assert.ok(Date.now() - started < 1000);
-  assert.equal(fetchMock.mock.callCount(), 1);
-  // The background lookup fills the cache for the next refresh.
-  release();
-  await new Promise((resolve) => setTimeout(resolve, 20));
-  const next = [...cameras, cameraAt(20)];
-  assert.equal(await applyVegvesenGroundHeights(next), 21);
-  assert.equal(next[20].groundElevationM, 600);
-});
-
-test('cameras without numeric coordinates are skipped, never thrown on', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', async (url) =>
-    kartverketResponse(url, () => 9),
-  );
-  const cameras = [
-    { id: 'no-coordinates' },
-    null,
-    { id: 'strings', lat: '60', lon: '7' },
-    cameraAt(0),
-  ];
-  assert.equal(await applyVegvesenGroundHeights(cameras), 1);
-  assert.equal(cameras[3].groundElevationM, 9);
-});
-
-test('a lookup started before a cache clear cannot write after it', async (t) => {
-  withHeightsEnv(t);
-  let release;
-  const gate = new Promise((resolve) => {
-    release = resolve;
-  });
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    await gate;
-    return kartverketResponse(url, () => 111);
-  });
-  await applyVegvesenGroundHeights([cameraAt(0)], { waitMs: 5 });
-  clearKartverketHeightCache();
-  t.mock.method(globalThis, 'fetch', async (url) =>
-    kartverketResponse(url, () => 222),
-  );
-  const fresh = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(fresh), 1);
-  assert.equal(fresh[0].groundElevationM, 222);
-  release();
-  await new Promise((resolve) => setTimeout(resolve, 20));
-  const later = [cameraAt(0)];
-  await applyVegvesenGroundHeights(later, { waitMs: 0 });
-  assert.equal(later[0].groundElevationM, 222);
-});
-
-test('CCTV_VEGVESEN_HEIGHTS=0 skips the lookup', async (t) => {
-  withHeightsEnv(t);
-  const fetchMock = t.mock.method(globalThis, 'fetch', async (url) =>
-    kartverketResponse(url, () => 5),
-  );
-  process.env.CCTV_VEGVESEN_HEIGHTS = '0';
-  const cameras = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(cameras), 0);
-  assert.equal(cameras[0].groundElevationM, 150);
-  assert.equal(fetchMock.mock.callCount(), 0);
-});
-
-test('a slow lookup does not hold the catalog; the next refresh applies it', async (t) => {
-  withHeightsEnv(t);
-  let release;
-  const gate = new Promise((resolve) => {
-    release = resolve;
-  });
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    await gate;
-    return kartverketResponse(url, () => 812);
-  });
-  const first = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(first, { waitMs: 20 }), 0);
-  assert.equal(first[0].groundElevationM, 150);
-  release();
-  // The lookup kept running and filled the cache for the next refresh.
-  await new Promise((resolve) => setTimeout(resolve, 20));
-  const next = [cameraAt(0)];
-  assert.equal(await applyVegvesenGroundHeights(next, { waitMs: 20 }), 1);
-  assert.equal(next[0].groundElevationM, 812);
-});
-
-test('the loader applies Kartverket heights to the cameras it returns', async (t) => {
-  withHeightsEnv(t);
-  t.mock.method(globalThis, 'fetch', async (url) => {
-    if (String(url).startsWith(KARTVERKET_HEIGHT_URL)) {
-      return kartverketResponse(url, () => 987.6);
-    }
-    return Response.json({ type: 'FeatureCollection', features: [feature()] });
-  });
-  const cameras = await loadVegvesenSourcesFromOpenData();
-  assert.deepEqual(
-    cameras.map((c) => [c.id, c.groundElevationM]),
-    [['no-vegvesen-3000063_1', 987.6]],
-  );
-});
-
-test('the loader budgets the height wait from its own start', async (t) => {
-  withHeightsEnv(t);
-  const realNow = Date.now.bind(Date);
-  let offset = 0;
-  t.mock.method(Date, 'now', () => realNow() + offset);
-  t.mock.method(globalThis, 'fetch', (url, init) => {
-    if (String(url).startsWith(KARTVERKET_HEIGHT_URL)) {
-      return hangingFetch(url, init);
-    }
-    // The catalog fetch uses up all but 10 ms of the lane's budget.
-    offset += KARTVERKET_CATALOG_WAIT_MS - 10;
-    return Promise.resolve(
-      Response.json({ type: 'FeatureCollection', features: [feature()] }),
-    );
-  });
-  const started = performance.now();
-  const cameras = await loadVegvesenSourcesFromOpenData();
-  assert.ok(performance.now() - started < 1000);
-  assert.equal(cameras[0].groundElevationM, 150);
-});

src/data/dataCredits.js

@@ -239,8 +239,7 @@ export const DATA_CREDITS = [
     html:
       'CCTV cameras & frames (Ontario): ' +
       '<a href="https://511on.ca/" target="_blank" rel="noopener">Ontario 511</a> ' +
-      '(<a href="https://www.ontario.ca/page/open-government-licence-ontario" target="_blank" rel="noopener">Open Government Licence - Ontario</a>) ' +
-      '· provided as is, without warranty; actual road conditions may differ',
+      '(<a href="https://www.ontario.ca/page/open-government-licence-ontario" target="_blank" rel="noopener">Open Government Licence - Ontario</a>)',
   },
   {
     key: 'fintraffic-cctv',
@@ -258,14 +257,6 @@ export const DATA_CREDITS = [
       'Road-camera stills (Lithuania, when enabled): ' +
       '<a href="https://eismoinfo.lt/" target="_blank" rel="noopener">Via Lietuva / Eismoinfo</a>; periodically updated images',
   },
-  {
-    key: 'taiwan-cctv',
-    html:
-      'Freeway camera stills (Taiwan): ' +
-      '<a href="https://www.freeway.gov.tw/" target="_blank" rel="noopener">Freeway Bureau, MOTC</a>, ' +
-      '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>',
-  },
   {
     key: 'calgary-cctv',
     html:
@@ -297,22 +288,12 @@ export const DATA_CREDITS = [
       '<a href="https://kingcounty.gov/en/dept/kcit/data-information-services/gis-center/about/terms-conditions-copyrights" target="_blank" rel="noopener">KCGIS Center terms</a>. ' +
       'Partner-city cameras hosted on the county image handler (e.g. Newcastle) name their owner in the CCTV panel.',
   },
-  {
-    key: 'hk-cctv',
-    html:
-      'Traffic snapshot cameras (Hong Kong): ' +
-      '<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)',
-  },
   {
     key: 'vegvesen-cctv',
     html:
       'Road cameras (Norway): contains data under the ' +
       '<a href="https://data.norge.no/nlod/en/2.0" target="_blank" rel="noopener">Norwegian licence for Open Government data (NLOD)</a> ' +
-      'distributed by Statens vegvesen · camera ground heights © ' +
-      '<a href="https://kartverket.no/en/api-and-data/terrengdata" target="_blank" rel="noopener">Kartverket</a> ' +
-      '(<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">CC BY 4.0</a>); ' +
-      'modified: heights over water set to 0 m and rounded to 0.1 m',
+      'distributed by Statens vegvesen',
   },
   {
     key: 'nyc-cctv',

src/data/naturalEarthRegions.js

@@ -189,7 +189,7 @@ const loadIndex = createRetryableLoader(async () => {
   return index;
 });
 
-function toResult(entry, candidates = 1) {
+function toResult(entry) {
   return {
     name: entry.name,
     featurecla: entry.featurecla,
@@ -197,7 +197,6 @@ function toResult(entry, candidates = 1) {
     polygons: entry.polygons,
     bboxDiagonalKm: entry.bboxDiagonalKm,
     areaKm2: entry.areaKm2,
-    candidates,
   };
 }
 
@@ -210,9 +209,7 @@ function toResult(entry, candidates = 1) {
  * @param {string} query e.g. "the Alps", "Rockies", "Gulf of Mexico"
  * @returns {Promise<{name:string, featurecla:string, kind:'natural'|'marine',
  *   polygons:Array<Array<[number,number]>>, bboxDiagonalKm:number,
- *   areaKm2:number, candidates:number}|null>} largest-area match plus the
- *   number of same-name entries, or null when nothing matches. Uniqueness in
- *   this pack alone does not establish the user's intended place.
+ *   areaKm2:number}|null>} largest-area match, or null when nothing matches.
  */
 export async function findNaturalRegion(query) {
   const norm = normalizeName(query);
@@ -226,7 +223,7 @@ export async function findNaturalRegion(query) {
   for (const key of candidates) {
     if (!key) continue;
     const list = index.get(key);
-    if (list && list.length) return toResult(list[0], list.length);
+    if (list && list.length) return toResult(list[0]);
   }
   return null;
 }
@@ -273,10 +270,9 @@ export function pointInRing(ring, lat, lon) {
 /**
  * Resolve a natural-region OUTLINE ring for the annotation resolver's first
  * rung. Stricter than `findNaturalRegion`: walks ALL entries sharing the
- * matched name (duplicate names included), trying exact names, aliases and
- * broader suffix variants in that order. Returns a ring only when exactly one
- * entry under the matched name CONTAINS the anchor. Containment is the
- * disambiguator and the
+ * matched name (duplicate names included — the US and Spanish "Sierra
+ * Nevada" both exist upstream) and returns the single ring that CONTAINS the
+ * geocoded anchor. Containment is simultaneously the disambiguator and the
  * wrong-place guard: when no ring contains the anchor this returns null and
  * the resolver's normal ladder continues unchanged.
  *
@@ -295,26 +291,23 @@ export async function lookupNaturalRegionOutline(query, lat, lon) {
     ALIASES[norm],
     ...suffixVariants(ALIASES[norm] || norm),
   ];
-  for (const key of new Set(candidates.filter(Boolean))) {
-    const containing = [];
+  const seen = new Set();
+  for (const key of candidates) {
+    if (!key || seen.has(key)) continue;
+    seen.add(key);
     for (const entry of index.get(key) || []) {
-      const ring = entry.polygons.find((candidate) =>
-        pointInRing(candidate, lat, lon),
-      );
-      if (ring) containing.push({ entry, ring });
+      for (const ring of entry.polygons) {
+        if (pointInRing(ring, lat, lon)) {
+          return {
+            name: entry.name,
+            kind: entry.kind,
+            featurecla: entry.featurecla,
+            ring,
+            areaKm2: entry.areaKm2,
+          };
+        }
+      }
     }
-    // Specific names win over aliases and broader rewrites. Ambiguity belongs
-    // to this name, not the union of every lower-priority candidate name.
-    if (containing.length > 1) return null;
-    if (containing.length === 0) continue;
-    const [{ entry, ring }] = containing;
-    return {
-      name: entry.name,
-      kind: entry.kind,
-      featurecla: entry.featurecla,
-      ring,
-      areaKm2: entry.areaKm2,
-    };
   }
   return null;
 }

src/data/naturalEarthRegions.test.mjs

@@ -33,10 +33,7 @@ test('marquee ranges resolve with sane areas (owner acceptance: Alps + Rockies)'
 });
 
 test('aliases and articles: "the Alps", "Rockies", "Sahara Desert", "Himalaya"', async () => {
-  const alps = await findNaturalRegion('the Alps');
-  assert.equal(alps?.name, 'Alps');
-  assert.equal(alps?.candidates, 1);
-  assert.equal((await findNaturalRegion('Alps mountains'))?.name, 'Alps');
+  assert.equal((await findNaturalRegion('the Alps'))?.name, 'Alps');
   assert.equal((await findNaturalRegion('Rockies'))?.name, 'Rocky Mountains');
   assert.equal((await findNaturalRegion('the Rockies'))?.name, 'Rocky Mountains');
   assert.equal((await findNaturalRegion('Sahara Desert'))?.name, 'Sahara');
@@ -44,11 +41,6 @@ test('aliases and articles: "the Alps", "Rockies", "Sahara Desert", "Himalaya"',
   assert.equal((await findNaturalRegion('  THE ALPS  '))?.name, 'Alps');
 });
 
-test('duplicate natural-region names expose ambiguity instead of claiming uniqueness', async () => {
-  assert.ok((await findNaturalRegion('Cordillera Oriental'))?.candidates > 1);
-  assert.ok((await findNaturalRegion('Canadian Shield'))?.candidates > 1);
-});
-
 test('major deserts/ranges resolve with sane areas', async () => {
   const sahara = await findNaturalRegion('Sahara');
   assert.ok(sahara && sahara.areaKm2 > 8_000_000 && sahara.areaKm2 < 12_000_000,
@@ -130,55 +122,24 @@ test('listRegions() enumerates both kinds for diagnostics', async () => {
 });
 
 // ── lookupNaturalRegionOutline (resolver first-rung contract) ──────
-test('outline lookup: containing exact names win over broader suffix variants', async () => {
+test('outline lookup: Alps ring via containment anchor', async () => {
   const r = await lookupNaturalRegionOutline('the Alps', 46.5, 10.0);
   assert.ok(r, 'Alps must resolve with an inside anchor');
   assert.equal(r.name, 'Alps');
   assert.ok(r.ring.length >= 8, 'range-scale ring');
   assert.ok(r.areaKm2 > 100000 && r.areaKm2 < 400000, `sane Alps area, got ${r.areaKm2}`);
-  const range = await lookupNaturalRegionOutline('Alaska Range', 63.14, -148.71);
-  assert.equal(range?.name, 'Alaska Range');
-  assert.ok(pointInRing(range.ring, 63.14, -148.71));
-  assert.equal((await lookupNaturalRegionOutline('Alaska', 63.14, -148.71))?.name, 'Alaska');
 });
 
 test('outline lookup: duplicate names disambiguate by anchor containment', async () => {
   const us = await lookupNaturalRegionOutline('Sierra Nevada', 37.2, -119.0);
   assert.ok(us, 'US anchor must match a Sierra Nevada');
   assert.ok(pointInRing(us.ring, 37.2, -119.0), 'returned ring contains the US anchor');
-  const colombia = await lookupNaturalRegionOutline('Cordillera Oriental', 5, -73);
-  assert.ok(colombia, 'a single containing candidate resolves a duplicate name');
-  assert.ok(pointInRing(colombia.ring, 5, -73));
-});
-
-test('outline lookup: overlapping duplicate candidates remain unresolved', async () => {
-  assert.equal(await lookupNaturalRegionOutline('Canadian Shield', 45.6336, -74.86493), null);
 });
 
 test('outline lookup: anchor outside every ring → null (wrong-place guard)', async () => {
   assert.equal(await lookupNaturalRegionOutline('the Alps', 30.26, -97.77), null);
 });
 
-test('outline lookup: a unique physical-region name does not override an outside contemporary place', async () => {
-  for (const [name, lat, lon] of [
-    ['Gold Coast', -28, 153.4],
-    ['Santa Cruz', 37, -122],
-    ['Isabela', 17, 122],
-    ['India', 28, 95], // Northeast India lies outside the physical peninsula.
-    ['Korea', 33.5, 126.5], // Jeju lies outside the physical peninsula.
-  ]) {
-    assert.equal((await findNaturalRegion(name))?.candidates, 1, `${name} has a unique physical namesake`);
-    assert.equal(await lookupNaturalRegionOutline(name, lat, lon), null, `${name} requires containment`);
-  }
-});
-
-test('outline lookup: aliases retain containment checks', async () => {
-  const alps = await lookupNaturalRegionOutline('Alps mountains', 46.5, 10);
-  assert.equal(alps?.name, 'Alps');
-  assert.ok(pointInRing(alps.ring, 46.5, 10));
-  assert.equal(await lookupNaturalRegionOutline('Alps mountains', -28, 153.4), null);
-});
-
 test('outline lookup: non-region names never match', async () => {
   assert.equal(await lookupNaturalRegionOutline('Zilker Park', 30.26, -97.77), null);
   assert.equal(await lookupNaturalRegionOutline('Texas', 31.0, -99.0), null);

src/data/routePlausible.js

@@ -33,18 +33,6 @@ export function crossTrackKm(lat, lon, lat1, lon1, lat2, lon2) {
   return Math.asin(Math.sin(d13) * Math.sin(b13 - b12)) * EARTH_RADIUS_KM;
 }
 
-/** Signed distance along the great circle from the origin toward the destination. */
-function alongTrackKm(position, origin, destination) {
-  const distance = greatCircleKm(origin, position) / EARTH_RADIUS_KM;
-  const direction =
-    bearingRad(origin.lat, origin.lon, position.lat, position.lon) -
-    bearingRad(origin.lat, origin.lon, destination.lat, destination.lon);
-  return (
-    Math.atan2(Math.sin(distance) * Math.cos(direction), Math.cos(distance)) *
-    EARTH_RADIUS_KM
-  );
-}
-
 const NEAR_ENDPOINT_KM = 130;
 const CROSS_TRACK_KM = 200;
 const LOW_ALT_M = 3700; // ~12 000 ft
@@ -78,18 +66,6 @@ export function routePlausible({
   const near = (point) => greatCircleKm(position, point) < NEAR_ENDPOINT_KM;
   let geomOk = (haveO && near(origin)) || (haveD && near(destination));
   if (!geomOk && haveO && haveD) {
-    const routeKm = greatCircleKm(origin, destination);
-    const alongKm = alongTrackKm(position, origin, destination);
-    // atan2 returns the principal arc in [-πR, πR]. Near an antipodal
-    // destination, its allowed forward extension can cross that branch cut.
-    const segmentAlongKm =
-      alongKm < -CROSS_TRACK_KM
-        ? alongKm + 2 * Math.PI * EARTH_RADIUS_KM
-        : alongKm;
-    // Coincident or antipodal endpoints do not define one minor arc. Keep the
-    // existing loose check when the segment cannot be judged reliably.
-    const segmentKnown =
-      routeKm > 0.001 && routeKm < Math.PI * EARTH_RADIUS_KM - 0.001;
     geomOk =
       Math.abs(
         crossTrackKm(
@@ -100,10 +76,7 @@ export function routePlausible({
           destination.lat,
           destination.lon,
         ),
-      ) < CROSS_TRACK_KM &&
-      (!segmentKnown ||
-        (segmentAlongKm >= -CROSS_TRACK_KM &&
-          segmentAlongKm <= routeKm + CROSS_TRACK_KM));
+      ) < CROSS_TRACK_KM;
   } else if (!geomOk) {
     geomOk = true; // only one endpoint known and not near — cannot judge, allow
   }

src/data/routeSegment.test.mjs

@@ -1,174 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import * as Cesium from 'cesium';
-import { routePlausible } from './routePlausible.js';
-import { createTracking } from '../layers/flights/tracking.js';
-
-const SFO = { lat: 37.6188, lon: -122.3754, code: 'SFO' };
-const LAX = { lat: 33.9416, lon: -118.4085, code: 'LAX' };
-const beyond = { lat: -35.818227816411174, lon: -66.16647396367095 };
-const behind = { lat: 35.818227816411174, lon: 113.83352603632906 };
-const antipode = { lat: -SFO.lat, lon: SFO.lon + 180 };
-const midpoint = { lat: 35.8, lon: -120.4 };
-
-const plausible = (position, origin = SFO, destination = LAX) =>
-  routePlausible({
-    latDeg: position.lat,
-    lonDeg: position.lon,
-    altitudeM: 10000,
-    verticalRateMps: 0,
-    origin,
-    destination,
-  });
-
-// Independent spherical oracle: native unit-vector angular distances, without
-// the production bearing/cross-track/along-track calculations.
-const unit = ({ lat, lon }) => {
-  const latitude = Cesium.Math.toRadians(lat);
-  const longitude = Cesium.Math.toRadians(lon);
-  return new Cesium.Cartesian3(
-    Math.cos(latitude) * Math.cos(longitude),
-    Math.cos(latitude) * Math.sin(longitude),
-    Math.sin(latitude),
-  );
-};
-const angle = (a, b) => Cesium.Cartesian3.angleBetween(unit(a), unit(b));
-const excess = (position, origin, destination) =>
-  angle(origin, position) +
-  angle(position, destination) -
-  angle(origin, destination);
-
-test('a short airport route cannot describe a plane thousands of kilometres beyond its destination', () => {
-  assert.ok(excess(beyond, SFO, LAX) > 2.9);
-  assert.equal(plausible(beyond), false);
-});
-
-test('backwards and antipodal extensions are not the scheduled airport leg', () => {
-  for (const position of [behind, antipode]) {
-    assert.ok(excess(position, SFO, LAX) > 3);
-    assert.equal(plausible(position), false);
-  }
-});
-
-test('ordinary route offsets and generous endpoint extensions stay plausible', () => {
-  assert.ok(excess(midpoint, SFO, LAX) < 0.001);
-  for (const position of [midpoint, SFO, LAX, { lat: 36.5, lon: -119.5 }]) {
-    assert.equal(plausible(position), true);
-  }
-  // ~167 km past either endpoint is outside the 130 km endpoint circle,
-  // but remains inside the 200 km coarse-route tolerance.
-  const origin = { lat: 0, lon: 0 };
-  const destination = { lat: 0, lon: 10 };
-  assert.equal(plausible({ lat: 0, lon: -1.5 }, origin, destination), true);
-  assert.equal(plausible({ lat: 0, lon: 11.5 }, origin, destination), true);
-});
-
-test('the generous endpoint tolerance still excludes a clearly different leg', () => {
-  const origin = { lat: 0, lon: 0 };
-  const destination = { lat: 0, lon: 10 };
-  assert.equal(plausible({ lat: 0, lon: -2.5 }, origin, destination), false);
-  assert.equal(plausible({ lat: 0, lon: 12.5 }, origin, destination), false);
-});
-
-test('minor-arc admission works across the antimeridian and near the pole', () => {
-  const dateline = [
-    { lat: 10, lon: 170 },
-    { lat: 10, lon: -170 },
-  ];
-  assert.equal(plausible({ lat: 10.15, lon: 180 }, ...dateline), true);
-  assert.equal(plausible({ lat: -10.15, lon: 0 }, ...dateline), false);
-  const polar = [
-    { lat: 80, lon: -60 },
-    { lat: 80, lon: 60 },
-  ];
-  const top = { lat: 84.96163122670251, lon: 0 };
-  assert.ok(excess(top, ...polar) < 1e-8);
-  assert.equal(plausible(top, ...polar), true);
-  assert.equal(plausible({ lat: -top.lat, lon: 180 }, ...polar), false);
-});
-
-test('the forward tolerance survives the signed-angle branch cut in both directions', () => {
-  const origin = { lat: 0, lon: 0 };
-  for (const direction of [-1, 1]) {
-    const destination = { lat: 0, lon: direction * 179.9 };
-    const within = { lat: 0, lon: direction * -178.8 };
-    const endpointGapKm = angle(destination, within) * 6371.0088;
-    assert.ok(endpointGapKm > 130 && endpointGapKm < 200);
-    assert.equal(plausible(within, origin, destination), true);
-    assert.equal(
-      plausible({ lat: 0, lon: direction * -178 }, origin, destination),
-      false,
-    );
-  }
-});
-
-test('unjudgeable endpoint geometry and missing coordinates keep the loose contract', () => {
-  assert.equal(
-    plausible({ lat: 0, lon: -90 }, { lat: 0, lon: 0 }, { lat: 0, lon: 180 }),
-    true,
-  );
-  assert.equal(
-    plausible({ lat: 45, lon: 0 }, { lat: 0, lon: 0 }, { lat: 0, lon: 0 }),
-    true,
-  );
-  assert.equal(plausible(beyond, SFO, null), true);
-  assert.equal(plausible(beyond, null, null), true);
-});
-
-test('the actual native tracked label hides the wrong leg and keeps a healthy route', (t) => {
-  const collection = new Cesium.BillboardCollection();
-  t.after(() => collection.destroy());
-  const flightState = {
-    records: { data: new Map(), missingPolls: new Map() },
-    feed: { _backoff: false },
-    _billboards: new Map(),
-    _scratchCarto: new Cesium.Cartographic(),
-  };
-  // Only application host services are supplied. Route admission, WGS84
-  // billboard conversion and tracked-label formatting are the actual owners.
-  const services = Object.fromEntries(
-    [
-      'context',
-      'trails',
-      'geoid',
-      'groundFloor',
-      'focus',
-      'militaryRegistry',
-      'readout',
-      'camera',
-      'picking',
-    ].map((name) => [name, {}]),
-  );
-  services.aircraftPresentation = { isTr3b: () => false };
-  const parts = { queries: { _contactLabel: (_, info) => info.callsign } };
-  const tracking = createTracking({ flightState, services, parts });
-  for (const [position, expected] of [
-    [beyond, false],
-    [midpoint, true],
-  ]) {
-    const id = 'abc001';
-    const route = { origin: SFO, destination: LAX };
-    flightState.records.data.set(id, {
-      callsign: 'OWNED001',
-      altitude: 10000,
-      verticalRate: 0,
-      route,
-    });
-    flightState._billboards.set(
-      id,
-      collection.add({
-        id,
-        position: Cesium.Cartesian3.fromDegrees(
-          position.lon,
-          position.lat,
-          10000,
-        ),
-      }),
-    );
-    assert.equal(
-      tracking._trackedLabelText(id).includes('SFO → LAX'),
-      expected,
-    );
-    assert.equal(tracking._routeIsPlausible(id, route), expected);
-  }
-});

src/hudA11y.test.mjs

@@ -29,5 +29,5 @@ test('the first-run checkbox keeps its native visible label', () => {
 
 test('generated style sliders use the visible parameter label as their name', () => {
   assert.match(parameters, /label\.textContent\s*=\s*t\(metadata\.label\);/);
-  assert.match(parameters, /ariaLabel:\s*t\(metadata\.label\)/);
+  assert.match(parameters, /slider\.setAttribute\(['"]aria-label['"],\s*t\(metadata\.label\)\)/);
 });

src/i18n/locales/es.json

@@ -945,7 +945,7 @@
   "Image by {creator}": "Imagen de {creator}",
   "zoom in to see KartaView coverage": "acércate para ver la cobertura de KartaView",
   "no KartaView photos in view": "no hay fotos de KartaView a la vista",
-  "(by upload date)": "(por fecha de subida)",
+  "{names}: by upload date": "{names}: por fecha de subida",
   "{n} streets in view · click a line for its nearest photo": {
     "one": "{n} calle a la vista · haz clic en una línea para su foto más cercana",
     "many": "{n} calles a la vista · haz clic en una línea para su foto más cercana",

src/i18n/locales/ru.json

@@ -954,7 +954,7 @@
   "Image by {creator}": "Автор снимка: {creator}",
   "zoom in to see KartaView coverage": "приблизьтесь, чтобы увидеть покрытие KartaView",
   "no KartaView photos in view": "фотографий KartaView в зоне видимости нет",
-  "(by upload date)": "(по дате загрузки)",
+  "{names}: by upload date": "{names}: по дате загрузки",
   "{n} streets in view · click a line for its nearest photo": {
     "one": "{n} улица в кадре · щёлкните линию, чтобы открыть ближайшую фотографию",
     "few": "{n} улицы в кадре · щёлкните линию, чтобы открыть ближайшую фотографию",

src/layers/satellites/catalog.js

@@ -139,7 +139,6 @@ export function createCatalog({ state: layerState, services, parts, source }) {
           });
           layerState._points.set(noradId, point);
           layerState._denseIds.push(noradId);
-          layerState._denseStale ||= Boolean(res.stale);
           added++;
         }
         // Yield to the event loop between chunks.
@@ -227,7 +226,6 @@ export function createCatalog({ state: layerState, services, parts, source }) {
       layerState._catalog.delete(noradId);
     }
     layerState._denseIds = [];
-    layerState._denseStale = false;
     layerState._denseCursor = 0;
     layerState._count = layerState._points.size;
     layerState._catalogRevision++;

src/layers/satellites/controls.js

@@ -545,19 +545,16 @@ export function createControls({ state: layerState, services, parts, source }) {
     },
 
     getStats() {
-      const stale = Boolean(layerState._coreStale || layerState._denseStale);
       return {
         count: layerState._count,
         lastUpdate: layerState._lastUpdate,
-        stale,
+        stale: false,
         status:
           layerState._lastError === 'CelesTrak unreachable'
             ? 'unavailable'
             : layerState._lastError
               ? 'degraded'
-              : stale
-                ? 'stale'
-                : 'nominal',
+              : 'nominal',
         error: layerState._lastError,
       };
     },

src/layers/satellites/ingestion.js

@@ -36,12 +36,7 @@ export function createIngestion({
               if (!res.ok) return { ...groupDef, entries: [], ok: false };
               const entries = parts.orbits.parseTLE(res.text);
               updateSignal.throwIfAborted();
-              return {
-                ...groupDef,
-                entries,
-                ok: entries.length > 0,
-                stale: Boolean(res.stale),
-              };
+              return { ...groupDef, entries, ok: entries.length > 0 };
             } catch (error) {
               if (updateSignal.aborted || error?.name === 'AbortError')
                 throw error;
@@ -96,7 +91,6 @@ export function createIngestion({
         // catalog or those labels stay stale for the life of the session.
         layerState._detectionObjects.clear();
         layerState._denseIds = [];
-        layerState._denseStale = false;
         layerState._denseCursor = 0;
         layerState._denseLoadController?.abort();
         layerState._denseLoadController = null;
@@ -108,13 +102,11 @@ export function createIngestion({
         // Process all TLE entries in CATALOG_GROUPS order
         const allEntries = [];
         for (const r of results) {
-          for (const e of r.entries)
-            allEntries.push({ ...e, group: r.tag, stale: r.stale });
+          for (const e of r.entries) allEntries.push({ ...e, group: r.tag });
         }
 
         // Deduplicate by NORAD ID — first (most specific) group tag wins
         const seen = new Set();
-        let coreStale = false;
 
         for (const entry of allEntries) {
           const satrec = twoline2satrec(entry.line1, entry.line2);
@@ -131,8 +123,6 @@ export function createIngestion({
             group: entry.group,
           });
 
-          coreStale ||= entry.stale;
-
           // Propagate initial position
           const pos = parts.orbits.propagatePosition(satrec, now);
           if (!pos) continue;
@@ -167,7 +157,6 @@ export function createIngestion({
           parts.labels._syncIssOverlay();
         }
 
-        layerState._coreStale = coreStale;
         layerState._count = layerState._points.size;
         layerState._catalogRevision++;
         layerState._lastUpdate = Date.now();

src/layers/satellites/lifecycle.js

@@ -24,8 +24,6 @@ export function createLifecycle({
       layerState._orbitPaths = new Map();
       layerState._count = 0;
       layerState._lastUpdate = null;
-      layerState._coreStale = false;
-      layerState._denseStale = false;
       layerState._trackedNorad = null;
       parts.tracking._cancelPendingTrackingRestore();
       layerState._trackedEntity = null;
@@ -164,8 +162,6 @@ export function createLifecycle({
       layerState._rowControlsListener = null;
       layerState._count = 0;
       layerState._lastUpdate = null;
-      layerState._coreStale = false;
-      layerState._denseStale = false;
       layerState._lastError = null;
       layerState._lastFocusUpdate = 0;
       layerState._activeFocusCount = 0;

src/layers/satellites/stale.test.mjs

@@ -1,279 +0,0 @@
-import assert from 'node:assert/strict';
-import http from 'node:http';
-import { EventEmitter, once } from 'node:events';
-import test from 'node:test';
-import * as Cesium from 'cesium';
-import { createSatelliteSource } from './source.js';
-import { createState } from './state.js';
-import { createControls } from './controls.js';
-import { createOrbits } from './orbits.js';
-import { createLabels } from './labels.js';
-import { createTracking } from './tracking.js';
-import { createRendering } from './rendering.js';
-import { createCatalog } from './catalog.js';
-import { createLifecycle } from './lifecycle.js';
-import { createInteraction } from './interaction.js';
-import { createIngestion } from './ingestion.js';
-import { layerFeedState } from '../../data/feedState.js';
-
-const GROUPS = [
-  'stations',
-  'visual',
-  'gps-ops',
-  'glo-ops',
-  'galileo',
-  'geo',
-  'starlink',
-];
-
-function tle(id, invalid = false) {
-  // Owned synthetic catalog IDs over one valid element set; never live requests.
-  const motion = invalid ? ' 0.00000000' : '15.48899044';
-  return `OWNED ORBIT FIXTURE ${id}\n1 ${id}U 98067A   26289.78971908  .00007803  00000+0  15012-3 0  9995\n2 ${id}  51.6326  58.3278 0006748 271.9059  88.1156 ${motion}590607`;
-}
-
-async function fixture(t) {
-  const policy = {
-    stale: new Set(),
-    invalid: new Set(),
-    ids: {},
-    status: 200,
-    hold: false,
-  };
-  const held = new EventEmitter();
-  let heldCount = 0;
-  const server = http.createServer((req, res) => {
-    const group = req.url.split('/').at(-1);
-    if (policy.hold) {
-      held.emit('request', ++heldCount);
-      return;
-    }
-    res.writeHead(policy.status, {
-      'Content-Type': 'text/plain',
-      'X-TLE-Cache': policy.stale.has(group) ? 'STALE-ERROR' : 'MISS',
-    });
-    res.end(
-      tle(
-        policy.ids[group] ?? 25545 + GROUPS.indexOf(group),
-        policy.invalid.has(group),
-      ),
-    );
-  });
-  await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
-  const source = createSatelliteSource({
-    fetchImpl: (path, options) =>
-      fetch(`http://127.0.0.1:${server.address().port}${path}`, options),
-  });
-  // Application host services and native EventTargets; actual Cesium collections,
-  // input handler, events, SGP4, ingestion and lifecycle run without a WebGL scene.
-  const noop = () => {};
-  const services = {
-    overlays: {
-      setOverlayEntries: noop,
-      setOverlaySourceVisible: noop,
-      clearOverlaySource: noop,
-    },
-    layerState: { isExplicitLayerStateOrigin: () => false },
-    focus: {
-      clearFocusTarget: noop,
-      publishFocusTargetFromCachedPosition: noop,
-      getFocusTarget: () => null,
-    },
-    context: {
-      clearTrackedSubjectContext: noop,
-      getContextStore: () => ({ entities: new Map() }),
-      refreshTrackedSubjectContext: noop,
-      selectTrackedSubjectContext: noop,
-    },
-    readout: { refreshTrackedReadout: noop },
-    render: { holdContinuousRender: noop, releaseContinuousRender: noop },
-    picking: { registerPickOwner: noop, unregisterPickOwner: noop },
-  };
-  const previousDocument = globalThis.document;
-  globalThis.document = new EventTarget();
-  const state = createState({ services });
-  const parts = {};
-  const context = { state, services, parts, source };
-  for (const [name, factory] of Object.entries({
-    controls: createControls,
-    orbits: createOrbits,
-    labels: createLabels,
-    tracking: createTracking,
-    rendering: createRendering,
-    catalog: createCatalog,
-    interaction: createInteraction,
-    lifecycle: createLifecycle,
-    ingestion: createIngestion,
-  })) {
-    parts[name] = factory(context);
-  }
-  const viewer = {
-    scene: {
-      canvas: new EventTarget(),
-      primitives: new Cesium.PrimitiveCollection(),
-      preRender: new Cesium.Event(),
-    },
-    trackedEntityChanged: new Cesium.Event(),
-  };
-  await parts.lifecycle.methods.init(viewer);
-  t.after(async () => {
-    if (state._pointCollection) parts.lifecycle.methods.destroy(viewer);
-    viewer.scene.primitives.destroy();
-    if (previousDocument === undefined) delete globalThis.document;
-    else globalThis.document = previousDocument;
-    server.closeAllConnections();
-    await new Promise((resolve) => server.close(resolve));
-  });
-  return {
-    state,
-    parts,
-    viewer,
-    policy,
-    update: (options) => parts.ingestion.methods.update(viewer, options),
-    stats: () => parts.controls.methods.getStats(),
-    feed: () => layerFeedState(parts.controls.methods.getStats()),
-    async waitHeld(count) {
-      while (heldCount < count)
-        await once(held, 'request', { signal: AbortSignal.timeout(3000) });
-    },
-  };
-}
-
-test('stale core records surface through actual HTTP, ingestion and feed state, then recover', async (t) => {
-  const f = await fixture(t);
-  await f.update();
-  assert.equal(f.feed(), 'nominal');
-  assert.equal(f.stats().count, 6);
-  f.policy.stale = new Set(GROUPS.slice(0, 6));
-  await f.update();
-  assert.equal(f.stats().count, 6);
-  assert.equal(f.stats().stale, true);
-  assert.equal(f.feed(), 'stale');
-  f.policy.stale = new Set(['visual']);
-  await f.update();
-  assert.equal(f.feed(), 'stale');
-  f.policy.stale.clear();
-  await f.update();
-  assert.equal(f.stats().stale, false);
-  assert.equal(f.feed(), 'nominal');
-});
-
-test('a stale duplicate cannot taint its earlier fresh winning record', async (t) => {
-  const f = await fixture(t);
-  f.policy.stale.add('visual');
-  f.policy.ids.visual = 25545;
-  await f.update();
-  assert.equal(f.stats().count, 5);
-  assert.equal(f.state._catalog.get(25545).group, 'stations');
-  assert.equal(f.stats().stale, false);
-  assert.equal(f.feed(), 'nominal');
-  f.policy.stale = new Set(['stations']);
-  await f.update();
-  assert.equal(f.stats().count, 5);
-  assert.equal(
-    f.stats().stale,
-    true,
-    'a later fresh duplicate does not replace the stale winner',
-  );
-});
-
-test('invalid stale orbital elements are not admitted as provenance', async (t) => {
-  const f = await fixture(t);
-  f.policy.stale.add('visual');
-  f.policy.invalid.add('visual');
-  await f.update();
-  assert.equal(f.stats().count, 5);
-  assert.equal(f.state._catalog.has(25546), false);
-  assert.equal(f.stats().stale, false);
-});
-
-test('failed and aborted core refreshes keep provenance of retained records', async (t) => {
-  const f = await fixture(t);
-  f.policy.stale.add('stations');
-  await f.update();
-  const priorTime = f.stats().lastUpdate;
-  f.policy.status = 503;
-  await f.update();
-  assert.equal(f.stats().count, 6);
-  assert.equal(f.stats().stale, true);
-  assert.equal(f.stats().status, 'unavailable');
-  assert.equal(f.stats().lastUpdate, priorTime);
-  f.policy.hold = true;
-  const controller = new AbortController();
-  const work = f.update({ signal: controller.signal });
-  await f.waitHeld(6);
-  controller.abort();
-  await assert.rejects(work, { name: 'AbortError' });
-  assert.equal(f.stats().count, 6);
-  assert.equal(f.stats().stale, true);
-  assert.equal(f.stats().lastUpdate, priorTime);
-  assert.equal(f.state._activeUpdateControllers.size, 0);
-});
-
-test('dense provenance belongs to its admitted records and clears on removal', async (t) => {
-  const f = await fixture(t);
-  await f.update();
-  f.policy.stale.add('starlink');
-  f.state._params.catalog = 'dense';
-  assert.equal((await f.parts.catalog._loadDenseCatalog()).status, 'ready');
-  assert.equal(f.stats().count, 7);
-  assert.equal(f.feed(), 'stale');
-  f.state._params.catalog = 'core';
-  f.parts.catalog._removeDenseCatalog();
-  assert.equal(f.stats().count, 6);
-  assert.equal(f.feed(), 'nominal');
-  f.policy.stale = new Set(['stations']);
-  await f.update();
-  f.state._params.catalog = 'dense';
-  await f.parts.catalog._loadDenseCatalog();
-  f.state._params.catalog = 'core';
-  f.parts.catalog._removeDenseCatalog();
-  assert.equal(
-    f.feed(),
-    'stale',
-    'removing dense data must not clear core provenance',
-  );
-});
-
-test('cancelling dense replacement preserves admitted stale extras until rebuild', async (t) => {
-  const f = await fixture(t);
-  await f.update();
-  f.policy.stale.add('starlink');
-  f.state._params.catalog = 'dense';
-  await f.parts.catalog._loadDenseCatalog();
-  f.policy.hold = true;
-  const controller = new AbortController();
-  const work = f.parts.catalog._loadDenseCatalog({ signal: controller.signal });
-  await f.waitHeld(1);
-  controller.abort();
-  assert.equal((await work).status, 'cancelled');
-  assert.equal(f.stats().count, 7);
-  assert.equal(f.feed(), 'stale');
-  f.policy.hold = false;
-  f.policy.stale.clear();
-  f.state._params.catalog = 'core';
-  await f.update();
-  assert.equal(f.stats().count, 6);
-  assert.equal(f.feed(), 'nominal');
-});
-
-test('destroy aborts an in-flight response and initialization starts with new ownership', async (t) => {
-  const f = await fixture(t);
-  f.policy.stale.add('stations');
-  await f.update();
-  f.policy.hold = true;
-  const work = f.update();
-  await f.waitHeld(6);
-  const rejected = assert.rejects(work, { name: 'AbortError' });
-  f.parts.lifecycle.methods.destroy(f.viewer);
-  assert.equal(f.stats().count, 0);
-  assert.equal(f.stats().stale, false);
-  await f.parts.lifecycle.methods.init(f.viewer);
-  await rejected;
-  assert.equal(f.stats().stale, false);
-  f.policy.hold = false;
-  f.policy.stale.clear();
-  await f.update();
-  assert.equal(f.stats().count, 6);
-  assert.equal(f.feed(), 'nominal');
-});

src/layers/satellites/state.js

@@ -40,10 +40,6 @@ export function createState({ services }) {
 
   state._lastError = null;
 
-  // Cache provenance belongs to admitted core and dense records separately.
-  state._coreStale = false;
-  state._denseStale = false;
-
   state._activeUpdateControllers = new Set();
 
   state._denseLoadController = null;

src/layers/streetLevel/providers/kartaview/policy.js

@@ -141,7 +141,7 @@ export const FILTERED_OUT_MESSAGE = msg(
   'None of KartaView’s photos here pass the imagery filter',
 );
 /** Under the SINCE slider while KartaView is lit. */
-export const SINCE_NOTE = '(by upload date)';
+export const SINCE_NOTE = 'KartaView: by upload date';
 
 /** The UTC calendar day of `ms`, as KartaView's startDate reads it. */
 function utcDay(ms) {

src/layers/streetLevel/registry.js

@@ -23,7 +23,7 @@ export function filtersOf(provider) {
  * @property {{kind: 'view-cone', color: string}} [marker]   Default: GEV's pin.
  * @property {Array<'pano'|'since'>} [filters]   Filters it honours (default both).
  * @property {{noun: string, action: string}} [coverageLabel]   How the panel counts its lines and says what a click does (default: sequences, "click a line for its photos").
- * @property {'capture'|'upload'} [sinceBasis]   What SINCE compares (default 'capture'); 'upload' notes "(by upload date)" beside the SINCE value while the provider is lit.
+ * @property {'capture'|'upload'} [sinceBasis]   What SINCE compares (default 'capture'); 'upload' puts a note under the slider while the provider is lit.
  * @property {(context: ProviderContext) => ProviderInstance} create
  *
  * @typedef {object} ProviderContext   Handed to `create()` once by the core.

src/layers/streetLevel/uiState.js

@@ -73,14 +73,16 @@ export function filterControls(providers) {
 }
 
 /**
- * The note beside the SINCE value when a lit provider dates its imagery by
- * upload, "(by upload date)", or null. One source is lit at a time, so the
- * note needs no provider name.
+ * The note under SINCE when a lit provider dates its imagery by upload,
+ * e.g. "KartaView: by upload date", or null.
  * @param {Array<ProviderSnapshot>} providers
  */
 export function sinceNote(providers) {
-  return providers.some((p) => p.on && p.sinceBasis === 'upload')
-    ? t('(by upload date)')
+  const names = providers
+    .filter((p) => p.on && p.sinceBasis === 'upload')
+    .map((p) => p.name);
+  return names.length
+    ? t('{names}: by upload date', { names: names.join(', ') })
     : null;
 }
 

src/layers/streetLevel/uiState.test.mjs

@@ -67,7 +67,7 @@ test('the filter controls show only for a lit provider that honours them', () =>
   );
 });
 
-test('a lit provider that dates by upload notes it beside the SINCE value', () => {
+test('a lit provider that dates by upload puts a note under SINCE', () => {
   const kartaView = provider({
     id: 'kartaview',
     name: 'KartaView',
@@ -75,7 +75,7 @@ test('a lit provider that dates by upload notes it beside the SINCE value', () =
   });
   const note = (providers) => composeUIState({ ...base, providers }).sinceNote;
   assert.equal(note([provider()]), null, 'Mapillary: capture date');
-  assert.equal(note([kartaView]), '(by upload date)');
+  assert.equal(note([kartaView]), 'KartaView: by upload date');
   assert.equal(note([{ ...kartaView, on: false }]), null, 'only while lit');
 });
 

src/locations.test.mjs

@@ -152,124 +152,6 @@ test('regionFramingPlan: E-W elongated region looks along the east axis', () =>
   assert.equal(plan.headingDeg, 90);
 });
 
-// Compatibility guard for inherited geocode authority, not a newly fixed bug.
-test('search retains main geocode authority for Gold Coast, Australia', async () => {
-  const viewer = stubViewer();
-  const result = await runSearch(viewer, {}, {
-    query: 'Gold Coast',
-    result: {
-      formatted_address: 'Gold Coast, Queensland, Australia',
-      types: ['locality', 'political'],
-      geometry: {
-        location: { lat: -28, lng: 153.4 },
-        viewport: boxOf(-28.2, 153.2, -27.8, 153.6),
-      },
-    },
-  });
-  assert.equal(result.label, 'Gold Coast, Queensland, Australia');
-  assert.equal(result.navigationMode, 'city-overview');
-  assert.equal(viewer.flights.length, 1);
-  const flown = flownRectangleDegrees(viewer);
-  assert.ok(Math.abs((flown.south + flown.north) / 2 + 28) < 0.000001);
-  assert.ok(Math.abs((flown.west + flown.east) / 2 - 153.4) < 0.000001);
-});
-
-function alpsViewer() {
-  const viewer = stubViewer();
-  Object.assign(viewer.camera.positionCartographic, {
-    latitude: Cesium.Math.toRadians(46.5),
-    longitude: Cesium.Math.toRadians(10),
-    height: 248_000,
-  });
-  return viewer;
-}
-
-test('a successful nearby recovery resolves after a geocoder miss', async () => {
-  const viewer = alpsViewer();
-  const result = await searchAndFlyTo(viewer, 'the Alps', {
-    placeSearch: { async geocode() { return { place: null, answered: true }; } },
-    recoverNearView: async () => ({
-      lat: 46.6,
-      lon: 10.1,
-      label: 'The Alps local landmark',
-      types: ['locality', 'political'],
-      viewport: { low: { latitude: 46.5, longitude: 10 }, high: { latitude: 46.7, longitude: 10.2 } },
-    }),
-  });
-  assert.equal(result.label, 'The Alps local landmark');
-  assert.equal(result.navigationMode, 'city-overview');
-  assert.equal(viewer.flights.length, 1);
-});
-
-test('a geocoder miss returns null even over a namesake region', async () => {
-  for (const answered of [true, false]) {
-    const viewer = alpsViewer();
-    const result = await searchAndFlyTo(viewer, 'the Alps', {
-      placeSearch: { async geocode() { return { place: null, answered }; } },
-      recoverNearView: async () => null,
-    });
-    assert.equal(result, null);
-    assert.equal(viewer.flights.length, 0);
-  }
-});
-
-test('a geocoder rejection propagates without nearby recovery or a flight', async () => {
-  const viewer = alpsViewer();
-  const failure = new Error('geocoder failed');
-  let recoveries = 0;
-  await assert.rejects(searchAndFlyTo(viewer, 'the Alps', {
-    placeSearch: { async geocode() { throw failure; } },
-    recoverNearView: async () => { recoveries += 1; return null; },
-  }), (error) => error === failure);
-  assert.equal(recoveries, 0);
-  assert.equal(viewer.flights.length, 0);
-});
-
-test('search cancellation before or during geocoding cannot issue a flight', async () => {
-  for (const preAborted of [true, false]) {
-    const viewer = alpsViewer();
-    const controller = new AbortController();
-    if (preAborted) controller.abort();
-    let geocodes = 0;
-    let recoveries = 0;
-    await assert.rejects(searchAndFlyTo(viewer, 'the Alps', {
-      signal: controller.signal,
-      placeSearch: {
-        async geocode(_query, { signal }) {
-          geocodes += 1;
-          assert.equal(signal, controller.signal);
-          controller.abort();
-          return { place: null, answered: true };
-        },
-      },
-      recoverNearView: async () => { recoveries += 1; return null; },
-    }), { name: 'AbortError' });
-    assert.equal(geocodes, preAborted ? 0 : 1);
-    assert.equal(recoveries, 0);
-    assert.equal(viewer.flights.length, 0);
-  }
-});
-
-test('cancellation during nearby recovery cannot issue a flight', async () => {
-  const viewer = alpsViewer();
-  const controller = new AbortController();
-  let authorityChecks = 0;
-  await assert.rejects(searchAndFlyTo(viewer, 'the Alps', {
-    signal: controller.signal,
-    placeSearch: { async geocode() { return { place: null, answered: true }; } },
-    recoverNearView: async () => {
-      controller.abort();
-      return {
-        lat: 46.6, lon: 10.1, label: 'Alpine landmark',
-        types: ['locality'],
-      };
-    },
-    beforeFly: () => { authorityChecks += 1; return true; },
-  }), { name: 'AbortError' });
-  assert.equal(authorityChecks, 0);
-  assert.equal(viewer.flights.length, 0);
-});
-
 test('regionFramingPlan: park- and lake-scale viewports keep full framing', () => {
   // Zilker Park (~3 km).
   assert.equal(regionFramingPlan({

src/streetLevelMarkup.test.mjs

@@ -70,24 +70,26 @@ test('the key gate holds every filter, with the error line outside it', () => {
   assert.match(html, /id="sl-error"[^>]*role="alert"/);
 });
 
-test('each radiogroup is one tab stop, on its checked button', () => {
-  for (const [group, checked] of [
+test('the segmented filters are toggle buttons, each its own tab stop', () => {
+  for (const [group, chosen] of [
     ['data-sl-render', 'letterbox'],
     ['data-sl-pano', 'all'],
   ]) {
-    const radios = [
+    const buttons = [
       ...html.matchAll(
         new RegExp(`<button [^>]*${group}="([a-z]+)"[^>]*>`, 'g'),
       ),
     ];
-    assert.ok(radios.length >= 2, group);
-    for (const [tag, value] of radios)
-      assert.equal(
-        /tabindex="-1"/.test(tag),
-        value !== checked,
-        `${group}="${value}" roving tab stop`,
-      );
+    assert.ok(buttons.length >= 2, group);
+    for (const [tag, value] of buttons) {
+      assert.match(tag, new RegExp(`aria-pressed="${value === chosen}"`));
+      assert.doesNotMatch(tag, /role="radio"|tabindex=/, `${group}="${value}"`);
+    }
   }
+  assert.doesNotMatch(
+    html,
+    /role="radiogroup"[^>]*(Image fit|Panorama filter)/,
+  );
 });
 
 test('the Cyber theme frames the Street Level panel like its rail peers (P3)', () => {

src/ui/aircraftDisplay.js

@@ -1,5 +1,3 @@
-import { syncSegmentedControl } from './segmentedControl.js';
-
 /** Own the shared aircraft display preference and its controls. */
 export class AircraftDisplay {
   constructor({ elements, readDataManager, layout }) {
@@ -30,9 +28,12 @@ export class AircraftDisplay {
     this._models3dMode = options.models3dMode === 'all' ? 'all' : 'proximity';
     this._syncModels3dButtonState();
     this._models3dModeRow?.classList.toggle('visible', this._models3dEnabled);
-    syncSegmentedControl(this._models3dModeBtns, this._models3dMode, {
-      valueOf: (button) => button.dataset.mode,
-    });
+    for (const button of this._models3dModeBtns || []) {
+      if (!button) continue;
+      const active = button.dataset.mode === this._models3dMode;
+      button.classList.toggle('active', active);
+      button.setAttribute('aria-checked', String(active));
+    }
     this._layoutRightPanels();
   }
 
@@ -58,9 +59,12 @@ export class AircraftDisplay {
     const normalized = mode === 'all' ? 'all' : 'proximity';
     this._models3dMode = normalized;
     this._setModels3dParams({ models3dMode: normalized });
-    syncSegmentedControl(this._models3dModeBtns, normalized, {
-      valueOf: (button) => button.dataset.mode,
-    });
+    for (const button of this._models3dModeBtns) {
+      if (!button) continue;
+      const active = button.dataset.mode === normalized;
+      button.classList.toggle('active', active);
+      button.setAttribute('aria-checked', String(active));
+    }
     this._syncModels3dButtonState();
   }
 

src/ui/applicationShell.js

@@ -402,7 +402,11 @@ export class StyleManager extends ShellFacade {
       readDataManager: () => this._dataManager,
       readContext: () => this.getContextModeState(),
       readActiveStyle: () => this.activeStyle,
-      enterPanels: () => this._panelChrome.enterCockpit(),
+      enterPanels: () => {
+        // The cockpit hides the panels: an expanded street-level photo too.
+        this._streetLevelControls?.shrinkViewer();
+        this._panelChrome.enterCockpit();
+      },
       exitPanels: () => this._panelChrome.exitCockpit(),
     });
 
@@ -1108,12 +1112,6 @@ export class StyleManager extends ShellFacade {
         setPanelCollapsed: (collapsed, options) =>
           this.setPanelCollapsed('street-level-panel', collapsed, options),
         showToast: (message) => this._showToast(message),
-        // Lets the panel open for a user, voice or tool switch-on, not a restore.
-        subscribeEnableRequests: (listener) =>
-          this._dataManager?.subscribeVisibilityRequests?.((change) => {
-            if (change?.layerId === 'street-level' && change.enabled)
-              listener(change.origin);
-          }) || null,
       },
     });
     this._streetLevelControls.connect();
@@ -1236,6 +1234,8 @@ export class StyleManager extends ShellFacade {
         ? forceEnabled
         : !document.body.classList.contains('ui-clean-view');
     document.body.classList.toggle('ui-clean-view', shouldEnable);
+    // Clean View hides the panels: an expanded street-level photo too.
+    if (shouldEnable) this._streetLevelControls?.shrinkViewer();
     if (this._cleanViewBtn) {
       this._cleanViewBtn.classList.toggle('active', shouldEnable);
     }

src/ui/displayControls.js

@@ -1,5 +1,3 @@
-import { createSegmentedControl } from './segmentedControl.js';
-
 /**
  * Bind Display controls to application actions. Inputs remain native DOM controls;
  * the caller owns settings and effect state. Destroy before replacing the view.
@@ -46,25 +44,12 @@ export function bindDisplayControls({ elements, actions }) {
     listen(elements[name], 'input', action, integer);
   for (const el of elements.styleButtons || [])
     listen(el, 'click', 'setStyle', (el) => el.dataset.style);
-  for (const [buttons, valueOf, action] of [
-    [
-      elements.allocationButtons || [],
-      (el) => el.dataset.allocation,
-      'setAllocation',
-    ],
-    [
-      elements.modelModeButtons || [],
-      (el) => (el.dataset.mode === 'all' ? 'all' : 'proximity'),
-      'setModelsMode',
-    ],
-  ]) {
-    const control = createSegmentedControl({
-      buttons,
-      valueOf,
-      onChange: (value) => actions[action](value),
-    });
-    removers.push(() => control.destroy());
-  }
+  for (const el of elements.allocationButtons || [])
+    listen(el, 'click', 'setAllocation', (el) => el.dataset.allocation);
+  for (const el of elements.modelModeButtons || [])
+    listen(el, 'click', 'setModelsMode', (el) =>
+      el.dataset.mode === 'all' ? 'all' : 'proximity',
+    );
   for (const el of elements.fadeSliders || []) listen(el, 'input', 'setFade');
   return {
     destroy() {

src/ui/panelPositionControls.js

@@ -8,10 +8,14 @@ const PANEL_LAYOUT_STORAGE_VERSION = 'v6';
  * the layout-reset notice and the documented key.
  */
 const PANEL_POSITION_STORAGE_VERSION = 'v8';
-/** Floating panels' stored positions and hint flag: nothing reads them now. */
+/**
+ * Floating panels' stored positions and hint flag, and Street Level's saved
+ * FIT / FILL (each session now starts at FIT): nothing reads them now.
+ */
 const RETIRED_PANEL_KEY_PREFIXES = [
   `godsEyeView.${PANEL_POSITION_STORAGE_VERSION}.panelPos.`,
   `godsEyeView.${PANEL_POSITION_STORAGE_VERSION}.panelFloatHintShown`,
+  'gev:street-level:render-mode',
 ];
 export class PanelPositionControls {
   constructor({ syncPanelCollapseButton, showToast }) {

src/ui/panelPositionControls.test.mjs

@@ -14,11 +14,12 @@ function fakeStorage(entries) {
   return storage;
 }
 
-test('the floating panels’ stored positions and hint flag are dropped; collapse state stays', (t) => {
+test('retired panel and FIT / FILL keys are dropped; collapse state stays', (t) => {
   const saved = globalThis.localStorage;
   globalThis.localStorage = fakeStorage({
     'godsEyeView.v8.panelPos.cctv-panel': '{"x":1}',
     'godsEyeView.v8.panelFloatHintShown': '1',
+    'gev:street-level:render-mode': 'fill',
     'godsEyeView.v6.panelCollapsed.cctv-panel': '1',
     'godsEyeView.v8.layoutResetNotified': '1',
   });

src/ui/railCardBlocks.js

@@ -2,7 +2,6 @@ import { t } from '../i18n/index.js';
 import { syncChipGroup } from './chipGroup.js';
 import { syncRowList } from './rowList.js';
 import { formatScaleLabel, unitLabel } from './unitLabels.js';
-import { createSlider } from './slider.js';
 
 const set = (node, key, value) => {
   if (node[key] !== value) node[key] = value;
@@ -91,11 +90,12 @@ export function createRailCardBlocks({ container, cardId, onParams }) {
               'rail-card-setting-range-label',
               block.rangeRow,
             );
-            block.rangeInput = createSlider({
-              documentRef: document,
-              className: 'rail-card-setting-range',
-            });
-            block.rangeRow.appendChild(block.rangeInput);
+            block.rangeInput = make(
+              'input',
+              'rail-card-setting-range',
+              block.rangeRow,
+            );
+            block.rangeInput.type = 'range';
             block.rangeValue = make(
               'span',
               'rail-card-setting-range-value',

src/ui/railTimeline.js

@@ -1,5 +1,4 @@
 import { formatUtcDayMonth, t } from '../i18n/index.js';
-import { createSlider } from './slider.js';
 const set = (node, key, value) => {
   if (node[key] !== value) node[key] = value;
 };
@@ -44,15 +43,14 @@ export function createRailTimeline({
     return node;
   };
   const previous = makeButton('‹', t('Earlier observation'), row);
-  const slider = createSlider({
-    documentRef: document,
-    className: sliderClassName,
-    min: '0',
-    max: '0',
-    step: '1',
-    value: '0',
-    ariaLabel: t('Observed history'),
-  });
+  const slider = document.createElement('input');
+  slider.type = 'range';
+  slider.className = `gev-quantitative-slider${sliderClassName ? ` ${sliderClassName}` : ''}`;
+  slider.min = '0';
+  slider.max = '0';
+  slider.step = '1';
+  slider.value = '0';
+  slider.setAttribute('aria-label', t('Observed history'));
   row.appendChild(slider);
   const next = makeButton('›', t('Later observation'), row);
   const controls = document.createElement('div');

src/ui/recentImagery.js

@@ -12,8 +12,6 @@ import { formatNumber, msg, t, tn, translateKnown } from '../i18n/index.js';
 import { createRailCardBlocks } from './railCardBlocks.js';
 import { createRailCards } from './railCards.js';
 import { createImagerySplit } from './imagerySplit.js';
-import { createSlider } from './slider.js';
-import { createSegmentedControl } from './segmentedControl.js';
 import {
   PRODUCTS,
   hhmm,
@@ -288,13 +286,13 @@ export function createRecentImageryPanel({
   const selection = el('section', 'ri-block ri-selection', root);
   selection.id = 'ri-selection';
   selection.setAttribute('aria-label', t('On the map'));
-  const modeGroup = el('div', 'gev-segmented ri-mode', selection);
+  const modeGroup = el('div', 'ri-mode', selection);
   modeGroup.id = 'ri-mode';
   modeGroup.setAttribute('role', 'radiogroup');
   modeGroup.setAttribute('aria-label', t('Mode'));
   const modeButtons = new Map(
     MODE_LABELS.map(([mode, label]) => {
-      const node = el('button', 'gev-segment ri-mode-btn', modeGroup);
+      const node = el('button', 'data-toggle-chip ri-mode-btn', modeGroup);
       node.type = 'button';
       node.textContent = t(label);
       node.dataset.mode = mode;
@@ -302,15 +300,6 @@ export function createRecentImageryPanel({
       return [mode, node];
     }),
   );
-  const modeControl = createSegmentedControl({
-    buttons: modeButtons.values(),
-    valueOf: (button) => button.dataset.mode,
-    onChange: (mode) => layer.setMode(mode),
-    keyboard: 'arrows',
-    keyTarget: modeGroup,
-    readValue: () => snapshot.mode,
-    listen,
-  });
   const slotRows = {};
   for (const slotId of ['a', 'b']) {
     const row = el('div', 'ri-slot', selection);
@@ -329,17 +318,16 @@ export function createRecentImageryPanel({
   const opacityLabel = el('label', 'ri-opacity-label', controls);
   el('span', '', opacityLabel, t('OPACITY'));
   const opacityValue = el('span', 'ri-opacity-value', opacityLabel, '100%');
-  const opacity = createSlider({
-    documentRef: document,
-    className: 'ri-opacity',
+  const opacity = el('input', 'ri-opacity', controls);
+  opacity.id = 'ri-opacity';
+  Object.assign(opacity, {
+    type: 'range',
     min: '0',
     max: '100',
     step: '1',
     value: '100',
-    ariaLabel: t('Imagery opacity'),
   });
-  opacity.id = 'ri-opacity';
-  controls.appendChild(opacity);
+  opacity.setAttribute('aria-label', t('Imagery opacity'));
   opacityLabel.htmlFor = 'ri-opacity';
   // Its slot is always there; it is only usable while a swipe is live.
   const swap = el('button', 'data-toggle-chip ri-swap', controls, t('SWAP'));
@@ -680,7 +668,12 @@ export function createRecentImageryPanel({
   function renderSelection() {
     const { mode } = snapshot;
     set(selection.dataset, 'mode', mode);
-    modeControl.update(mode, { rovingFocus: true });
+    for (const [id, node] of modeButtons) {
+      const on = id === mode;
+      attribute(node, 'aria-checked', String(on));
+      toggle(node, 'active', on);
+      set(node, 'tabIndex', on ? 0 : -1);
+    }
     const ab = mode === 'ab';
     for (const slotId of ['a', 'b']) {
       const { row, tag, value, unpin } = slotRows[slotId];
@@ -1072,6 +1065,11 @@ export function createRecentImageryPanel({
       strip.focus({ preventScroll: true });
       return;
     }
+    const mode = target?.closest?.('.ri-mode-btn');
+    if (mode) {
+      layer.setMode(mode.dataset.mode);
+      return;
+    }
     if (target?.closest?.('.ri-swap') && !swap.disabled) {
       layer.swapSides?.();
       return;
@@ -1088,6 +1086,21 @@ export function createRecentImageryPanel({
     if (event.target === opacity) layer.setAlpha(Number(opacity.value) / 100);
   });
 
+  listen(modeGroup, 'keydown', (event) => {
+    const order = MODE_LABELS.map(([mode]) => mode);
+    const step =
+      { ArrowLeft: -1, ArrowUp: -1, ArrowRight: 1, ArrowDown: 1 }[event.key] ||
+      0;
+    if (!step) return;
+    event.preventDefault();
+    const next =
+      order[
+        (order.indexOf(snapshot.mode) + step + order.length) % order.length
+      ];
+    layer.setMode(next);
+    modeButtons.get(next)?.focus?.();
+  });
+
   listen(strip, 'keydown', (event) => {
     const total = snapshot.candidates.length;
     const index = snapshot.focusIndex || 0;

src/ui/recentImagery.test.mjs

@@ -412,7 +412,7 @@ test('the body is a fixed stack of seven blocks in a fixed order, each with a fi
   assert.match(rule('.recent-imagery-readout .ri-card'), /height: 112px/);
   assert.match(
     rule('.recent-imagery-readout .ri-selection'),
-    /grid-template-rows: 26px 20px 20px/,
+    /grid-template-rows: 20px 20px 20px/,
   );
   assert.match(rule('.recent-imagery-readout .ri-slot'), /height: 20px/);
   assert.match(rule('.recent-imagery-readout .ri-controls'), /height: 22px/);
@@ -445,7 +445,7 @@ test('no control changes place in the tree, no block is hidden and every fixed-h
   /**
    * Every block that must keep its height: the node carrying the class, that
    * class, and the rule it gets its height from. The mode row is the first
-   * 26 px track of the selection grid. The details header has no height of
+   * 20 px track of the selection grid. The details header has no height of
    * its own: it is the last block, so it moves nothing below it, and its
    * title is held to one line.
    */
@@ -491,7 +491,7 @@ test('no control changes place in the tree, no block is hidden and every fixed-h
         mode.parentNode.children[0] === mode ? mode.parentNode : null,
         'ri-selection',
         readout('.ri-selection'),
-        /grid-template-rows: 26px 20px 20px/,
+        /grid-template-rows: 20px 20px 20px/,
       ],
       'ri-slot-a': [
         f.byId('ri-slot-a'),

src/ui/segmentedControl.js

@@ -1,109 +0,0 @@
-const STEPS = { ArrowRight: 1, ArrowDown: 1, ArrowLeft: -1, ArrowUp: -1 };
-
-/** Pure value navigation, also usable by a future template-based view. */
-export function nextSegmentValue(values, value, key, { homeEnd = true } = {}) {
-  if (!values.length) return undefined;
-  if (homeEnd && key === 'Home') return values[0];
-  if (homeEnd && key === 'End') return values.at(-1);
-  const step = STEPS[key];
-  if (!step) return undefined;
-  return values[(values.indexOf(value) + step + values.length) % values.length];
-}
-
-/** Paint controlled selection without emitting changes or moving focus. */
-export function syncSegmentedControl(
-  buttons,
-  value,
-  { valueOf, activeClass = 'active', rovingFocus = false } = {},
-) {
-  for (const button of buttons || []) {
-    if (!button) continue;
-    const selected = valueOf(button) === value;
-    if (button.classList.contains(activeClass) !== selected)
-      button.classList.toggle(activeClass, selected);
-    const set = (name, content) => {
-      if (button.getAttribute?.(name) !== content)
-        button.setAttribute(name, content);
-    };
-    set('aria-checked', String(selected));
-    if (rovingFocus) set('tabindex', selected ? '0' : '-1');
-  }
-}
-
-/**
- * Controlled segmented-selector DOM adapter. Feature owners supply values and
- * receive changes; rendering a restored value never triggers the callback.
- * `keyboard` retains each existing group's policy: none, arrows, or radio
- * (arrows plus Home/End). Pointer and native Enter/Space share the click path.
- * An injected listener owner keeps the feature's existing teardown boundary.
- * @param {object} options
- * @param {Iterable<HTMLButtonElement>} options.buttons
- * @param {Function} options.valueOf Maps a button to the feature's value.
- * @param {Function} options.onChange Receives value and originating button.
- * @param {'none'|'arrows'|'radio'} [options.keyboard]
- * @param {HTMLElement} [options.keyTarget] Delegated keyboard target, if any.
- * @param {Function} [options.readValue] Current controlled value for delegation.
- * @param {Function} [options.listen] Feature-owned event registration.
- * @returns {{ update: Function, destroy: Function }}
- */
-export function createSegmentedControl({
-  buttons,
-  valueOf,
-  onChange,
-  keyboard = 'none',
-  keyTarget,
-  readValue,
-  listen,
-}) {
-  const options = [...buttons].filter(Boolean);
-  const removers = [];
-  let destroyed = false;
-  const bind = (target, type, handler) => {
-    const owned = (event) => {
-      if (!destroyed) handler(event);
-    };
-    if (listen) listen(target, type, owned);
-    else {
-      target.addEventListener(type, owned);
-      removers.push(() => target.removeEventListener(type, owned));
-    }
-  };
-  for (const button of options)
-    bind(button, 'click', () => {
-      if (!button.disabled) onChange(valueOf(button), button);
-    });
-  const navigate = (event, from) => {
-    const enabled = options.filter((button) => !button.disabled);
-    const values = enabled.map(valueOf);
-    const next = nextSegmentValue(values, from, event.key, {
-      homeEnd: keyboard === 'radio',
-    });
-    if (next === undefined) return;
-    const button = enabled.find((option) => valueOf(option) === next);
-    event.preventDefault();
-    if (keyTarget) {
-      button.click();
-      button.focus();
-    } else {
-      button.focus();
-      if (next !== from) button.click();
-    }
-  };
-  if (keyboard !== 'none') {
-    if (keyTarget)
-      bind(keyTarget, 'keydown', (event) => navigate(event, readValue()));
-    else
-      for (const button of options)
-        bind(button, 'keydown', (event) => navigate(event, valueOf(button)));
-  }
-  return {
-    update(value, presentation) {
-      if (!destroyed)
-        syncSegmentedControl(options, value, { valueOf, ...presentation });
-    },
-    destroy() {
-      destroyed = true;
-      for (const remove of removers.splice(0)) remove();
-    },
-  };
-}

src/ui/segmentedControl.test.mjs

@@ -1,174 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { railFixture } from './railTestFixture.mjs';
-import {
-  createSegmentedControl,
-  nextSegmentValue,
-} from './segmentedControl.js';
-
-function fixture(options = {}) {
-  let writes = 0;
-  const f = railFixture(() => writes++);
-  const buttons = ['a', 'b', 'c'].map((value) => {
-    const button = f.document.createElement('button');
-    button.dataset.value = value;
-    f.container.appendChild(button);
-    return button;
-  });
-  const calls = [];
-  const control = createSegmentedControl({
-    buttons,
-    valueOf: (button) => button.dataset.value,
-    onChange: (value) => calls.push(value),
-    ...options,
-  });
-  const key = (target, value) => {
-    const event = new Event('keydown', { cancelable: true });
-    Object.defineProperty(event, 'key', { value });
-    target.dispatchEvent(event);
-    return event.defaultPrevented;
-  };
-  return { ...f, buttons, calls, control, key, writes: () => writes };
-}
-
-test('controlled restoration updates selection without emitting or stealing focus', () => {
-  const f = fixture();
-  f.buttons[0].focus();
-  f.control.update('b', { rovingFocus: true });
-  assert.deepEqual(f.calls, []);
-  assert.equal(f.document.activeElement, f.buttons[0]);
-  assert.deepEqual(
-    f.buttons.map((b) => b.getAttribute('aria-checked')),
-    ['false', 'true', 'false'],
-  );
-  assert.deepEqual(
-    f.buttons.map((b) => b.getAttribute('tabindex')),
-    ['-1', '0', '-1'],
-  );
-  const before = f.writes();
-  f.control.update('b', { rovingFocus: true });
-  assert.equal(
-    f.writes(),
-    before,
-    'unchanged renders must not retrigger rail observers',
-  );
-  f.control.destroy();
-});
-
-test('clicks emit current values once, including reselection; disabled controls do not emit', () => {
-  const f = fixture();
-  f.control.update('a');
-  f.buttons[0].click();
-  f.buttons[0].click();
-  f.buttons[1].dataset.value = 'renamed';
-  f.buttons[1].click();
-  f.buttons[2].disabled = true;
-  f.buttons[2].dispatchEvent(new Event('click'));
-  assert.deepEqual(f.calls, ['a', 'a', 'renamed']);
-  assert.equal(
-    f.buttons[0].getAttribute('aria-checked'),
-    'true',
-    'the owner controls selection',
-  );
-  f.control.destroy();
-});
-
-test('radio navigation wraps, skips disabled choices, and retains Home/End semantics', () => {
-  const f = fixture({ keyboard: 'radio' });
-  f.buttons[1].disabled = true;
-  assert.equal(f.key(f.buttons[0], 'ArrowRight'), true);
-  assert.equal(f.document.activeElement, f.buttons[2]);
-  assert.deepEqual(f.calls, ['c']);
-  f.key(f.buttons[2], 'ArrowDown');
-  assert.equal(f.document.activeElement, f.buttons[0]);
-  f.key(f.buttons[0], 'Home');
-  assert.deepEqual(
-    f.calls,
-    ['c', 'a'],
-    'Home on the first button does not reselect it',
-  );
-  f.key(f.buttons[0], 'End');
-  assert.equal(f.document.activeElement, f.buttons[2]);
-  assert.deepEqual(f.calls, ['c', 'a', 'c']);
-  f.control.destroy();
-});
-
-test('legacy click-only groups leave arrows and tab order to their existing owner', () => {
-  const f = fixture();
-  f.control.update('b');
-  assert.equal(f.key(f.buttons[0], 'ArrowRight'), false);
-  assert.equal(f.key(f.buttons[0], 'Home'), false);
-  assert.deepEqual(f.calls, []);
-  assert.ok(
-    f.buttons.every((button) => button.getAttribute('tabindex') === null),
-  );
-  f.control.destroy();
-});
-
-test('delegated imagery keys navigate from the controlled value, not stale focus', () => {
-  const f = railFixture();
-  const buttons = ['a', 'b', 'c'].map((value) => {
-    const button = f.document.createElement('button');
-    button.dataset.value = value;
-    f.container.appendChild(button);
-    return button;
-  });
-  let selected = 'c';
-  const calls = [];
-  const control = createSegmentedControl({
-    buttons,
-    valueOf: (b) => b.dataset.value,
-    onChange: (value) => {
-      calls.push(value);
-      selected = value;
-    },
-    keyboard: 'arrows',
-    keyTarget: f.container,
-    readValue: () => selected,
-  });
-  const event = new Event('keydown', { cancelable: true });
-  Object.defineProperty(event, 'key', { value: 'ArrowRight' });
-  f.container.dispatchEvent(event);
-  assert.deepEqual(calls, ['a']);
-  assert.equal(f.document.activeElement, buttons[0]);
-  const home = new Event('keydown', { cancelable: true });
-  Object.defineProperty(home, 'key', { value: 'Home' });
-  f.container.dispatchEvent(home);
-  assert.equal(home.defaultPrevented, false);
-  assert.deepEqual(calls, ['a']);
-  control.destroy();
-});
-
-test('disposal revokes detached controls and replacement subscriptions fire once', () => {
-  const f = fixture({ keyboard: 'radio' });
-  f.control.destroy();
-  const next = [];
-  const replacement = createSegmentedControl({
-    buttons: f.buttons,
-    valueOf: (b) => b.dataset.value,
-    onChange: (value) => next.push(value),
-    keyboard: 'radio',
-  });
-  f.buttons[0].click();
-  f.key(f.buttons[0], 'End');
-  assert.deepEqual(f.calls, []);
-  assert.deepEqual(next, ['a', 'c']);
-  replacement.destroy();
-  replacement.destroy();
-  f.buttons[1].click();
-  f.key(f.buttons[0], 'End');
-  assert.deepEqual(next, ['a', 'c']);
-});
-
-test('pure value navigation can be reused without a DOM', () => {
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fill', 'ArrowRight'), 'fit');
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fit', 'ArrowUp'), 'fill');
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fill', 'Home'), 'fit');
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fit', 'End'), 'fill');
-  assert.equal(
-    nextSegmentValue(['fit', 'fill'], 'fit', 'Home', { homeEnd: false }),
-    undefined,
-  );
-  assert.equal(nextSegmentValue([], 'fit', 'ArrowRight'), undefined);
-  assert.equal(nextSegmentValue(['fit'], 'fit', 'Escape'), undefined);
-});

src/ui/shellFacade.js

@@ -1182,6 +1182,9 @@ export class ShellFacade {
    * @returns {void}
    */
   setRecordingMode(enabled, options) {
+    // Recording hides the panels: an expanded street-level photo goes too.
+    if (enabled && options?.hidePanels !== false)
+      this._streetLevelControls?.shrinkViewer();
     return this._recording.setRecordingMode(enabled, options);
   }
 

src/ui/slider.js

@@ -1,32 +0,0 @@
-/**
- * Build the shared native slider. Feature owners retain their input/change
- * listeners, formatting and teardown; this component installs no handlers.
- * Static sliders use the same gev-quantitative-slider class in their template.
- * @param {object} options
- * @param {Document} [options.documentRef] Document that owns the input.
- * @param {string} [options.className] Additional feature/layout hooks.
- * @param {number|string} [options.min]
- * @param {number|string} [options.max]
- * @param {number|string} [options.step]
- * @param {number|string} [options.value]
- * @param {string} [options.ariaLabel] Already translated accessible name.
- * @returns {HTMLInputElement}
- */
-export function createSlider({
-  documentRef = globalThis.document,
-  className = '',
-  min,
-  max,
-  step,
-  value,
-  ariaLabel,
-} = {}) {
-  const input = documentRef.createElement('input');
-  input.type = 'range';
-  input.className = `gev-quantitative-slider${className ? ` ${className}` : ''}`;
-  for (const [key, setting] of Object.entries({ min, max, step, value })) {
-    if (setting !== undefined) input[key] = setting;
-  }
-  if (ariaLabel !== undefined) input.setAttribute('aria-label', ariaLabel);
-  return input;
-}

src/ui/streetLevelControls.js

@@ -1,19 +1,10 @@
-import { isExplicitLayerStateOrigin } from '../data/layerState.js';
 import { syncChipGroup } from './chipGroup.js';
-import {
-  createSegmentedControl,
-  syncSegmentedControl,
-} from './segmentedControl.js';
 import {
   presentStreetLevelPanel,
   SINCE_STOPS,
 } from './streetLevelPresentation.js';
 import { t, translateKnown } from '../i18n/index.js';
 
-const RENDER_MODE_KEY = 'gev:street-level:render-mode';
-/** <body> classes of the modes that hide every panel; an expanded photo leaves with them. */
-const PANEL_HIDING_MODES = ['ui-clean-view', 'recording-mode', 'cockpit-mode'];
-
 // Renders run on every layer notification, and the rail's MutationObserver
 // relays out on each attribute write: write only what changed.
 const setProp = (node, key, value) => {
@@ -37,11 +28,11 @@ export class StreetLevelControls {
     this._unsubscribe = null;
     this._state = null;
     this._view = null;
-    this._wasEnabled = null;
     this._wasOpen = false;
-    // Whether the last switch-on was explicit (user, voice, tool), not a restore.
-    this._explicitEnable = false;
-    this._unsubscribeEnableRequests = null;
+    /** The error last shown: the same one never reopens the panel. */
+    this._streetError = null;
+    /** The SINCE option for a day count between the stops, while one is set. */
+    this._customSince = null;
     this._resizeQueued = false;
     this._elements = this._collect();
     this._bind();
@@ -61,8 +52,7 @@ export class StreetLevelControls {
       errorText: byId('sl-error-text'),
       panoRow: byId('sl-pano-row'),
       sinceRow: byId('sl-since-row'),
-      sinceRange: byId('sl-since'),
-      sinceLabel: byId('sl-since-label'),
+      since: byId('sl-since'),
       sinceNote: byId('sl-since-note'),
       viewerWrap: byId('sl-viewer-wrap'),
       viewerExpand: byId('sl-viewer-expand'),
@@ -104,23 +94,20 @@ export class StreetLevelControls {
       }
       this._toggleProvider(button.dataset.chipId);
     });
-    createSegmentedControl({
-      buttons: el.panoButtons,
-      valueOf: (button) => button.dataset.slPano,
-      onChange: (pano) => this._setParams({ pano }),
-      keyboard: 'radio',
-      listen: (target, type, handler) => this.listen(target, type, handler),
-    });
-    // The readout follows the thumb; coverage is rebuilt once, on release.
-    const sinceDays = () =>
-      SINCE_STOPS[Number(el.sinceRange?.value) || 0]?.days ?? 0;
-    this.listen(el.sinceRange, 'input', () => {
-      const label = t(SINCE_STOPS[Number(el.sinceRange.value) || 0].label);
-      if (el.sinceLabel) el.sinceLabel.textContent = label;
-      el.sinceRange.setAttribute('aria-valuetext', label);
-    });
-    this.listen(el.sinceRange, 'change', () =>
-      this._setParams({ sinceDays: sinceDays() }),
+    for (const button of el.panoButtons) {
+      this.listen(button, 'click', () =>
+        this._setParams({ pano: button.dataset.slPano }),
+      );
+    }
+    // The stops, in the UI language (a language change reloads the page).
+    for (const stop of SINCE_STOPS) {
+      const option = document.createElement('option');
+      option.value = String(stop.days);
+      option.textContent = t(stop.label);
+      el.since?.appendChild(option);
+    }
+    this.listen(el.since, 'change', () =>
+      this._setParams({ sinceDays: Number(el.since.value) || 0 }),
     );
     this.listen(el.nearestBtn, 'click', () => {
       const nearest = this._view?.nearest;
@@ -158,27 +145,10 @@ export class StreetLevelControls {
         this._exitExpanded();
       });
     } else setProp(el.viewerExpand, 'hidden', true);
-    createSegmentedControl({
-      buttons: el.renderButtons,
-      valueOf: (button) => button.dataset.slRender,
-      keyboard: 'radio',
-      listen: (target, type, handler) => this.listen(target, type, handler),
-      onChange: (mode) => {
-        this.layer.setViewerRenderMode?.(mode);
-        try {
-          localStorage.setItem(RENDER_MODE_KEY, mode);
-        } catch {
-          /* storage unavailable */
-        }
-      },
-    });
-    try {
-      const stored = localStorage.getItem(RENDER_MODE_KEY);
-      if (stored === 'fill' || stored === 'letterbox')
-        this.layer.setViewerRenderMode?.(stored);
-    } catch {
-      /* storage unavailable */
-    }
+    for (const button of el.renderButtons)
+      this.listen(button, 'click', () =>
+        this.layer.setViewerRenderMode?.(button.dataset.slRender),
+      );
     // MapillaryJS only tracks window resizes; the panel resizes on its own.
     if (typeof ResizeObserver === 'function' && el.viewer) {
       this._resizeObserver = new ResizeObserver(() => this._requestResize());
@@ -298,32 +268,18 @@ export class StreetLevelControls {
     this._syncExpanded();
   }
 
-  /** Clean View, recording and the cockpit hide every panel, so they end EXPAND too. */
-  _watchPanelHidingModes(on) {
-    const body = document.body;
-    if (!on || !body) {
-      this._modesObserver?.disconnect();
-      this._modesObserver = null;
-      return;
-    }
-    const leaveIfHiding = () => {
-      if (PANEL_HIDING_MODES.some((mode) => body.classList.contains(mode)))
-        this._exitExpanded();
-    };
-    if (!this._modesObserver && typeof MutationObserver === 'function') {
-      this._modesObserver = new MutationObserver(leaveIfHiding);
-      this._modesObserver.observe(body, {
-        attributes: true,
-        attributeFilter: ['class'],
-      });
-    }
-    leaveIfHiding();
+  /**
+   * Shrink an expanded photo. Clean View, recording and the cockpit hide
+   * every panel and call it, so the photo does not stay full screen (or, on
+   * iPhone, as a popover) over them.
+   */
+  shrinkViewer() {
+    this._exitExpanded();
   }
 
-  /** Mirror the expanded state on EXPAND, watch the panel-hiding modes, refit. */
+  /** Mirror the expanded state on EXPAND and refit. */
   _syncExpanded() {
     const on = this.isViewerExpanded();
-    this._watchPanelHidingModes(on);
     const button = this._elements.viewerExpand;
     if (button) {
       setProp(
@@ -346,12 +302,6 @@ export class StreetLevelControls {
     this._unsubscribe?.();
     this._unsubscribe = null;
     if (this.destroyed || !this.root) return;
-    this._unsubscribeEnableRequests?.();
-    this._unsubscribeEnableRequests = this.actions.subscribeEnableRequests(
-      (origin) => {
-        this._explicitEnable = isExplicitLayerStateOrigin(origin);
-      },
-    );
     this._unsubscribe = this.layer.subscribe?.((state) => this.render(state));
     if (this.layer.getUIState) this.render(this.layer.getUIState());
   }
@@ -399,6 +349,15 @@ export class StreetLevelControls {
     setProp(el.errorText, 'textContent', view.error || '');
   }
 
+  /** A segmented control: the chosen button is pressed. */
+  _renderPressed(buttons, isChosen) {
+    for (const button of buttons) {
+      const chosen = isChosen(button);
+      button.classList.toggle('is-active', chosen);
+      setAttr(button, 'aria-pressed', String(chosen));
+    }
+  }
+
   _renderFilters(view) {
     const el = this._elements;
     const shows = view.filterControls || { pano: true, since: true };
@@ -408,24 +367,25 @@ export class StreetLevelControls {
     setProp(el.sinceNote, 'textContent', view.sinceNote || '');
     setProp(el.sinceNote, 'hidden', !view.sinceNote);
     setProp(el.controls, 'hidden', !shows.pano && !shows.since);
-    syncSegmentedControl(el.panoButtons, view.filter.pano, {
-      valueOf: (button) => button.dataset.slPano,
-      activeClass: 'is-active',
-      rovingFocus: true,
-    });
-    if (el.sinceRange) {
-      // Never move the thumb under the user's hand; once the committed value
-      // matches the thumb, show the full readout with its cut-off date.
-      const index = String(view.since.index);
-      if (
-        document.activeElement !== el.sinceRange &&
-        el.sinceRange.value !== index
-      )
-        el.sinceRange.value = index;
-      if (el.sinceRange.value === index) {
-        setProp(el.sinceLabel, 'textContent', view.since.label);
-        setAttr(el.sinceRange, 'aria-valuetext', view.since.label);
+    this._renderPressed(
+      el.panoButtons,
+      (button) => button.dataset.slPano === view.filter.pano,
+    );
+    if (el.since) {
+      // A link may carry a day count between the stops: it gets an option.
+      if (!view.since.exact) {
+        this._customSince ||= el.since.appendChild(
+          document.createElement('option'),
+        );
+        setProp(this._customSince, 'value', String(view.since.days));
+        setProp(this._customSince, 'textContent', view.since.window);
+      } else if (this._customSince) {
+        this._customSince.remove();
+        this._customSince = null;
       }
+      setProp(el.since, 'value', String(view.since.days));
+      // The cut-off date, for the pointer and for screen readers.
+      setProp(el.since, 'title', view.since.label);
     }
   }
 
@@ -442,11 +402,10 @@ export class StreetLevelControls {
       setProp(wrap, 'hidden', !viewer.open);
     }
     setProp(el.viewerPlaceholder, 'hidden', !viewer.loading);
-    syncSegmentedControl(el.renderButtons, viewer.renderMode, {
-      valueOf: (button) => button.dataset.slRender,
-      activeClass: 'is-active',
-      rovingFocus: true,
-    });
+    this._renderPressed(
+      el.renderButtons,
+      (button) => button.dataset.slRender === viewer.renderMode,
+    );
     // Google's viewer always fills its frame: no FIT/FILL to offer.
     const renderGroup = el.renderButtons[0]?.parentElement;
     if (renderGroup) setProp(renderGroup, 'hidden', !viewer.renderModes);
@@ -473,22 +432,24 @@ export class StreetLevelControls {
   }
 
   /**
-   * Open the panel on a switch-on or when an image opens. Never persisted:
-   * the stored collapse state stays the user's own choice.
+   * Open the panel when an image opens, or when a click fails to open one or
+   * to load its sequence (the result, or its error, would otherwise be out of
+   * sight). Never persisted: the stored collapse state stays the user's own
+   * choice.
    */
   _reactToTransitions(view) {
-    const enabled = view.enabled;
-    if (enabled && this._wasEnabled === false) {
-      // A restore must not reopen a panel the user or a share link kept collapsed.
-      if (this._explicitEnable) this.setCollapsed(false, { persist: false });
-      this._explicitEnable = false;
-    }
-    this._wasEnabled = enabled;
     // Other size changes reach the viewer through the ResizeObserver; opening
     // asks for one resize because the element may not have a size yet.
     const open = view.viewer.open;
-    if (open && !this._wasOpen) this.setCollapsed(false, { persist: false });
+    // A photo that failed to open (a line or ground click, OPEN), or a
+    // Mapillary line whose sequence failed to load, says why in the panel:
+    // it opens for that too, or the click would seem to do nothing.
+    const error =
+      this._state?.street?.error || this._state?.sequence?.error || null;
+    if ((open && !this._wasOpen) || (error && error !== this._streetError))
+      this.setCollapsed(false, { persist: false });
     this._wasOpen = open;
+    this._streetError = error;
   }
 
   destroy() {
@@ -499,14 +460,11 @@ export class StreetLevelControls {
     // would hide the viewer even inside the panel.
     if (this._expandMode === 'popover')
       this._elements.viewerWrap?.removeAttribute('popover');
-    this._watchPanelHidingModes(false);
     this.listeners.abort();
     this._resizeObserver?.disconnect();
     this._resizeObserver = null;
     this._unsubscribe?.();
     this._unsubscribe = null;
-    this._unsubscribeEnableRequests?.();
-    this._unsubscribeEnableRequests = null;
     this.layer.attachViewerHost?.(null);
   }
 }

src/ui/streetLevelControls.test.mjs

@@ -255,8 +255,7 @@ function panelDom({ fullscreen = true, popover = false } = {}) {
   for (const pano of ['all', 'pano', 'flat'])
     add(panoRow, 'button', { dataset: { slPano: pano } });
   const sinceRow = add(controls, 'div', { id: 'sl-since-row' });
-  add(sinceRow, 'input', { id: 'sl-since' });
-  add(sinceRow, 'output', { id: 'sl-since-label' });
+  add(sinceRow, 'select', { id: 'sl-since' });
   add(sinceRow, 'small', { id: 'sl-since-note' });
   const metaRow = add(root, 'div', { classes: ['sl-meta-row'] });
   add(metaRow, 'div', { id: 'sl-coverage-meta' });
@@ -344,7 +343,6 @@ async function productionPanel(dom) {
         manager.setLayerParams('street-level', params, options),
       setPanelCollapsed() {},
       showToast() {},
-      subscribeEnableRequests: () => () => {},
     },
   });
   controls.connect();
@@ -380,11 +378,11 @@ test('a 360° click reaches the share link through the data manager', () =>
     coordinator.destroy();
   }));
 
-test('releasing the SINCE slider records the window in the share link', () =>
+test('choosing a SINCE window records it in the share link', () =>
   withDom(async (dom) => {
     const { coordinator, controls, share } = await productionPanel(dom);
     const since = dom.root.querySelector('#sl-since');
-    since.value = '5'; // the "last year" stop
+    since.value = '365'; // the "last year" stop
     since.dispatchEvent(new Event('change'));
     await settle();
     const days =
@@ -424,23 +422,31 @@ function uiState({
   on = true,
   open = false,
   pano = 'all',
+  sinceDays = 0,
   renderMode = 'letterbox',
   keyRequired = false,
+  streetError = null,
+  sequenceError = null,
 } = {}) {
   return {
     enabled,
     providers: [providerSnapshot({ on, keyRequired })],
     keyRequired,
     keyRejected: false,
-    filter: { pano, sinceDays: 0 },
+    filter: { pano, sinceDays },
     coverage: { count: 3, loading: false, hint: '', error: null },
-    sequence: { selectedId: null, images: 0, loading: false },
+    sequence: {
+      selectedId: null,
+      images: 0,
+      loading: false,
+      error: sequenceError,
+    },
     street: {
       open,
       loading: false,
       renderMode,
       imageId: open ? 'img-1' : null,
-      error: null,
+      error: streetError,
     },
   };
 }
@@ -449,8 +455,6 @@ function stubPanel(dom, state, extraActions = {}) {
   const layer = stubLayer();
   const calls = { setParams: [], setEnabled: [], collapsed: [], toasts: [] };
   let enabled = state.enabled;
-  /** Reports a switch-on request's origin, as the data manager does. */
-  let announce = null;
   layer.publish(state);
   const controls = new StreetLevelControls({
     root: dom.root,
@@ -465,12 +469,6 @@ function stubPanel(dom, state, extraActions = {}) {
       setPanelCollapsed: (collapsed, options) =>
         calls.collapsed.push([collapsed, options]),
       showToast: (message) => calls.toasts.push(message),
-      subscribeEnableRequests: (listener) => {
-        announce = listener;
-        return () => {
-          announce = null;
-        };
-      },
       ...extraActions,
     },
   });
@@ -479,8 +477,6 @@ function stubPanel(dom, state, extraActions = {}) {
     layer,
     calls,
     controls,
-    announce: (origin) => announce?.(origin),
-    subscribed: () => announce !== null,
     chip: () => dom.root.querySelector('#sl-provider-chips').children[0],
   };
 }
@@ -745,50 +741,84 @@ function fakeMutationObserver() {
   };
 }
 
-for (const mode of ['ui-clean-view', 'recording-mode', 'cockpit-mode'])
-  test(`entering ${mode} takes the photo out of full screen`, () =>
-    withDom(async (dom) => {
-      const saved = globalThis.MutationObserver;
-      const watch = fakeMutationObserver();
-      globalThis.MutationObserver = watch.FakeObserver;
-      try {
-        const { controls } = stubPanel(dom, uiState({ open: true }));
-        dom.root.querySelector('#sl-viewer-expand').click();
-        await settle();
-        await settle();
-        assert.equal(dom.document.fullscreenElement, dom.wrap);
-        assert.equal(watch.observers.size, 1, 'watching while expanded');
-        dom.document.body.classList.toggle(mode, true);
-        watch.fire();
-        await settle();
-        await settle();
-        assert.equal(dom.document.fullscreenElement, null);
-        assert.equal(watch.observers.size, 0, 'and not after');
-        controls.destroy();
-      } finally {
-        globalThis.MutationObserver = saved;
-      }
-    }));
+test('shrinkViewer takes the photo out of full screen (Clean View, recording, the cockpit)', () =>
+  withDom(async (dom) => {
+    const { controls } = stubPanel(dom, uiState({ open: true }));
+    dom.root.querySelector('#sl-viewer-expand').click();
+    await settle();
+    await settle();
+    assert.equal(dom.document.fullscreenElement, dom.wrap);
+    controls.shrinkViewer();
+    await settle();
+    await settle();
+    assert.equal(dom.document.fullscreenElement, null);
+    controls.shrinkViewer(); // nothing expanded: nothing to do
+    controls.destroy();
+  }));
+
+test('the shell shrinks the photo when Clean View, recording or the cockpit hide the panels', () => {
+  const shell = fs.readFileSync(
+    new URL('./applicationShell.js', import.meta.url),
+    'utf8',
+  );
+  const facade = fs.readFileSync(
+    new URL('./shellFacade.js', import.meta.url),
+    'utf8',
+  );
+  assert.match(
+    shell,
+    /toggleCleanView[\s\S]*?if \(shouldEnable\) this\._streetLevelControls\?\.shrinkViewer\(\)/,
+  );
+  assert.match(
+    shell,
+    /enterPanels: \(\) => \{[\s\S]*?this\._streetLevelControls\?\.shrinkViewer\(\);/,
+  );
+  assert.match(
+    facade,
+    /setRecordingMode\(enabled, options\) \{[\s\S]*?this\._streetLevelControls\?\.shrinkViewer\(\);/,
+  );
+});
 
 /* ── Restores and keyboard rules ───────────────────────────────────────── */
 
-test('only an explicit switch-on opens the panel, unstored; a restore never does (P2-1)', () =>
+test('a photo opening opens the panel, unstored; switching the layer on does not', () =>
   withDom(async (dom) => {
-    const { layer, calls, controls, announce, subscribed } = stubPanel(
+    const { layer, calls, controls } = stubPanel(
       dom,
       uiState({ enabled: false }),
     );
-    announce('restore');
     layer.publish(uiState({ enabled: true }));
-    assert.deepEqual(calls.collapsed, [], 'a restore leaves the panel be');
-    layer.publish(uiState({ enabled: false }));
-    announce('user');
-    layer.publish(uiState({ enabled: true }));
-    assert.deepEqual(calls.collapsed, [[false, { persist: false }]]);
+    assert.deepEqual(calls.collapsed, [], 'a switch-on leaves the panel be');
     layer.publish(uiState({ enabled: true, open: true }));
-    assert.equal(calls.collapsed.length, 2, 'a photo opening opens it too');
+    assert.deepEqual(calls.collapsed, [[false, { persist: false }]]);
+    controls.destroy();
+  }));
+
+test('a photo that fails to open opens the panel too, so its error shows', () =>
+  withDom(async (dom) => {
+    const { layer, calls, controls } = stubPanel(dom, uiState());
+    // A line click whose lookup KartaView never answered.
+    layer.publish(uiState({ streetError: 'KartaView did not answer in time' }));
+    assert.deepEqual(calls.collapsed, [[false, { persist: false }]]);
+    // The same error again opens nothing more; a new one does.
+    layer.publish(uiState({ streetError: 'KartaView did not answer in time' }));
+    assert.equal(calls.collapsed.length, 1);
+    layer.publish(uiState());
+    layer.publish(uiState({ streetError: 'No street-level imagery here' }));
+    assert.equal(calls.collapsed.length, 2);
+    controls.destroy();
+  }));
+
+test('a sequence that fails to load opens the panel, so its error shows', () =>
+  withDom(async (dom) => {
+    const { layer, calls, controls } = stubPanel(dom, uiState());
+    // A Mapillary line click whose sequence lookup the Graph API refused.
+    layer.publish(uiState({ sequenceError: 'Mapillary did not answer' }));
+    assert.deepEqual(calls.collapsed, [[false, { persist: false }]]);
+    assert.equal(dom.root.querySelector('#sl-error').hidden, false);
+    layer.publish(uiState({ sequenceError: 'Mapillary did not answer' }));
+    assert.equal(calls.collapsed.length, 1, 'the same error opens it once');
     controls.destroy();
-    assert.equal(subscribed(), false, 'destroy unsubscribes');
   }));
 
 test('FIT / FILL show the selected render mode (P3)', () =>
@@ -796,8 +826,8 @@ test('FIT / FILL show the selected render mode (P3)', () =>
     const { layer, controls } = stubPanel(dom, uiState({ open: true }));
     layer.publish(uiState({ open: true, renderMode: 'fill' }));
     const [fit, fill] = dom.wrap.querySelectorAll('[data-sl-render]');
-    assert.equal(fill.getAttribute('aria-checked'), 'true');
-    assert.equal(fit.getAttribute('aria-checked'), 'false');
+    assert.equal(fill.getAttribute('aria-pressed'), 'true');
+    assert.equal(fit.getAttribute('aria-pressed'), 'false');
     assert.equal(fill.classList.contains('is-active'), true);
     controls.destroy();
   }));
@@ -842,35 +872,46 @@ test('identical renders write nothing to the DOM (P3: rail MutationObserver)', (
     controls.destroy();
   }));
 
-test('arrow keys move the selection within a radiogroup, which has one tab stop (P3)', () =>
+test('the imagery filter is a row of toggle buttons, the chosen one pressed', () =>
   withDom(async (dom) => {
     const { layer, calls, controls } = stubPanel(dom, uiState());
-    const keydown = (target, key) =>
-      target.dispatchEvent({ type: 'keydown', bubbles: true, key });
     const [all, pano, flat] = dom.root.querySelectorAll('[data-sl-pano]');
-    assert.deepEqual(
-      [all, pano, flat].map((button) => button.getAttribute('tabindex')),
-      ['0', '-1', '-1'],
-    );
-    all.focus();
-    keydown(all, 'ArrowRight');
-    assert.equal(dom.document.activeElement, pano);
+    const pressed = () =>
+      [all, pano, flat].map((button) => button.getAttribute('aria-pressed'));
+    assert.deepEqual(pressed(), ['true', 'false', 'false']);
+    pano.click();
     assert.deepEqual(calls.setParams.at(-1), [
       { pano: 'pano' },
       { origin: 'user' },
     ]);
-    keydown(all, 'ArrowLeft'); // wraps to the end
-    assert.equal(dom.document.activeElement, flat);
-    keydown(flat, 'Home');
-    assert.equal(dom.document.activeElement, all);
     layer.publish(uiState({ pano: 'flat' }));
+    assert.deepEqual(pressed(), ['false', 'false', 'true']);
+    // No roving tab stop: every button is reachable with Tab.
     assert.deepEqual(
       [all, pano, flat].map((button) => button.getAttribute('tabindex')),
-      ['-1', '-1', '0'],
+      [null, null, null],
     );
     controls.destroy();
   }));
 
+test('SINCE lists the stops, adds a link’s own day count and names the cut-off date', () =>
+  withDom(async (dom) => {
+    const { layer, controls } = stubPanel(dom, uiState());
+    const since = dom.root.querySelector('#sl-since');
+    assert.equal(since.children.length, 9, 'the nine stops');
+    assert.equal(since.children[0].textContent, 'ANY DATE');
+    layer.publish(uiState({ sinceDays: 365 }));
+    assert.equal(since.value, '365');
+    assert.match(since.title, /^LAST YEAR · SINCE \d{4}-\d{2}-\d{2}$/);
+    layer.publish(uiState({ sinceDays: 400 }));
+    assert.equal(since.children.length, 10);
+    assert.equal(since.children[9].textContent, 'LAST 400 DAYS');
+    assert.equal(since.value, '400');
+    layer.publish(uiState({ sinceDays: 30 }));
+    assert.equal(since.children.length, 9, 'gone once a stop is chosen');
+    controls.destroy();
+  }));
+
 test('under KEY REQUIRED the provider chip stays live and explains the key instead of toggling (P3)', () =>
   withDom(async (dom) => {
     const { calls, chip, controls } = stubPanel(
@@ -981,9 +1022,9 @@ test('a note under SINCE says what date it compares, only while one is given', (
     const { layer } = stubPanel(dom, state);
     const note = () => dom.root.querySelector('#sl-since-note');
     assert.equal(note().hidden, true, 'none for Mapillary');
-    layer.publish({ ...state, sinceNote: '(by upload date)' });
+    layer.publish({ ...state, sinceNote: 'KartaView: by upload date' });
     assert.equal(note().hidden, false);
-    assert.equal(note().textContent, '(by upload date)');
+    assert.equal(note().textContent, 'KartaView: by upload date');
     layer.publish(state);
     assert.equal(note().hidden, true);
     // The panel's own markup has it, read out with the slider.
@@ -992,7 +1033,10 @@ test('a note under SINCE says what date it compares, only while one is given', (
       'utf8',
     );
     assert.match(template, /<small id="sl-since-note"[^>]* hidden>/);
-    assert.match(template, /aria-describedby="sl-since-label sl-since-note"/);
+    assert.match(
+      template,
+      /<select id="sl-since"[^>]*aria-describedby="sl-since-note"/,
+    );
   }));
 
 test('Street View lit hides the imagery filters; Mapillary lit shows them', () =>

src/ui/streetLevelPresentation.js

@@ -35,7 +35,14 @@ export function sinceStopIndex(days) {
 function presentSince(days, now) {
   const value = Number(days) || 0;
   const index = sinceStopIndex(value);
-  if (value <= 0) return { index, days: 0, label: t('ANY DATE') };
+  if (value <= 0)
+    return {
+      index,
+      days: 0,
+      exact: true,
+      window: t('ANY DATE'),
+      label: t('ANY DATE'),
+    };
   const stop = SINCE_STOPS[index];
   const window =
     stop.days === value
@@ -44,6 +51,9 @@ function presentSince(days, now) {
   return {
     index,
     days: value,
+    /** One of SINCE_STOPS; a link may carry any other day count. */
+    exact: stop.days === value,
+    window,
     label: t('{window} · SINCE {date}', {
       window,
       date: formatDate(now - value * DAY_MS),

src/ui/streetLevelPresentation.test.mjs

@@ -182,7 +182,13 @@ test('a SINCE window from a link lands on the nearest slider stop', () => {
 test('the SINCE readout names the window and the cut-off date it means today', () => {
   const now = Date.UTC(2026, 8, 25);
   const any = presentStreetLevelPanel(snapshot(), { now });
-  assert.deepEqual(any.since, { index: 0, days: 0, label: 'ANY DATE' });
+  assert.deepEqual(any.since, {
+    index: 0,
+    days: 0,
+    exact: true,
+    window: 'ANY DATE',
+    label: 'ANY DATE',
+  });
   const year = presentStreetLevelPanel(
     snapshot({ filter: { pano: 'pano', sinceDays: 365 } }),
     { now },
@@ -191,6 +197,8 @@ test('the SINCE readout names the window and the cut-off date it means today', (
   assert.deepEqual(year.since, {
     index: 5,
     days: 365,
+    exact: true,
+    window: 'LAST YEAR',
     label: 'LAST YEAR · SINCE 2025-09-25',
   });
   const custom = presentStreetLevelPanel(
@@ -198,6 +206,8 @@ test('the SINCE readout names the window and the cut-off date it means today', (
     { now },
   );
   assert.equal(custom.since.index, 5);
+  assert.equal(custom.since.exact, false);
+  assert.equal(custom.since.window, 'LAST 400 DAYS');
   assert.equal(custom.since.label, 'LAST 400 DAYS · SINCE 2025-08-21');
 });
 

src/ui/styleParameters.js

@@ -1,5 +1,4 @@
 import { formatNumber, t } from '../i18n/index.js';
-import { createSlider } from './slider.js';
 
 /** A slider value in the UI language: 0.85 in English, 0,85 in Spanish. */
 const formatParam = (value, digits) =>
@@ -42,15 +41,14 @@ export function createStyleParameters({
         const label = documentRef.createElement('span');
         label.className = 'param-label';
         label.textContent = t(metadata.label);
-        const slider = createSlider({
-          documentRef,
-          className: 'param-slider',
-          ariaLabel: t(metadata.label),
-          min: metadata.min,
-          max: metadata.max,
-          step: metadata.max <= 1 ? '0.01' : '0.1',
-          value: readValue(name),
-        });
+        const slider = documentRef.createElement('input');
+        slider.type = 'range';
+        slider.className = 'param-slider';
+        slider.setAttribute('aria-label', t(metadata.label));
+        slider.min = metadata.min;
+        slider.max = metadata.max;
+        slider.step = metadata.max <= 1 ? '0.01' : '0.1';
+        slider.value = readValue(name);
         const digits = metadata.max <= 1 ? 2 : 1;
         const valueDisplay = documentRef.createElement('span');
         valueDisplay.className = 'param-value';

src/ui/styles/controls.css

@@ -532,7 +532,110 @@ html:not([lang='en']) .panel-collapse-btn {
 
 .pp-slider {
   flex: 1;
+  -webkit-appearance: none;
+  appearance: none;
+  height: 3px;
+  background: rgba(255, 255, 255, 0.08);
+  border-radius: 2px;
+  outline: none;
+  cursor: pointer;
+  min-width: 60px;
+}
+
+.pp-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background: var(--accent);
+  box-shadow: 0 0 6px var(--accent-glow);
+  cursor: pointer;
+}
+
+.pp-slider::-moz-range-thumb {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background: var(--accent);
+  border: none;
+  box-shadow: 0 0 6px var(--accent-glow);
+  cursor: pointer;
+}
+
+.pp-slider-value {
+  font-family: var(--font-mono);
+  font-size: 9px;
+  letter-spacing: 0.5px;
+  color: var(--accent);
+  min-width: 28px;
+  text-align: right;
+  flex-shrink: 0;
+}
+
+/* Quantitative companion sliders share Display / Sharpen's visible rail,
+ * circular thumb, glow, and value treatment while retaining a taller hit area. */
+.gev-quantitative-slider {
+  width: 100%;
   min-width: 0;
+  height: 18px;
+  margin: 0;
+  -webkit-appearance: none;
+  appearance: none;
+  background: transparent;
+  outline: none;
+  cursor: pointer;
+}
+.gev-quantitative-slider::-webkit-slider-runnable-track {
+  height: 3px;
+  border-radius: 2px;
+  background: rgba(255, 255, 255, 0.08);
+}
+.gev-quantitative-slider::-webkit-slider-thumb {
+  width: 10px;
+  height: 10px;
+  margin-top: -3.5px;
+  border: 0;
+  border-radius: 50%;
+  -webkit-appearance: none;
+  appearance: none;
+  background: var(--accent);
+  box-shadow: 0 0 6px var(--accent-glow);
+  cursor: pointer;
+}
+.gev-quantitative-slider::-moz-range-track,
+.gev-quantitative-slider::-moz-range-progress {
+  height: 3px;
+  border: 0;
+  border-radius: 2px;
+  background: rgba(255, 255, 255, 0.08);
+}
+.gev-quantitative-slider::-moz-range-thumb {
+  width: 10px;
+  height: 10px;
+  border: 0;
+  border-radius: 50%;
+  background: var(--accent);
+  box-shadow: 0 0 6px var(--accent-glow);
+  cursor: pointer;
+}
+.gev-quantitative-slider:focus-visible {
+  border-radius: 4px;
+  outline: 1px solid color-mix(in srgb, var(--accent) 80%, transparent);
+  outline-offset: 2px;
+}
+.gev-quantitative-slider:disabled {
+  opacity: 0.42;
+  cursor: not-allowed;
+}
+.gev-slider-value {
+  min-width: 28px;
+  color: var(--accent);
+  font-family: var(--font-mono);
+  font-size: 9px;
+  letter-spacing: 0.5px;
+  text-align: right;
+  flex-shrink: 0;
 }
 
 .pp-slider-mini-label {
@@ -574,6 +677,11 @@ html:not([lang='en']) .pp-slider-row > .pp-slider-mini-label {
   padding: 5px 8px 6px;
 }
 
+.detection-allocation-seg .pp-mode-btn {
+  font-size: 8px;
+  letter-spacing: 0.35px;
+}
+
 #hud-layout-row {
   min-width: 200px;
 }
@@ -591,7 +699,7 @@ html:not([lang='en']) .pp-slider-row > .pp-slider-mini-label {
   min-width: 200px;
 }
 
-.cyber-sonar-toggle-row .pp-mode-btn:not(.gev-segment) {
+.cyber-sonar-toggle-row .pp-mode-btn {
   margin-left: auto;
   min-width: 48px;
 }
@@ -743,6 +851,11 @@ html:not([lang='en']) .pp-slider-row > .pp-slider-mini-label {
 #draw-mode-row {
   min-width: 184px;
 }
+/* Equal thirds with room around the label, so a long translated shape name
+   never runs edge to edge in its segment. */
+html:not([lang='en']) #draw-mode-row .pp-mode-btn {
+  padding: 0 4px;
+}
 #draw-label-row {
   flex-wrap: wrap;
   row-gap: 6px;
@@ -871,8 +984,11 @@ body.gev-geo-import-drag #cesiumContainer {
 .pp-mode-seg {
   display: flex;
   flex: 1;
+  border: 1px solid rgba(255, 255, 255, 0.14);
+  border-radius: 6px;
+  overflow: hidden;
 }
-.pp-mode-btn:not(.gev-segment) {
+.pp-mode-btn {
   flex: 1;
   height: 22px;
   background: rgba(255, 255, 255, 0.04);
@@ -887,11 +1003,14 @@ body.gev-geo-import-drag #cesiumContainer {
     background-color var(--transition-fast),
     color var(--transition-fast);
 }
-.pp-mode-btn:not(.gev-segment):hover {
+.pp-mode-btn + .pp-mode-btn {
+  border-left: 1px solid rgba(255, 255, 255, 0.14);
+}
+.pp-mode-btn:hover {
   background: rgba(255, 255, 255, 0.08);
   color: var(--text-primary);
 }
-.pp-mode-btn:not(.gev-segment).active {
+.pp-mode-btn.active {
   background: var(--accent);
   color: #000;
 }
@@ -909,6 +1028,12 @@ body.gev-geo-import-drag #cesiumContainer {
   box-shadow: inset 0 0 0 4px #061014;
 }
 
+.pp-slider:focus-visible,
+.param-slider:focus-visible {
+  outline: 2px solid var(--text-primary);
+  outline-offset: 4px;
+}
+
 #clean-view-toggle {
   width: var(--pp-expanded-width);
 }
@@ -1115,4 +1240,47 @@ html:not([lang='en']) .param-slider-row {
 .param-slider {
   flex: 1;
   min-width: 0;
+  -webkit-appearance: none;
+  appearance: none;
+  height: 3px;
+  background: rgba(255, 255, 255, 0.08);
+  border-radius: 2px;
+  outline: none;
+  cursor: pointer;
+}
+
+.param-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  background: var(--accent);
+  box-shadow: 0 0 6px var(--accent-glow);
+  cursor: pointer;
+  transition: box-shadow var(--transition-fast);
+}
+
+.param-slider::-webkit-slider-thumb:hover {
+  box-shadow: 0 0 12px var(--accent-glow);
+}
+
+.param-slider::-moz-range-thumb {
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  background: var(--accent);
+  border: none;
+  box-shadow: 0 0 6px var(--accent-glow);
+  cursor: pointer;
+}
+
+.param-value {
+  font-family: var(--font-mono);
+  font-size: 10px;
+  letter-spacing: 0.5px;
+  color: var(--accent);
+  min-width: 32px;
+  text-align: right;
+  flex-shrink: 0;
 }

src/ui/styles/cyber.css

@@ -506,13 +506,11 @@
     0 0 12px rgba(196, 84, 84, 0.14);
 }
 
-:root[data-ui-theme='cyber'] .gev-segmented,
 :root[data-ui-theme='cyber'] .pp-mode-seg {
   border-color: rgba(206, 222, 226, 0.24);
   border-radius: 1px;
 }
 
-:root[data-ui-theme='cyber'] .gev-segment[aria-checked='true'],
 :root[data-ui-theme='cyber'] .pp-mode-btn.active {
   background: var(--cyber-red);
   color: #f7f8f7;

src/ui/styles/layers.css

@@ -184,8 +184,8 @@
   max-height: 100%;
   pointer-events: auto;
 }
-/* Collapsed readouts must stay hideable by the rail's exclusive layout. */
-#right-context-rail > #weather-panel:not(.collapsed),
+#right-context-rail > #weather-panel,
+/* Collapsed, it must stay hideable by the rail's exclusive layout. */
 #right-context-rail > #recent-imagery-panel:not(.collapsed) {
   display: flex;
   flex-direction: column;

src/ui/styles/recent-imagery.css

@@ -309,10 +309,10 @@ html:not([lang='en'])
   display: none;
 }
 
-/* 4. The selection bar: 24px mode buttons plus borders, then two stable rows. */
+/* 4. The selection bar: mode, then two rows that are always there. */
 .recent-imagery-readout .ri-selection {
   display: grid;
-  grid-template-rows: 26px 20px 20px;
+  grid-template-rows: 20px 20px 20px;
   row-gap: 4px;
   padding: 5px;
   border: 1px solid var(--weather-card-border);
@@ -321,6 +321,7 @@ html:not([lang='en'])
 .recent-imagery-readout .ri-mode {
   display: grid;
   grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 4px;
 }
 .recent-imagery-readout .ri-selection .data-toggle-chip {
   height: 20px;
@@ -422,6 +423,16 @@ html:not([lang='en']) .recent-imagery-readout .ri-opacity-label {
 }
 .recent-imagery-readout .ri-opacity-value {
   font-variant-numeric: tabular-nums;
+  color: var(--text-secondary);
+}
+.recent-imagery-readout .ri-opacity {
+  width: 100%;
+  min-width: 0;
+  margin: 0;
+  accent-color: var(--accent);
+}
+.recent-imagery-readout .ri-opacity:disabled {
+  opacity: 0.35;
 }
 .recent-imagery-readout .ri-swap {
   width: 40px;

src/ui/styles/segmented-control.css

@@ -1,51 +0,0 @@
-/* Shared one-of-many control. Feature classes retain surrounding placement. */
-.gev-segmented {
-  display: inline-flex;
-  min-width: 0;
-  border: 1px solid var(--glass-border-hover);
-  border-radius: 6px;
-  overflow: hidden;
-}
-.gev-segmented[hidden] {
-  display: none;
-}
-.gev-segment {
-  flex: 1;
-  min-width: min-content;
-  min-height: 24px;
-  margin: 0;
-  padding: 4px 8px;
-  border: 0;
-  border-radius: 0;
-  background: rgba(255, 255, 255, 0.04);
-  color: var(--text-secondary);
-  font: 9px/1.25 var(--font-mono);
-  letter-spacing: 0.6px;
-  text-transform: uppercase;
-  overflow-wrap: normal;
-  cursor: pointer;
-  transition:
-    background-color var(--transition-fast),
-    color var(--transition-fast);
-}
-.gev-segment + .gev-segment {
-  border-left: 1px solid var(--glass-border);
-}
-.gev-segment:hover:not(:disabled) {
-  background: rgba(255, 255, 255, 0.08);
-  color: var(--text-primary);
-}
-.gev-segment[aria-checked='true'] {
-  background: var(--accent);
-  color: #000;
-}
-.gev-segment:focus-visible {
-  position: relative;
-  outline: 2px solid var(--text-primary);
-  outline-offset: -3px;
-  box-shadow: inset 0 0 0 4px #061014;
-}
-.gev-segment:disabled {
-  opacity: 0.42;
-  cursor: not-allowed;
-}

src/ui/styles/slider.css

@@ -1,70 +0,0 @@
-/* Shared ordinary slider surface; feature classes only own surrounding layout.
- * Native range inputs retain keyboard, pointer, bounds and step behavior. */
-.gev-quantitative-slider {
-  width: 100%;
-  min-width: 0;
-  height: 18px;
-  margin: 0;
-  padding: 0;
-  border: 0;
-  -webkit-appearance: none;
-  appearance: none;
-  background: transparent;
-  outline: none;
-  cursor: pointer;
-}
-.gev-quantitative-slider::-webkit-slider-runnable-track {
-  height: 3px;
-  border-radius: 2px;
-  background: rgba(255, 255, 255, 0.08);
-}
-.gev-quantitative-slider::-webkit-slider-thumb {
-  width: 10px;
-  height: 10px;
-  margin-top: -3.5px;
-  border: 0;
-  border-radius: 50%;
-  -webkit-appearance: none;
-  appearance: none;
-  background: var(--accent);
-  box-shadow: 0 0 6px var(--accent-glow);
-  cursor: pointer;
-}
-.gev-quantitative-slider::-moz-range-track,
-.gev-quantitative-slider::-moz-range-progress {
-  height: 3px;
-  border: 0;
-  border-radius: 2px;
-  background: rgba(255, 255, 255, 0.08);
-}
-.gev-quantitative-slider::-moz-range-thumb {
-  width: 10px;
-  height: 10px;
-  border: 0;
-  border-radius: 50%;
-  background: var(--accent);
-  box-shadow: 0 0 6px var(--accent-glow);
-  cursor: pointer;
-}
-.gev-quantitative-slider:focus-visible {
-  border-radius: 4px;
-  outline: 1px solid color-mix(in srgb, var(--accent) 80%, transparent);
-  outline-offset: 2px;
-}
-.gev-quantitative-slider:disabled {
-  opacity: 0.42;
-  cursor: not-allowed;
-}
-.pp-slider-value,
-.param-value,
-.ri-opacity-value,
-.rail-card-setting-range-value,
-.gev-slider-value {
-  min-width: 28px;
-  color: var(--accent);
-  font-family: var(--font-mono);
-  font-size: 9px;
-  letter-spacing: 0.5px;
-  text-align: right;
-  flex-shrink: 0;
-}

src/ui/styles/street-level.css

@@ -222,6 +222,14 @@ html:not([lang='en']) .sl-meta-row .sl-nearest-btn {
   flex-wrap: wrap;
 }
 
+/* No overflow clipping: it would cut off the buttons' focus ring. The end
+   buttons round themselves instead. */
+.sl-seg {
+  display: inline-flex;
+  border: 1px solid var(--glass-border-hover);
+  border-radius: 999px;
+}
+
 .sl-seg[hidden],
 .sl-controls[hidden],
 .sl-filters[hidden],
@@ -229,6 +237,40 @@ html:not([lang='en']) .sl-meta-row .sl-nearest-btn {
   display: none;
 }
 
+.sl-seg-btn {
+  font-family: var(--font-mono);
+  font-size: var(--sl-text);
+  letter-spacing: 0.08em;
+  padding: 4px 9px;
+  border: 0;
+  background: transparent;
+  color: var(--text-secondary);
+  cursor: pointer;
+}
+
+.sl-seg-btn:first-child {
+  border-radius: 999px 0 0 999px;
+}
+
+.sl-seg-btn:last-child {
+  border-radius: 0 999px 999px 0;
+}
+
+.sl-seg-btn + .sl-seg-btn {
+  border-left: 1px solid var(--glass-border);
+}
+
+.sl-seg-btn:focus-visible {
+  position: relative;
+  outline: 1px solid var(--accent);
+  outline-offset: 2px;
+}
+
+.sl-seg-btn.is-active {
+  background: rgba(5, 203, 99, 0.22);
+  color: var(--text-primary);
+}
+
 .sl-since {
   display: grid;
   grid-template-columns: auto 1fr;
@@ -236,33 +278,29 @@ html:not([lang='en']) .sl-meta-row .sl-nearest-btn {
   gap: 4px 10px;
 }
 
-.sl-range {
+.sl-select {
   width: 100%;
   min-width: 0;
-  margin: 0;
-  accent-color: var(--sl-green);
+  background: rgba(255, 255, 255, 0.06);
+  border: 1px solid rgba(255, 255, 255, 0.14);
+  border-radius: 7px;
+  color: var(--text-primary);
+  padding: 4px 6px;
+  font-family: var(--font-mono);
+  font-size: var(--sl-text);
+  letter-spacing: 0.08em;
   cursor: pointer;
 }
 
-.sl-range:focus-visible {
+.sl-select:focus-visible {
   outline: 1px solid var(--accent);
-  outline-offset: 3px;
-}
-
-/* The value and its note share a line: ANY DATE (by upload date). */
-.sl-since-value {
-  grid-column: 2;
-  display: flex;
-  flex-wrap: wrap;
-  align-items: baseline;
-  gap: 0 6px;
-  min-width: 0;
+  outline-offset: 2px;
 }
 
 .sl-since-note {
+  grid-column: 2;
   font-family: var(--font-mono);
-  font-size: 0.5rem;
-  letter-spacing: 0.08em;
+  font-size: var(--sl-text-small);
   color: var(--text-secondary);
 }
 
@@ -270,13 +308,6 @@ html:not([lang='en']) .sl-meta-row .sl-nearest-btn {
   display: none;
 }
 
-.sl-since-label {
-  font-family: var(--font-mono);
-  font-size: var(--sl-text);
-  letter-spacing: 0.08em;
-  color: var(--text-primary);
-}
-
 /* ── Embedded viewer ─────────────────────────────────────────────────────── */
 .sl-viewer-wrap {
   position: relative;

src/ui/styles/weather.css

@@ -362,9 +362,22 @@ html:not([lang='en']) .rail-card-setting {
   font: 8px var(--font-mono);
   white-space: nowrap;
 }
+.rail-card-setting-range {
+  width: 100%;
+  min-width: 0;
+  accent-color: var(--accent);
+  cursor: pointer;
+}
+.rail-card-setting-range:focus-visible {
+  outline: 2px solid var(--text-primary);
+  outline-offset: 3px;
+}
 .rail-card-setting-range-value {
   flex: 0 0 4ch;
   white-space: nowrap;
+  color: var(--text-primary);
+  font: 9px var(--font-mono);
+  text-align: right;
 }
 .rail-card-result {
   display: grid;

src/ui/templates/display-controls.html

@@ -27,27 +27,27 @@
       <output id="cyber-sonar-status" class="cyber-sonar-control" role="status"></output>
       <div class="pp-slider-row cyber-sonar-control cyber-sonar-setting" id="cyber-sonar-rings-row">
         <label class="pp-slider-mini-label" for="cyber-sonar-rings" data-i18n>Rings</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="cyber-sonar-rings" min="3" max="12" step="1" value="8" aria-label="Sonar ring count" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="cyber-sonar-rings" min="3" max="12" step="1" value="8" aria-label="Sonar ring count" data-i18n-aria-label />
         <span class="pp-slider-value" id="cyber-sonar-rings-value">8</span>
       </div>
       <div class="pp-slider-row cyber-sonar-control cyber-sonar-setting" id="cyber-sonar-range-row">
         <label class="pp-slider-mini-label" for="cyber-sonar-range" data-i18n>Range</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="cyber-sonar-range" min="60" max="120" step="1" value="100" aria-label="Sonar ring range" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="cyber-sonar-range" min="60" max="120" step="1" value="100" aria-label="Sonar ring range" data-i18n-aria-label />
         <span class="pp-slider-value" id="cyber-sonar-range-value">100%</span>
       </div>
       <div class="pp-slider-row cyber-sonar-control cyber-sonar-setting" id="cyber-sonar-intensity-row">
         <label class="pp-slider-mini-label" for="cyber-sonar-intensity" data-i18n>Power</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="cyber-sonar-intensity" min="0" max="100" step="1" value="70" aria-label="Sonar intensity" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="cyber-sonar-intensity" min="0" max="100" step="1" value="70" aria-label="Sonar intensity" data-i18n-aria-label />
         <span class="pp-slider-value" id="cyber-sonar-intensity-value">70%</span>
       </div>
       <div class="pp-slider-row cyber-sonar-control cyber-sonar-setting" id="cyber-sonar-opacity-row">
         <label class="pp-slider-mini-label" for="cyber-sonar-opacity" data-i18n>Opacity</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="cyber-sonar-opacity" min="35" max="100" step="1" value="84" aria-label="Cyber contact and label opacity" title="Minimum opacity for map dots, icons, models, brackets, and labels between sonar passes" data-i18n-aria-label data-i18n-title />
+        <input type="range" class="pp-slider" id="cyber-sonar-opacity" min="35" max="100" step="1" value="84" aria-label="Cyber contact and label opacity" title="Minimum opacity for map dots, icons, models, brackets, and labels between sonar passes" data-i18n-aria-label data-i18n-title />
         <span class="pp-slider-value" id="cyber-sonar-opacity-value">84%</span>
       </div>
       <div class="pp-slider-row cyber-sonar-control cyber-sonar-setting" id="cyber-sonar-sector-row">
         <label class="pp-slider-mini-label" for="cyber-sonar-sector" data-i18n>Sector</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="cyber-sonar-sector" min="8" max="60" step="1" value="24" aria-label="Sonar sector width" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="cyber-sonar-sector" min="8" max="60" step="1" value="24" aria-label="Sonar sector width" data-i18n-aria-label />
         <span class="pp-slider-value" id="cyber-sonar-sector-value">24°</span>
       </div>
     </div>
@@ -58,24 +58,24 @@
       </button>
       <div class="pp-slider-row detection-slider-row" id="detection-slider-row">
         <label class="pp-slider-mini-label" for="detection-density-slider" data-i18n>Density</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="detection-density-slider" min="0" max="100" step="25" value="50" aria-label="Detection label density" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="detection-density-slider" min="0" max="100" step="25" value="50" aria-label="Detection label density" data-i18n-aria-label />
         <span class="pp-slider-value" id="detection-density-value">50%</span>
       </div>
       <div class="pp-slider-row detection-allocation-row" id="detection-allocation-row">
         <span class="pp-slider-mini-label" data-i18n>Allocation</span>
-        <div class="gev-segmented pp-mode-seg detection-allocation-seg" role="radiogroup" aria-label="Detection label allocation" data-i18n-aria-label>
-          <button class="gev-segment pp-mode-btn active" id="detection-allocation-elastic" data-allocation="ELASTIC" role="radio" aria-checked="true" data-i18n>Elastic</button>
-          <button class="gev-segment pp-mode-btn" id="detection-allocation-weighted" data-allocation="WEIGHTED" role="radio" aria-checked="false" data-i18n>Weighted</button>
+        <div class="pp-mode-seg detection-allocation-seg" role="radiogroup" aria-label="Detection label allocation" data-i18n-aria-label>
+          <button class="pp-mode-btn active" id="detection-allocation-elastic" data-allocation="ELASTIC" role="radio" aria-checked="true" data-i18n>Elastic</button>
+          <button class="pp-mode-btn" id="detection-allocation-weighted" data-allocation="WEIGHTED" role="radio" aria-checked="false" data-i18n>Weighted</button>
         </div>
       </div>
       <div class="pp-slider-row detection-fade-row" id="detection-fade-row">
         <label class="pp-slider-mini-label" for="detection-fade-slider" data-i18n>Fade</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="detection-fade-slider" min="0" max="40" step="1" value="7" aria-label="Detection fade distance" title="World-overlay fade distance outside the keyhole as a percentage of its radius" data-i18n-aria-label data-i18n-title />
+        <input type="range" class="pp-slider" id="detection-fade-slider" min="0" max="40" step="1" value="7" aria-label="Detection fade distance" title="World-overlay fade distance outside the keyhole as a percentage of its radius" data-i18n-aria-label data-i18n-title />
         <span class="pp-slider-value" id="detection-fade-value">7%</span>
       </div>
       <div class="pp-slider-row detection-opacity-row" id="detection-opacity-row">
         <label class="pp-slider-mini-label" for="detection-opacity-slider" data-i18n>Outside</label>
-        <input type="range" class="gev-quantitative-slider pp-slider" id="detection-opacity-slider" min="0" max="100" step="1" value="1" aria-label="Detection opacity outside the keyhole" title="World-overlay label and card opacity beyond the fade distance" data-i18n-aria-label data-i18n-title />
+        <input type="range" class="pp-slider" id="detection-opacity-slider" min="0" max="100" step="1" value="1" aria-label="Detection opacity outside the keyhole" title="World-overlay label and card opacity beyond the fade distance" data-i18n-aria-label data-i18n-title />
         <span class="pp-slider-value" id="detection-opacity-value">1%</span>
       </div>
     </div>
@@ -99,9 +99,9 @@
       </button>
       <div class="pp-slider-row visible" id="models3d-mode-row">
         <span class="pp-slider-mini-label" data-i18n>Models</span>
-        <div class="gev-segmented pp-mode-seg" role="radiogroup" aria-label="3D model coverage" data-i18n-aria-label>
-          <button class="gev-segment pp-mode-btn active" id="models3d-mode-proximity" data-mode="proximity" role="radio" aria-checked="true" data-i18n>Proximity</button>
-          <button class="gev-segment pp-mode-btn" id="models3d-mode-all" data-mode="all" role="radio" aria-checked="false" data-i18n>All</button>
+        <div class="pp-mode-seg" role="radiogroup" aria-label="3D model coverage" data-i18n-aria-label>
+          <button class="pp-mode-btn active" id="models3d-mode-proximity" data-mode="proximity" role="radio" aria-checked="true" data-i18n>Proximity</button>
+          <button class="pp-mode-btn" id="models3d-mode-all" data-mode="all" role="radio" aria-checked="false" data-i18n>All</button>
         </div>
       </div>
     </div>
@@ -117,7 +117,7 @@
              mirrors SCOPE_FEATHER_RATIO_DEFAULT in src/scopeMask.js. Feather
              softens the black mask edge; label fading is the separate Fade
              slider. -->
-        <input type="range" class="gev-quantitative-slider pp-slider" id="scope-feather-slider" min="0" max="100" value="11" aria-label="Scope edge feather" title="Scope edge feather as a percentage of the keyhole radius" data-i18n-aria-label data-i18n-title />
+        <input type="range" class="pp-slider" id="scope-feather-slider" min="0" max="100" value="11" aria-label="Scope edge feather" title="Scope edge feather as a percentage of the keyhole radius" data-i18n-aria-label data-i18n-title />
         <span class="pp-slider-value" id="scope-feather-value">11%</span>
       </div>
     </div>
@@ -128,10 +128,10 @@
       </button>
       <div class="pp-slider-row" id="draw-mode-row">
         <span class="pp-slider-mini-label" data-i18n>Shape</span>
-        <div class="gev-segmented pp-mode-seg" role="radiogroup" aria-label="Shape to draw" data-i18n-aria-label>
-          <button class="gev-segment pp-mode-btn active" data-shape="area" role="radio" aria-checked="true" data-i18n>Area</button>
-          <button class="gev-segment pp-mode-btn" data-shape="line" role="radio" aria-checked="false" data-i18n>Line</button>
-          <button class="gev-segment pp-mode-btn" data-shape="pin" role="radio" aria-checked="false" data-i18n>Pin</button>
+        <div class="pp-mode-seg" role="radiogroup" aria-label="Shape to draw" data-i18n-aria-label>
+          <button class="pp-mode-btn active" data-shape="area" role="radio" aria-checked="true" data-i18n>Area</button>
+          <button class="pp-mode-btn" data-shape="line" role="radio" aria-checked="false" data-i18n>Line</button>
+          <button class="pp-mode-btn" data-shape="pin" role="radio" aria-checked="false" data-i18n>Pin</button>
         </div>
       </div>
       <div class="pp-slider-row" id="draw-label-row">
@@ -172,7 +172,7 @@
         <span class="pp-label" data-i18n>Bloom</span>
       </button>
       <div class="pp-slider-row" id="bloom-slider-row">
-        <input type="range" class="gev-quantitative-slider pp-slider" id="bloom-intensity-slider" min="0" max="200" value="0" aria-label="Bloom intensity" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="bloom-intensity-slider" min="0" max="200" value="0" aria-label="Bloom intensity" data-i18n-aria-label />
         <span class="pp-slider-value" id="bloom-intensity-value">0%</span>
       </div>
     </div>
@@ -182,7 +182,7 @@
         <span class="pp-label" data-i18n>Sharpen</span>
       </button>
       <div class="pp-slider-row" id="sharpen-slider-row">
-        <input type="range" class="gev-quantitative-slider pp-slider" id="sharpen-intensity-slider" min="0" max="100" value="49" aria-label="Sharpen intensity" data-i18n-aria-label />
+        <input type="range" class="pp-slider" id="sharpen-intensity-slider" min="0" max="100" value="49" aria-label="Sharpen intensity" data-i18n-aria-label />
         <span class="pp-slider-value" id="sharpen-intensity-value">49%</span>
       </div>
     </div>

src/ui/templates/layer-panels.html

@@ -87,9 +87,9 @@
           <div class="sl-viewer-bar">
             <div class="sl-viewer-tools">
               <button id="sl-viewer-expand" class="scene-btn" type="button" aria-pressed="false" title="Show the street-level view full screen (Esc shrinks it)" data-i18n-title><span class="sl-btn-icon" aria-hidden="true">⤢</span><span class="sl-btn-text" data-i18n>EXPAND</span></button>
-              <div class="gev-segmented sl-seg" role="radiogroup" aria-label="Image fit" data-i18n-aria-label>
-                <button type="button" class="gev-segment sl-seg-btn is-active" data-sl-render="letterbox" role="radio" aria-checked="true" title="Fit: show the whole photo, with dark bars where its shape differs from the frame" data-i18n-title data-i18n>FIT</button>
-                <button type="button" class="gev-segment sl-seg-btn" data-sl-render="fill" role="radio" aria-checked="false" tabindex="-1" title="Fill: fill the frame edge to edge, cropping the photo" data-i18n-title data-i18n>FILL</button>
+              <div class="sl-seg" role="group" aria-label="Image fit" data-i18n-aria-label>
+                <button type="button" class="sl-seg-btn is-active" data-sl-render="letterbox" aria-pressed="true" title="Fit: show the whole photo, with dark bars where its shape differs from the frame" data-i18n-title data-i18n>FIT</button>
+                <button type="button" class="sl-seg-btn" data-sl-render="fill" aria-pressed="false" title="Fill: fill the frame edge to edge, cropping the photo" data-i18n-title data-i18n>FILL</button>
               </div>
             </div>
             <div class="sl-viewer-tools sl-viewer-tools-right">
@@ -118,19 +118,16 @@
         <fieldset id="sl-controls" class="sl-controls">
           <div id="sl-pano-row" class="sl-filters" role="group" aria-label="Imagery filters" data-i18n-aria-label>
             <span class="cctv-summary-label" data-i18n>IMAGERY</span>
-            <div class="gev-segmented sl-seg" role="radiogroup" aria-label="Panorama filter" data-i18n-aria-label>
-              <button type="button" class="gev-segment sl-seg-btn is-active" data-sl-pano="all" role="radio" aria-checked="true" data-i18n>ALL</button>
-              <button type="button" class="gev-segment sl-seg-btn" data-sl-pano="pano" role="radio" aria-checked="false" tabindex="-1">360°</button>
-              <button type="button" class="gev-segment sl-seg-btn" data-sl-pano="flat" role="radio" aria-checked="false" tabindex="-1" data-i18n>FLAT</button>
+            <div class="sl-seg" role="group" aria-label="Panorama filter" data-i18n-aria-label>
+              <button type="button" class="sl-seg-btn is-active" data-sl-pano="all" aria-pressed="true" data-i18n>ALL</button>
+              <button type="button" class="sl-seg-btn" data-sl-pano="pano" aria-pressed="false">360°</button>
+              <button type="button" class="sl-seg-btn" data-sl-pano="flat" aria-pressed="false" data-i18n>FLAT</button>
             </div>
           </div>
           <div id="sl-since-row" class="sl-since">
             <label class="cctv-summary-label" for="sl-since" data-i18n>SINCE</label>
-            <input id="sl-since" class="sl-range" type="range" min="0" max="8" step="1" value="0" aria-valuetext="ANY DATE" aria-describedby="sl-since-label sl-since-note" />
-            <span class="sl-since-value">
-              <output id="sl-since-label" class="sl-since-label" for="sl-since" data-i18n>ANY DATE</output>
-              <small id="sl-since-note" class="sl-since-note" hidden></small>
-            </span>
+            <select id="sl-since" class="sl-select" aria-describedby="sl-since-note"></select>
+            <small id="sl-since-note" class="sl-since-note" hidden></small>
           </div>
         </fieldset>
         <!-- The hint says how to open imagery; the button does it without a pointer. -->

src/ui/visualInput.test.mjs

@@ -176,7 +176,7 @@ test('parameter rows preserve labels, bounds, precision and initial values', ()
   assert.equal(label.textContent, '<Amount>');
   assert.equal(slider.attributes.get('aria-label'), '<Amount>');
   assert.equal(slider.type, 'range');
-  assert.equal(slider.className, 'gev-quantitative-slider param-slider');
+  assert.equal(slider.className, 'param-slider');
   assert.equal(slider.min, 0);
   assert.equal(slider.max, 1);
   assert.equal(slider.step, '0.01');

src/ui/visualSettings.js

@@ -1,5 +1,4 @@
 import { STYLE_STATUS_LABELS } from './visualPresets.js';
-import { syncSegmentedControl } from './segmentedControl.js';
 import { t } from '../i18n/index.js';
 import { UiLifetime } from './uiLifetime.js';
 import {
@@ -558,9 +557,11 @@ export class VisualSettings {
     const normalized = normalizeAllocationStrategy(raw);
     this._detectionAllocationPreference = normalized;
     setDetectionTuning({ allocationStrategy: normalized });
-    syncSegmentedControl(this._detectionAllocationBtns, normalized, {
-      valueOf: (button) => button.dataset.allocation,
-    });
+    for (const button of this._detectionAllocationBtns) {
+      const active = button.dataset.allocation === normalized;
+      button.classList.toggle('active', active);
+      button.setAttribute('aria-checked', String(active));
+    }
     if (persist) {
       try {
         localStorage.setItem(DETECTION_ALLOCATION_STORAGE_KEY, normalized);