Live ops wall + pluggable camera providers with licence gating (server-26#198)
Backend (c2-core):
- app/internal/cameras/: provider interface, licence model, per-provider
catalog cache; one adapter per source in design-canvas/camera-sources.md.
Implemented: 511NY (legacy shape + tolerant XML inventory parser, 511x
endpoints UNVERIFIED), Caltrans, DelDOT, Ontario 511, DriveBC, Calgary,
TfL, NSW, Fintraffic. Stubs: NYC DOT, Westchester DPW, TRANSCOM, CTroads,
511NJ, Austin, TxDOT, MD CHART, WSDOT, Tallinn, Tarktee, Warendorf,
TrafficLand, Windy, EarthCam.
- Every provider defaults OFF (config/camera_providers). Gated licences
(agreement required / unverified / non-commercial / paid) need an explicit
acknowledgement stored with who/when and written to audit_log; the audit
write is a precondition. Stubs and prohibited sources cannot be enabled.
Ack is bound to the licence status it was given for.
- GET /cameras (signed-in), GET/PUT /admin/camera-providers (admin only).
- /traffic/511 follows the ny511 provider switch and returns the DAA credit
+ NYSDOT as-is disclaimer; 511NY event descriptions no longer truncated
("may not alter the substance of a report").
Frontend:
- LiveView becomes the ops wall: Region > Incident > Camera drill-down,
worst-first rail (MapView), KPIs, transcript ticker, scrubber incident
bands, auto-tour, deep links (#inc=&cam=&tour), Esc steps up.
- Incident panel: nearest cameras (path-weighted), fused situational context
(ADS-B, AIS, 511NY events, NEXRAD tile sample), units, call spine.
- MapView keeps every layer; adds Camera Viewsheds (approx.) overlay and a
nearest-camera layer for the selected incident.
- CameraFeed hygiene: hidden-tab/off-screen gating, 2 concurrent HLS cap,
last good frame + stale badge, frozen-frame signature, HLS stall watchdog,
provider attribution rendered on the imagery.
- Camera/event popups show source credit, update time and the disclaimer.
- Admin > Camera providers tab with licence status, health, gated confirm.
- Camera detection is not built (blocked on #199/#200); seam only.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Logan Cusano
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
d57738a8f6
commit
aa5b71d853
@@ -32,9 +32,15 @@ class Settings(BaseSettings):
|
||||
|
||||
# Google Maps (geocoding)
|
||||
google_maps_api_key: Optional[str] = None
|
||||
# 511NY developer key (server-26#183). Optional: the API answered without one
|
||||
# as of 2026-09-27, but its terms require a registered key.
|
||||
# 511NY developer key (server-26#183/#198). Issued with the NYSDOT Developer
|
||||
# Access Agreement grant; the keyless legacy API is gone since the 511x cutover.
|
||||
ny511_api_key: Optional[str] = None
|
||||
# Base URL for the 511NY feed. Defaults to the legacy API, which is dead since
|
||||
# the 511x cutover (server-26#198); set it to whatever the DAA grant documents.
|
||||
ny511_api_base: Optional[str] = None
|
||||
# Camera providers (app/internal/cameras). Keys only; every provider is still
|
||||
# OFF until an admin enables it, and licence-gated ones need an acknowledgement.
|
||||
ontario511_api_key: Optional[str] = None
|
||||
|
||||
# Gemini (intelligence extraction, embeddings, incident summaries)
|
||||
gemini_api_key: Optional[str] = None
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
"""Pluggable public-camera providers (live ops wall).
|
||||
|
||||
Every source in ``design-canvas/camera-sources.md`` is one adapter here, each
|
||||
carrying its licence status from that catalog. Providers default OFF; the
|
||||
licence gate and the admin toggle live in ``registry``.
|
||||
"""
|
||||
@@ -0,0 +1,251 @@
|
||||
"""Provider interface, licence model and the per-provider catalog cache.
|
||||
|
||||
A provider is metadata (who runs the cameras, what their terms say, what
|
||||
region they cover) plus one async ``fetch_catalog`` that returns normalised
|
||||
camera records. Catalogs are public and identical for every org, so -- like
|
||||
ny511.py -- they are cached in memory, fetched lazily on request, and never
|
||||
written to Firestore. A failed refresh keeps serving the last good catalog and
|
||||
reports the error and its age (the AI-silent-failures lesson: an empty layer
|
||||
must never be the only symptom of a dead feed).
|
||||
|
||||
Camera detection (God's Eye View idea #5) is NOT built: it is blocked on
|
||||
server-26#199 (NYSDOT's written answer on imagery analytics) and #200 (CISO
|
||||
ruling on frame retention). ``CameraSignalSink`` is the seam it would plug into.
|
||||
"""
|
||||
import asyncio
|
||||
import re
|
||||
import time
|
||||
from dataclasses import dataclass
|
||||
from enum import Enum
|
||||
from typing import Any, Dict, List, Optional, Protocol, Tuple
|
||||
|
||||
from app.internal.logger import logger
|
||||
|
||||
RETRY_AFTER_FAILURE_S = 60
|
||||
DEFAULT_CATALOG_TTL_S = 15 * 60 # camera lists change rarely (GEV uses the same 15 min)
|
||||
FETCH_TIMEOUT_S = 20.0
|
||||
USER_AGENT = "DRB-c2-core/1.0 (+public camera catalog; contact via 511/agency programs)"
|
||||
|
||||
Camera = Dict[str, Any]
|
||||
BBox = Tuple[float, float, float, float] # south, west, north, east
|
||||
|
||||
|
||||
class Licence(str, Enum):
|
||||
"""Licence status, as catalogued in design-canvas/camera-sources.md."""
|
||||
COMMERCIAL_OK = "commercial_ok"
|
||||
ATTRIBUTION_REQUIRED = "attribution_required" # commercial OK, credit must render with imagery
|
||||
AGREEMENT_REQUIRED = "agreement_required" # signed agreement / written permission DRB does not hold
|
||||
NON_COMMERCIAL = "non_commercial"
|
||||
UNVERIFIED = "unverified" # no licence read first-hand
|
||||
PAID = "paid" # needs a commercial contract
|
||||
PROHIBITED = "prohibited" # terms forbid this use outright -- cannot be enabled
|
||||
|
||||
|
||||
# Statuses that may only be enabled after an admin explicitly acknowledges the
|
||||
# warning (recorded with who/when in the settings doc and audit_log).
|
||||
GATED = frozenset({Licence.AGREEMENT_REQUIRED, Licence.NON_COMMERCIAL, Licence.UNVERIFIED, Licence.PAID})
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class LicenceInfo:
|
||||
status: Licence
|
||||
label: str # one line, shown prominently in Admin
|
||||
terms: str # what the source's own terms say (quoted where read)
|
||||
terms_url: Optional[str] = None
|
||||
attribution: Optional[str] = None # must render wherever this provider's imagery appears
|
||||
attribution_url: Optional[str] = None
|
||||
disclaimer: Optional[str] = None # pass-through disclaimer (e.g. NYSDOT DAA)
|
||||
issue: Optional[str] = None # tracking issue, e.g. "server-26#198"
|
||||
|
||||
@property
|
||||
def gated(self) -> bool:
|
||||
return self.status in GATED
|
||||
|
||||
def warning(self) -> Optional[str]:
|
||||
"""The blocking warning an admin must acknowledge, or None when ungated."""
|
||||
if self.status == Licence.PROHIBITED:
|
||||
return f"{self.label}. This source's terms forbid this use; it cannot be enabled."
|
||||
if not self.gated:
|
||||
return None
|
||||
return (f"{self.label}. {self.terms} Enabling it means DRB displays this source's imagery "
|
||||
f"to every signed-in user. Only confirm if DRB actually holds the right to do so.")
|
||||
|
||||
def as_dict(self) -> dict:
|
||||
return {
|
||||
"status": self.status.value, "label": self.label, "terms": self.terms,
|
||||
"terms_url": self.terms_url, "attribution": self.attribution,
|
||||
"attribution_url": self.attribution_url, "disclaimer": self.disclaimer,
|
||||
"issue": self.issue, "gated": self.gated, "warning": self.warning(),
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderMeta:
|
||||
id: str
|
||||
name: str
|
||||
region: str
|
||||
coverage: BBox # rough bbox; a query outside it never triggers a fetch
|
||||
licence: LicenceInfo
|
||||
formats: str # "stills", "stills + HLS", ...
|
||||
implemented: bool
|
||||
notes: str # what is verified vs unverified about this adapter
|
||||
homepage: Optional[str] = None
|
||||
key_setting: Optional[str] = None # settings attribute holding a required API key
|
||||
ttl_s: int = DEFAULT_CATALOG_TTL_S
|
||||
|
||||
|
||||
class CameraSignalSink(Protocol):
|
||||
"""Future seam (NOT implemented): aggregate per-class counts from a camera
|
||||
still attached to an incident as corroborating evidence. Blocked on
|
||||
server-26#199 and #200. No frames, plates or faces -- class counts only."""
|
||||
|
||||
async def submit(self, camera_id: str, incident_id: str, counts: Dict[str, int], observed_at: float) -> None: ...
|
||||
|
||||
|
||||
class CameraProvider:
|
||||
"""Base adapter. Subclasses set ``meta`` and implement ``fetch_catalog``."""
|
||||
meta: ProviderMeta
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
raise NotImplementedError(f"{self.meta.id}: adapter is a stub ({self.meta.notes})")
|
||||
|
||||
|
||||
class StubProvider(CameraProvider):
|
||||
"""A catalogued source with no working adapter -- listed so Admin shows its
|
||||
licence status, but it can never be enabled."""
|
||||
|
||||
def __init__(self, meta: ProviderMeta):
|
||||
assert not meta.implemented
|
||||
self.meta = meta
|
||||
|
||||
|
||||
class Catalog:
|
||||
"""In-memory cache of one provider's normalised camera list."""
|
||||
|
||||
def __init__(self, provider: CameraProvider):
|
||||
self.provider = provider
|
||||
self.items: List[Camera] = []
|
||||
self.fetched_at: Optional[float] = None # epoch s of last SUCCESSFUL fetch
|
||||
self.last_attempt_at: Optional[float] = None
|
||||
self.error: Optional[str] = None
|
||||
self._next_attempt = 0.0
|
||||
self._lock = asyncio.Lock()
|
||||
|
||||
async def get(self) -> "Catalog":
|
||||
if time.time() < self._next_attempt:
|
||||
return self
|
||||
async with self._lock:
|
||||
if time.time() < self._next_attempt:
|
||||
return self
|
||||
ttl = self.provider.meta.ttl_s
|
||||
self.last_attempt_at = time.time()
|
||||
try:
|
||||
items = await self.provider.fetch_catalog()
|
||||
self.items = items
|
||||
self.fetched_at = time.time()
|
||||
self.error = None
|
||||
self._next_attempt = time.time() + ttl
|
||||
except Exception as e:
|
||||
self._next_attempt = time.time() + min(ttl, RETRY_AFTER_FAILURE_S)
|
||||
self.error = f"{type(e).__name__}: {e}"[:300]
|
||||
logger.warning(f"cameras/{self.provider.meta.id}: refresh failed, serving {len(self.items)} cached: {self.error}")
|
||||
return self
|
||||
|
||||
def status(self) -> dict:
|
||||
return {"fetched_at": self.fetched_at, "last_attempt_at": self.last_attempt_at,
|
||||
"error": self.error, "count": len(self.items)}
|
||||
|
||||
|
||||
# ── helpers shared by adapters ───────────────────────────────────────────────
|
||||
|
||||
def make_camera(provider_id: str, raw_id: Any, lat: float, lon: float, *, name: str = "", roadway: str = "",
|
||||
direction: str = "", image_url: Optional[str] = None, video_url: Optional[str] = None,
|
||||
heading_deg: Optional[float] = None) -> Camera:
|
||||
"""One normalised record. ``id`` is provider-prefixed so two catalogs can't collide."""
|
||||
if heading_deg is None:
|
||||
heading_deg = heading_from_text(direction)
|
||||
return {
|
||||
"id": f"{provider_id}:{raw_id}",
|
||||
"provider": provider_id,
|
||||
"lat": lat, "lon": lon,
|
||||
"name": name, "roadway": roadway, "direction": direction,
|
||||
# Approximate at best: most sources publish the road's direction of
|
||||
# travel, not the camera's true heading. The UI labels viewsheds so.
|
||||
"heading_deg": heading_deg,
|
||||
"image_url": image_url, "video_url": video_url,
|
||||
}
|
||||
|
||||
|
||||
_COMPASS = {"N": 0, "NE": 45, "E": 90, "SE": 135, "S": 180, "SW": 225, "W": 270, "NW": 315}
|
||||
_WORDS = {"north": "N", "south": "S", "east": "E", "west": "W",
|
||||
"northeast": "NE", "northwest": "NW", "southeast": "SE", "southwest": "SW"}
|
||||
|
||||
|
||||
def heading_from_text(text: Optional[str]) -> Optional[float]:
|
||||
"""'Northbound' / 'NB' / 'West' / 'SE' -> degrees; None when it can't tell.
|
||||
'Both directions', 'Unknown', 'Eastbound/Westbound' etc. are None on purpose."""
|
||||
if not text:
|
||||
return None
|
||||
t = text.strip().lower()
|
||||
t = re.sub(r"bound$", "", t).strip()
|
||||
if t in _WORDS:
|
||||
return float(_COMPASS[_WORDS[t]])
|
||||
t2 = re.sub(r"b$", "", t).upper() if re.fullmatch(r"(n|s|e|w|ne|nw|se|sw)b?", t) else t.upper()
|
||||
return float(_COMPASS[t2]) if t2 in _COMPASS else None
|
||||
|
||||
|
||||
def finite(v: Any) -> Optional[float]:
|
||||
try:
|
||||
f = float(v)
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
return f if f == f and f not in (float("inf"), float("-inf")) else None
|
||||
|
||||
|
||||
def plausible(lat: Optional[float], lon: Optional[float], coverage: BBox) -> bool:
|
||||
if lat is None or lon is None or (lat == 0 and lon == 0):
|
||||
return False
|
||||
s, w, n, e = coverage
|
||||
return s <= lat <= n and w <= lon <= e
|
||||
|
||||
|
||||
def https_on(url: Any, *hosts: str) -> Optional[str]:
|
||||
"""Return ``url`` only when it is https on one of ``hosts`` (or a subdomain).
|
||||
Pins imagery to the agency's own hosts so no catalog field can point the
|
||||
browser somewhere else."""
|
||||
if not isinstance(url, str) or not url.startswith("https://"):
|
||||
return None
|
||||
host = url[len("https://"):].split("/", 1)[0].split(":", 1)[0].lower()
|
||||
return url if any(host == h or host.endswith("." + h) for h in hosts) else None
|
||||
|
||||
|
||||
def bbox_intersects(a: BBox, b: BBox) -> bool:
|
||||
return not (a[2] < b[0] or b[2] < a[0] or a[3] < b[1] or b[3] < a[1])
|
||||
|
||||
|
||||
def in_bbox(items: List[Camera], bbox: BBox) -> List[Camera]:
|
||||
s, w, n, e = bbox
|
||||
return [i for i in items if s <= i["lat"] <= n and w <= i["lon"] <= e]
|
||||
|
||||
|
||||
async def get_json(url: str, params: Optional[dict] = None, headers: Optional[dict] = None) -> Any:
|
||||
"""GET a JSON catalog. Redirects are refused: a catalog that moves is a
|
||||
change to review, not something to follow to an unknown host."""
|
||||
import httpx # local import keeps module import cheap for the test stubs
|
||||
h = {"User-Agent": USER_AGENT, "Accept": "application/json", **(headers or {})}
|
||||
async with httpx.AsyncClient(timeout=FETCH_TIMEOUT_S, follow_redirects=False) as client:
|
||||
r = await client.get(url, params=params, headers=h)
|
||||
r.raise_for_status()
|
||||
ctype = r.headers.get("content-type", "")
|
||||
if "json" not in ctype:
|
||||
# 511NY's dead legacy API answers 200 text/html (server-26#198).
|
||||
raise ValueError(f"expected JSON, got {ctype or 'no content-type'} (HTTP {r.status_code})")
|
||||
return r.json()
|
||||
|
||||
|
||||
def require_parsed(raw_count: int, out: List[Camera], what: str) -> List[Camera]:
|
||||
"""Every record failing to normalise means the schema changed under us --
|
||||
that is an error, not an empty catalog."""
|
||||
if raw_count and not out:
|
||||
raise ValueError(f"0 of {raw_count} {what} records parsed -- upstream schema change?")
|
||||
return out
|
||||
@@ -0,0 +1,368 @@
|
||||
"""General / other-region camera sources -- design-canvas/camera-sources.md §C,
|
||||
including every God's Eye View (GEV) source.
|
||||
|
||||
Endpoints and record shapes for the implemented adapters were checked
|
||||
first-hand against each live catalog on 2026-10-04 (Ontario 511 excepted: it now
|
||||
answers "Invalid Key" without a developer key, so its shape is the legacy CARS
|
||||
v2 shape, UNVERIFIED). Imagery URLs are pinned to each agency's own hosts. None
|
||||
of these cover DRB's region; they exist so a non-NY customer has a path, and
|
||||
every one of them is OFF until an admin enables it.
|
||||
|
||||
GEV is MIT-licensed code, but nothing here is copied from it, and none of GEV's
|
||||
bundled data (config/*.json curated catalogs) is used -- the MIT grant does not
|
||||
cover data.
|
||||
"""
|
||||
import asyncio
|
||||
from typing import List
|
||||
|
||||
from app.config import settings
|
||||
from app.internal.cameras.base import (
|
||||
Camera, CameraProvider, Licence, LicenceInfo, ProviderMeta, StubProvider, finite, get_json, https_on,
|
||||
make_camera, plausible, require_parsed,
|
||||
)
|
||||
|
||||
|
||||
def _unverified(label: str, terms: str, url: str = None) -> LicenceInfo:
|
||||
return LicenceInfo(status=Licence.UNVERIFIED, label=label, terms=terms, terms_url=url)
|
||||
|
||||
|
||||
# ── Caltrans CWWP2 ───────────────────────────────────────────────────────────
|
||||
class CaltransProvider(CameraProvider):
|
||||
DISTRICTS = (4, 7, 11, 3) # SF Bay, LA, San Diego, Sacramento
|
||||
meta = ProviderMeta(
|
||||
id="caltrans", name="Caltrans CWWP2", region="California (districts 4, 7, 11, 3)",
|
||||
coverage=(32.4, -124.6, 42.1, -114.0),
|
||||
licence=_unverified(
|
||||
"Licence UNVERIFIED -- likely commercial OK; Conditions of Use not yet read",
|
||||
"\"Commercial Wholesale Web Portal\", \"no charge\"; Conditions of Use apply and have not been read.",
|
||||
"https://cwwp2.dot.ca.gov/documentation/cctv/cctv.htm"),
|
||||
formats="stills (~5 min) + HLS", implemented=True,
|
||||
notes="Schema verified 2026-10-04 (D4). HLS host CORS unverified -- the player falls back to the still.",
|
||||
homepage="https://cwwp2.dot.ca.gov",
|
||||
)
|
||||
|
||||
async def _district(self, d: int) -> list:
|
||||
payload = await get_json(f"https://cwwp2.dot.ca.gov/data/d{d}/cctv/cctvStatusD{d:02d}.json")
|
||||
return payload.get("data") or [] if isinstance(payload, dict) else []
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
results = await asyncio.gather(*(self._district(d) for d in self.DISTRICTS), return_exceptions=True)
|
||||
ok = [r for r in results if not isinstance(r, BaseException)]
|
||||
if not ok:
|
||||
raise RuntimeError(f"every Caltrans district failed: {results[0]}")
|
||||
rows = [row for district in ok for row in district]
|
||||
out: List[Camera] = []
|
||||
for row in rows:
|
||||
c = (row or {}).get("cctv") or {}
|
||||
if str(c.get("inService", "")).lower() != "true":
|
||||
continue
|
||||
loc = c.get("location") or {}
|
||||
lat, lon = finite(loc.get("latitude")), finite(loc.get("longitude"))
|
||||
if not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
img = https_on(((c.get("imageData") or {}).get("static") or {}).get("currentImageURL"), "dot.ca.gov")
|
||||
if not img:
|
||||
continue
|
||||
vid = https_on((c.get("imageData") or {}).get("streamingVideoURL"), "dot.ca.gov")
|
||||
name = str(loc.get("locationName") or "")
|
||||
code = name.split("--", 1)[0].strip() or str(c.get("index"))
|
||||
out.append(make_camera("caltrans", f"d{loc.get('district')}-{code}", lat, lon,
|
||||
name=name.split("--", 1)[-1].strip() or name, roadway=str(loc.get("route") or ""),
|
||||
direction=str(loc.get("direction") or ""), image_url=img, video_url=vid))
|
||||
return require_parsed(len(rows), out, "Caltrans") if rows else out
|
||||
|
||||
|
||||
# ── DelDOT ───────────────────────────────────────────────────────────────────
|
||||
class DelDotProvider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="deldot", name="DelDOT TMC", region="Delaware",
|
||||
coverage=(38.4, -75.8, 39.9, -75.0),
|
||||
licence=_unverified("Licence UNVERIFIED -- \"public data\", no explicit licence found",
|
||||
"No licence or terms of reuse located for tmc.deldot.gov's camera catalog."),
|
||||
formats="live HLS only (no stills)", implemented=True,
|
||||
notes="Schema verified 2026-10-04 (361 cams); https HLS host sends ACAO: * (verified). Video-only, so a "
|
||||
"camera shows nothing when its stream is down. Played directly from the browser -- no DRB egress.",
|
||||
homepage="https://deldot.gov/map/",
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
payload = await get_json("https://tmc.deldot.gov/json/videocamera.json")
|
||||
rows = payload.get("videoCameras") or [] if isinstance(payload, dict) else []
|
||||
out: List[Camera] = []
|
||||
for r in rows:
|
||||
if r.get("enabled") is not True or r.get("status") != "Active" or not r.get("id"):
|
||||
continue
|
||||
lat, lon = finite(r.get("lat")), finite(r.get("lon"))
|
||||
vid = https_on((r.get("urls") or {}).get("m3u8s"), "deldot.gov")
|
||||
if not plausible(lat, lon, self.meta.coverage) or not vid:
|
||||
continue
|
||||
out.append(make_camera("deldot", r["id"], lat, lon, name=str(r.get("title") or r["id"]),
|
||||
roadway=str(r.get("county") or ""), video_url=vid))
|
||||
return require_parsed(len(rows), out, "DelDOT")
|
||||
|
||||
|
||||
# ── Ontario 511 ──────────────────────────────────────────────────────────────
|
||||
class Ontario511Provider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="ontario511", name="Ontario 511", region="Ontario, Canada",
|
||||
coverage=(41.6, -95.2, 57.0, -74.3),
|
||||
licence=_unverified("Licence UNVERIFIED -- Ontario open-data terms page not read",
|
||||
"GEV reports the Open Government Licence - Ontario; not confirmed first-hand.",
|
||||
"https://511on.ca/developers/doc"),
|
||||
formats="stills", implemented=True,
|
||||
notes="Needs ONTARIO511_API_KEY (verified 2026-10-04: keyless now answers \"Invalid Key\"); 10 calls/60 s. "
|
||||
"Record shape is the CARS v2 shape (Id/Latitude/Longitude/Views[]), UNVERIFIED since the key change.",
|
||||
homepage="https://511on.ca", key_setting="ontario511_api_key",
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
if not settings.ontario511_api_key:
|
||||
raise RuntimeError("ONTARIO511_API_KEY not set")
|
||||
rows = await get_json("https://511on.ca/api/v2/get/cameras",
|
||||
params={"format": "json", "lang": "en", "key": settings.ontario511_api_key})
|
||||
rows = rows if isinstance(rows, list) else []
|
||||
out: List[Camera] = []
|
||||
for r in rows:
|
||||
lat, lon = finite(r.get("Latitude")), finite(r.get("Longitude"))
|
||||
if not r.get("Id") or not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
views = [v for v in (r.get("Views") or []) if str(v.get("Status", "")).lower() == "enabled"]
|
||||
img = next((https_on(v.get("Url"), "511on.ca") for v in views if https_on(v.get("Url"), "511on.ca")), None)
|
||||
if not img:
|
||||
continue
|
||||
out.append(make_camera("ontario511", r["Id"], lat, lon, name=str(r.get("Location") or ""),
|
||||
roadway=str(r.get("Roadway") or ""), direction=str(r.get("Direction") or ""),
|
||||
image_url=img))
|
||||
return require_parsed(len(rows), out, "Ontario 511")
|
||||
|
||||
|
||||
# ── DriveBC ──────────────────────────────────────────────────────────────────
|
||||
class DriveBcProvider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="drivebc", name="DriveBC", region="British Columbia, Canada",
|
||||
coverage=(48.2, -139.1, 60.1, -114.0),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.ATTRIBUTION_REQUIRED, label="Commercial OK with attribution (OGL - British Columbia)",
|
||||
terms="Open Government Licence - British Columbia: reuse permitted with attribution.",
|
||||
terms_url="https://www2.gov.bc.ca/gov/content/data/policy-standards/open-data/open-government-licence-bc",
|
||||
attribution="DriveBC -- contains information licensed under the Open Government Licence - British Columbia",
|
||||
attribution_url="https://www.drivebc.ca"),
|
||||
formats="stills", implemented=True, notes="Schema verified 2026-10-04 (1,066 cams).",
|
||||
homepage="https://www.drivebc.ca",
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
rows = await get_json("https://www.drivebc.ca/api/webcams/")
|
||||
rows = rows if isinstance(rows, list) else []
|
||||
out: List[Camera] = []
|
||||
for r in rows:
|
||||
if r.get("is_on") is not True or r.get("should_appear") is not True:
|
||||
continue
|
||||
cid = r.get("id")
|
||||
coords = (r.get("location") or {}).get("coordinates") or []
|
||||
if not isinstance(cid, int) or len(coords) < 2:
|
||||
continue
|
||||
lon, lat = finite(coords[0]), finite(coords[1])
|
||||
if not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
out.append(make_camera("drivebc", cid, lat, lon, name=str(r.get("name") or ""),
|
||||
roadway=str(r.get("highway_description") or ""),
|
||||
direction=str(r.get("orientation") or ""),
|
||||
image_url=f"https://www.drivebc.ca/images/{cid}.jpg"))
|
||||
return require_parsed(len(rows), out, "DriveBC")
|
||||
|
||||
|
||||
# ── Open Calgary ─────────────────────────────────────────────────────────────
|
||||
class CalgaryProvider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="calgary", name="Open Calgary traffic cameras", region="Calgary, Alberta",
|
||||
coverage=(50.8, -114.5, 51.3, -113.8),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.ATTRIBUTION_REQUIRED, label="Commercial OK with attribution (OGL - City of Calgary)",
|
||||
terms="Open Government Licence - City of Calgary: reuse permitted with attribution.",
|
||||
terms_url="https://data.calgary.ca/stories/s/Open-Calgary-Terms-of-Use/u45n-7awa",
|
||||
attribution="Contains information licensed under the Open Government Licence - City of Calgary",
|
||||
attribution_url="https://data.calgary.ca"),
|
||||
formats="stills", implemented=True,
|
||||
notes="Schema verified 2026-10-04 (216 cams). Catalog lists http:// stills; upgraded to https on the same host.",
|
||||
homepage="https://data.calgary.ca",
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
rows = await get_json("https://data.calgary.ca/resource/k7p9-kppz.json", params={"$limit": "1000"})
|
||||
rows = rows if isinstance(rows, list) else []
|
||||
out: List[Camera] = []
|
||||
for r in rows:
|
||||
url = str((r.get("camera_url") or {}).get("url") or "")
|
||||
if url.startswith("http://"):
|
||||
url = "https://" + url[len("http://"):]
|
||||
img = https_on(url, "trafficcam.calgary.ca")
|
||||
coords = (r.get("point") or {}).get("coordinates") or []
|
||||
if not img or len(coords) < 2:
|
||||
continue
|
||||
lon, lat = finite(coords[0]), finite(coords[1])
|
||||
if not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
cid = img.rsplit("/", 1)[-1].rsplit(".", 1)[0]
|
||||
out.append(make_camera("calgary", cid, lat, lon, name=str(r.get("camera_location") or cid),
|
||||
roadway=str(r.get("quadrant") or ""), image_url=img))
|
||||
return require_parsed(len(rows), out, "Calgary")
|
||||
|
||||
|
||||
# ── TfL JamCams ──────────────────────────────────────────────────────────────
|
||||
class TflProvider(CameraProvider):
|
||||
IMAGE_PREFIX = "https://s3-eu-west-1.amazonaws.com/jamcams.tfl.gov.uk/"
|
||||
meta = ProviderMeta(
|
||||
id="tfl", name="TfL JamCams", region="London, UK",
|
||||
coverage=(51.2, -0.7, 51.8, 0.4),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.ATTRIBUTION_REQUIRED,
|
||||
label="Commercial OK with attribution (\"Powered by TfL Open Data\") -- TfL terms page not re-read",
|
||||
terms="TfL transport data terms: free incl. commercial, with attribution (per GEV; the terms page "
|
||||
"returned 403 during the survey -- re-read before selling).",
|
||||
terms_url="https://tfl.gov.uk/info-for/open-data-users/our-open-data",
|
||||
attribution="Powered by TfL Open Data", attribution_url="https://tfl.gov.uk"),
|
||||
formats="stills (+ short MP4, unused)", implemented=True, notes="Schema verified 2026-10-04 (890 cams).",
|
||||
homepage="https://api.tfl.gov.uk",
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
rows = await get_json("https://api.tfl.gov.uk/Place/Type/JamCam")
|
||||
rows = rows if isinstance(rows, list) else []
|
||||
out: List[Camera] = []
|
||||
for r in rows:
|
||||
props = {p.get("key"): p.get("value") for p in (r.get("additionalProperties") or []) if isinstance(p, dict)}
|
||||
if str(props.get("available", "")).lower() != "true":
|
||||
continue
|
||||
img = str(props.get("imageUrl") or "")
|
||||
lat, lon = finite(r.get("lat")), finite(r.get("lon"))
|
||||
raw_id = str(r.get("id") or "").replace("JamCams_", "")
|
||||
if not img.startswith(self.IMAGE_PREFIX) or not raw_id or not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
out.append(make_camera("tfl", raw_id, lat, lon, name=str(r.get("commonName") or raw_id),
|
||||
direction=str(props.get("view") or ""), image_url=img))
|
||||
return require_parsed(len(rows), out, "TfL")
|
||||
|
||||
|
||||
# ── Live Traffic NSW ─────────────────────────────────────────────────────────
|
||||
class NswProvider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="nsw", name="Live Traffic NSW", region="New South Wales, Australia",
|
||||
coverage=(-37.6, 140.9, -28.0, 153.7),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.ATTRIBUTION_REQUIRED, label="Commercial OK with attribution (CC BY 4.0)",
|
||||
terms="Catalog's own rights block: copyright Transport for NSW, licence per the Open Data Hub dataset "
|
||||
"(CC BY 4.0).",
|
||||
terms_url="https://opendata.transport.nsw.gov.au/dataset/live-traffic-cameras",
|
||||
attribution="Transport for NSW, CC BY 4.0", attribution_url="https://www.livetraffic.com"),
|
||||
formats="stills", implemented=True, notes="Schema verified 2026-10-04 (241 cams).",
|
||||
homepage="https://www.livetraffic.com",
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
payload = await get_json("https://data.livetraffic.com/cameras/traffic-cam.json")
|
||||
feats = payload.get("features") or [] if isinstance(payload, dict) else []
|
||||
out: List[Camera] = []
|
||||
for f in feats:
|
||||
p = f.get("properties") or {}
|
||||
coords = (f.get("geometry") or {}).get("coordinates") or []
|
||||
img = https_on(p.get("href"), "transport.nsw.gov.au")
|
||||
if not img or len(coords) < 2 or not f.get("id"):
|
||||
continue
|
||||
lon, lat = finite(coords[0]), finite(coords[1])
|
||||
if not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
out.append(make_camera("nsw", f["id"], lat, lon, name=str(p.get("title") or ""),
|
||||
roadway=str(p.get("region") or ""), direction=str(p.get("direction") or ""),
|
||||
image_url=img))
|
||||
return require_parsed(len(feats), out, "NSW")
|
||||
|
||||
|
||||
# ── Fintraffic / Digitraffic weathercams ─────────────────────────────────────
|
||||
class FintrafficProvider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="fintraffic", name="Fintraffic / Digitraffic weathercams", region="Finland",
|
||||
coverage=(59.5, 19.0, 70.2, 31.7),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.ATTRIBUTION_REQUIRED, label="Commercial OK with attribution (CC BY 4.0)",
|
||||
terms="\"Source: Fintraffic / digitraffic.fi, license CC 4.0 BY\".",
|
||||
terms_url="https://www.digitraffic.fi/en/terms-of-service/",
|
||||
attribution="Source: Fintraffic / digitraffic.fi, license CC 4.0 BY",
|
||||
attribution_url="https://www.digitraffic.fi"),
|
||||
formats="stills (~10 min)", implemented=True,
|
||||
notes="Schema verified 2026-10-04 (810 stations, several presets each). Digitraffic asks clients to "
|
||||
"identify themselves (Digitraffic-User header).",
|
||||
homepage="https://www.digitraffic.fi", ttl_s=30 * 60,
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
payload = await get_json("https://tie.digitraffic.fi/api/weathercam/v1/stations",
|
||||
headers={"Digitraffic-User": "DRB/c2-core"})
|
||||
feats = payload.get("features") or [] if isinstance(payload, dict) else []
|
||||
out: List[Camera] = []
|
||||
for f in feats:
|
||||
p = f.get("properties") or {}
|
||||
coords = (f.get("geometry") or {}).get("coordinates") or []
|
||||
sid = str(p.get("id") or "")
|
||||
if not sid or str(p.get("collectionStatus", "")).upper() != "GATHERING" or len(coords) < 2:
|
||||
continue
|
||||
lon, lat = finite(coords[0]), finite(coords[1])
|
||||
if not plausible(lat, lon, self.meta.coverage):
|
||||
continue
|
||||
for preset in p.get("presets") or []:
|
||||
pid = str((preset or {}).get("id") or "")
|
||||
if preset.get("inCollection") is not True or not pid.startswith(sid) or not pid[1:].isdigit():
|
||||
continue
|
||||
out.append(make_camera("fintraffic", pid, lat, lon, name=f"{p.get('name') or sid} ({pid[-2:]})",
|
||||
image_url=f"https://weathercam.digitraffic.fi/{pid}.jpg"))
|
||||
return require_parsed(len(feats), out, "Fintraffic")
|
||||
|
||||
|
||||
# ── Stubs: catalogued, no adapter ────────────────────────────────────────────
|
||||
def _stub(id, name, region, coverage, licence, formats, notes, homepage=None) -> StubProvider:
|
||||
return StubProvider(ProviderMeta(id=id, name=name, region=region, coverage=coverage, licence=licence,
|
||||
formats=formats, implemented=False, notes=notes, homepage=homepage))
|
||||
|
||||
|
||||
STUBS = [
|
||||
_stub("austin", "City of Austin open data", "Austin, Texas", (30.0, -98.1, 30.6, -97.5),
|
||||
_unverified("Licence UNVERIFIED -- city open data, no explicit licence", "No explicit licence per GEV."),
|
||||
"stills (5 min)", "Stub: Socrata column mapping not built.", "https://data.austintexas.gov"),
|
||||
_stub("txdot", "TxDOT ITS", "Texas (per district)", (25.8, -106.7, 36.6, -93.5),
|
||||
_unverified("Licence UNVERIFIED -- \"public data\"", "No explicit licence per GEV."),
|
||||
"base64 JPEG inside JSON", "Stub: frames are base64 inside JSON, so the browser cannot show them "
|
||||
"without a DRB frame proxy (video/image egress on DRB's bill -- not built).", "https://its.txdot.gov"),
|
||||
_stub("md_chart", "Maryland CHART", "Maryland", (37.9, -79.5, 39.8, -75.0),
|
||||
_unverified("Licence UNVERIFIED -- MD open data portal terms not read", "Not read."),
|
||||
"live video URLs", "Stub: catalog schema not verified.", "https://chart.maryland.gov"),
|
||||
_stub("wsdot", "WSDOT Traveler Information API", "Washington State", (45.5, -124.9, 49.1, -116.9),
|
||||
_unverified("Licence UNVERIFIED -- WSDOT disclaimer only", "Free access code required; terms not read."),
|
||||
"stills", "Stub: needs a WSDOT access code; schema not verified.", "https://wsdot.wa.gov/traffic/api/"),
|
||||
_stub("tallinn", "Tallinn city cameras", "Tallinn, Estonia", (59.35, 24.55, 59.5, 24.95),
|
||||
_unverified("Licence UNVERIFIED", "No licence found."),
|
||||
"stills", "Stub: GEV uses a curated catalog file; GEV's data is not covered by its MIT licence.",
|
||||
"https://ristmikud.tallinn.ee"),
|
||||
_stub("tarktee", "Tarktee (Estonian Transport Administration)", "Estonia", (57.5, 21.7, 59.8, 28.3),
|
||||
_unverified("Licence UNVERIFIED", "No licence found."),
|
||||
"DATEX2 stills", "Stub: DATEX2 XML parser not built.", "https://tarktee.transpordiamet.ee"),
|
||||
_stub("warendorf", "Warendorf municipal webcam", "Warendorf, Germany", (51.9, 7.9, 52.0, 8.1),
|
||||
_unverified("Licence UNVERIFIED", "No licence found."),
|
||||
"stills", "Stub: single curated webcam; no catalog API.", "https://www.warendorf.de"),
|
||||
_stub("trafficland", "TrafficLand", "US (18k cams, 50+ DOTs)", (18.0, -170.0, 72.0, -60.0),
|
||||
LicenceInfo(status=Licence.PAID, label="Paid commercial licence -- no contract",
|
||||
terms="Licensed API; contractual redistribution with 50+ DOTs. Price UNVERIFIED.",
|
||||
terms_url="http://www.trafficland.com/api.html"),
|
||||
"live video", "Stub: the clean route if DRB ever needs video beyond 511NY; needs a contract."),
|
||||
_stub("windy", "Windy Webcams API", "Global (scenic/weather)", (-90.0, -180.0, 90.0, 180.0),
|
||||
LicenceInfo(status=Licence.PAID, label="Paid professional tier for commercial use -- no contract",
|
||||
terms="Free tier image URLs expire after 10 min; commercial terms UNVERIFIED.",
|
||||
terms_url="https://api.windy.com/webcams/docs"),
|
||||
"tokenised stills", "Stub: scenic/weather cams, not traffic."),
|
||||
_stub("earthcam", "EarthCam", "Global", (-90.0, -180.0, 90.0, 180.0),
|
||||
LicenceInfo(status=Licence.PAID, label="Paid commercial licence -- no contract",
|
||||
terms="Commercial licensing exists; terms UNVERIFIED."),
|
||||
"live video", "Stub: low local value."),
|
||||
]
|
||||
|
||||
PROVIDERS = [CaltransProvider(), DelDotProvider(), Ontario511Provider(), DriveBcProvider(), CalgaryProvider(),
|
||||
TflProvider(), NswProvider(), FintrafficProvider(), *STUBS]
|
||||
@@ -0,0 +1,164 @@
|
||||
"""Tri-state (Westchester-first) camera sources -- design-canvas/camera-sources.md §A.
|
||||
|
||||
Only 511NY has a working adapter. Every other regional source is listed so
|
||||
Admin shows its licence status, and is a stub because DRB has no right to use
|
||||
it yet (NYC DOT, Westchester DPW), it carries no cameras (CTroads), or no
|
||||
developer program exists (511NJ). Do not "fix" a stub by scraping: CTroads,
|
||||
511NJ's app and the new 511ny.org backend all ban robots/reverse engineering.
|
||||
"""
|
||||
from typing import List
|
||||
|
||||
from app.internal import ny511
|
||||
from app.internal.cameras.base import (
|
||||
Camera, CameraProvider, Licence, LicenceInfo, ProviderMeta, StubProvider, make_camera, require_parsed,
|
||||
)
|
||||
|
||||
NY_BBOX = (40.4, -80.0, 45.1, -71.7)
|
||||
TRISTATE_BBOX = (40.3, -75.6, 42.1, -71.7)
|
||||
|
||||
NYSDOT_DISCLAIMER = (
|
||||
"NYSDOT compiles the data from the best available sources and makes a best effort to disseminate it. "
|
||||
"Data availability and accuracy are subject to change, and may change as often as daily. Posted "
|
||||
"restrictions in the field may differ from, and supersede, the information in this feed. NYSDOT and its "
|
||||
"partner agencies make no warranty regarding the data, express or implied, and expressly disclaim all "
|
||||
"warranties of merchantability and fitness for any particular purpose. NYSDOT makes no warranty that the "
|
||||
"data will be provided without interruption or that it will be free of errors. Access is provided on an "
|
||||
"\"as is\" and \"with all faults\" basis."
|
||||
)
|
||||
|
||||
|
||||
class Ny511Provider(CameraProvider):
|
||||
meta = ProviderMeta(
|
||||
id="ny511",
|
||||
name="511NY (NYSDOT)",
|
||||
region="New York State (aggregates NYSDOT, Thruway, NYC DOT, MTA B&T, PANYNJ, TRANSCOM partners)",
|
||||
coverage=NY_BBOX,
|
||||
licence=LicenceInfo(
|
||||
status=Licence.AGREEMENT_REQUIRED,
|
||||
label="Requires NYSDOT Developer Access Agreement -- access to the new 511x feed NOT granted yet",
|
||||
terms=("Commercial redistribution is allowed under the DAA (\"You may redistribute, enhance, repackage, "
|
||||
"and add value to the data\"; \"You may not alter the substance of a report\"; must display the "
|
||||
"time the data was published or last updated). Access is granted per request via the 511NY "
|
||||
"Data Feed Request Form; DRB's 2026-09-27 request went to the retired system. Overlays, "
|
||||
"detection and frame archiving are not addressed (server-26#199)."),
|
||||
terms_url="https://511ny.org/help/24",
|
||||
# DAA permitted use: tag line + logo + link. The approved logo is not
|
||||
# in the repo yet (owner action), so only the tag line + link render.
|
||||
attribution="powered by 511NY",
|
||||
attribution_url="https://511ny.org",
|
||||
disclaimer=NYSDOT_DISCLAIMER,
|
||||
issue="server-26#198",
|
||||
),
|
||||
formats="stills (60 s) + HLS on NYSDOT hosts (legacy shape)",
|
||||
implemented=True,
|
||||
notes=("Legacy request/record shape behind settings.ny511_api_base + ny511_api_key, plus a tolerant "
|
||||
"parser for the 511x XML camera inventory. UNVERIFIED until the DAA grant documents the new "
|
||||
"endpoints: base URL, query params, XML element names, still/HLS URL shape and CORS. The "
|
||||
"legacy endpoint has returned HTML since the 511x cutover, so expect a feed error until then."),
|
||||
homepage="https://511ny.org",
|
||||
key_setting="ny511_api_key",
|
||||
ttl_s=ny511.CAMERAS_TTL_S,
|
||||
)
|
||||
|
||||
async def fetch_catalog(self) -> List[Camera]:
|
||||
rows = await ny511._fetch("getcameras", ny511.normalize_camera)
|
||||
out = [
|
||||
make_camera("ny511", r["id"], r["lat"], r["lon"], name=r["name"], roadway=r["roadway"],
|
||||
direction=r["direction"], image_url=r["image_url"], video_url=r["video_url"])
|
||||
for r in rows
|
||||
]
|
||||
return require_parsed(len(rows), out, "511NY")
|
||||
|
||||
|
||||
NYC_DOT = StubProvider(ProviderMeta(
|
||||
id="nyc_dot",
|
||||
name="NYC DOT TMC (webcams.nyctmc.org)",
|
||||
region="New York City (~975 cams, ~80 in the Bronx)",
|
||||
coverage=(40.45, -74.30, 40.95, -73.65),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.AGREEMENT_REQUIRED,
|
||||
label="Requires a signed NYC DOT data-sharing agreement -- NOT signed",
|
||||
terms=("NYC DOT Data Feeds page: \"Developers must sign a data-sharing agreement\" (tmcdot@dot.nyc.gov). "
|
||||
"The API answers keyless, but keyless use is outside those terms. Agreement terms unpublished."),
|
||||
terms_url="https://www.nyc.gov/html/dot/html/about/datafeeds.shtml",
|
||||
issue="server-26#201",
|
||||
),
|
||||
formats="JPEG stills (~15 s), no CORS",
|
||||
implemented=False,
|
||||
notes="Stub on purpose: do not integrate until the agreement is signed (server-26#201). Many of these cams "
|
||||
"are likely already re-published by 511NY.",
|
||||
homepage="https://webcams.nyctmc.org",
|
||||
))
|
||||
|
||||
WESTCHESTER_DPW = StubProvider(ProviderMeta(
|
||||
id="westchester_dpw",
|
||||
name="Westchester County DPW traffic cameras",
|
||||
region="Westchester County (~21 locations, mostly Bronx River Pkwy)",
|
||||
coverage=(40.88, -73.99, 41.37, -73.48),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.AGREEMENT_REQUIRED,
|
||||
label="No reuse licence -- written permission from County DPW required, NOT obtained",
|
||||
terms="Only a disclaimer: data \"provided 'as is' without warranty\". No API, no reuse licence.",
|
||||
terms_url="https://experience.arcgis.com/experience/a59314e926e94301b9083edd6bb52a11",
|
||||
issue="server-26#202",
|
||||
),
|
||||
formats="stills (5 s), viewer only",
|
||||
implemented=False,
|
||||
notes="Stub: there is no documented API or feed, and no permission. Ask DPW in writing (server-26#202).",
|
||||
homepage="https://www.westchestergov.com/trafficcamera",
|
||||
))
|
||||
|
||||
TRANSCOM = StubProvider(ProviderMeta(
|
||||
id="transcom_xcm",
|
||||
name="TRANSCOM XCM data exchange",
|
||||
region="NY/NJ/CT tri-state",
|
||||
coverage=TRISTATE_BBOX,
|
||||
licence=LicenceInfo(
|
||||
status=Licence.UNVERIFIED,
|
||||
label="Events/travel times commercial OK; cameras UNVERIFIED",
|
||||
terms="Free registration, open to \"commercial vendors ... for use in their applications\". Whether the "
|
||||
"feed carries camera URLs is unverified.",
|
||||
terms_url="https://data.xcmdata.org/DEWeb/Pages/aboutus",
|
||||
),
|
||||
formats="XML events + link travel times (cameras unverified)",
|
||||
implemented=False,
|
||||
notes="Stub: register first, then confirm whether any camera inventory exists. Its events feed would be a "
|
||||
"separate (event) provider, not a camera one.",
|
||||
homepage="https://data.xcmdata.org",
|
||||
))
|
||||
|
||||
CTROADS = StubProvider(ProviderMeta(
|
||||
id="ctroads",
|
||||
name="CTDOT / CTroads",
|
||||
region="Connecticut",
|
||||
coverage=(40.95, -73.75, 42.06, -71.78),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.PROHIBITED,
|
||||
label="No sanctioned camera path -- site terms forbid camera reuse",
|
||||
terms="The keyed developer API covers Message Signs, Events and Advisories only -- no cameras. The site "
|
||||
"T&C forbid use \"for any personal, public or commercial purpose\" and robots.",
|
||||
terms_url="https://ctroads.org/termsandconditions",
|
||||
),
|
||||
formats="events/signs only (no cameras)",
|
||||
implemented=False,
|
||||
notes="Cannot be enabled. CT cameras may surface via 511NY's \"Connecticut Statewide\" region once the DAA "
|
||||
"grant arrives.",
|
||||
homepage="https://ctroads.org/developers/doc",
|
||||
))
|
||||
|
||||
NJ511 = StubProvider(ProviderMeta(
|
||||
id="nj511",
|
||||
name="511NJ / NJDOT / NJTA / PANYNJ",
|
||||
region="New Jersey",
|
||||
coverage=(38.9, -75.6, 41.4, -73.9),
|
||||
licence=LicenceInfo(
|
||||
status=Licence.UNVERIFIED,
|
||||
label="No published developer program -- reuse UNVERIFIED",
|
||||
terms="511NJ is a JS app with no published developer program; NJDOT only cites RSS/Twitter.",
|
||||
),
|
||||
formats="unknown",
|
||||
implemented=False,
|
||||
notes="Stub: ask NJDOT 511 if northern NJ matters. Some cams appear in 511NY.",
|
||||
))
|
||||
|
||||
PROVIDERS = [Ny511Provider(), NYC_DOT, WESTCHESTER_DPW, TRANSCOM, CTROADS, NJ511]
|
||||
@@ -0,0 +1,198 @@
|
||||
"""Camera provider registry: settings, licence gate, and bbox queries.
|
||||
|
||||
Settings live in Firestore ``config/camera_providers``::
|
||||
|
||||
{"providers": {"<id>": {"enabled": bool, "updated_at": iso, "updated_by": {...},
|
||||
"acknowledgement": {"by_uid", "by_email", "at", "licence_status", "warning"} | None}}}
|
||||
|
||||
Rules (owner brief, 2026-10-04):
|
||||
* every provider defaults OFF -- a missing doc/entry means off;
|
||||
* a stub (no adapter) or a PROHIBITED source can never be enabled;
|
||||
* a GATED licence (agreement required / non-commercial / unverified / paid)
|
||||
can only be enabled with an explicit acknowledgement, recorded with who and
|
||||
when in the settings doc AND audit_log. The audit write is a precondition
|
||||
for a gated enable: no record, no enable;
|
||||
* an acknowledgement is bound to the licence status it was given for. If a
|
||||
provider's catalogued status changes in code, the old acknowledgement no
|
||||
longer counts and the provider stops serving until re-acknowledged.
|
||||
"""
|
||||
import asyncio
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
from typing import Dict, List, Optional, Tuple
|
||||
|
||||
from app.config import settings
|
||||
from app.internal import firestore as fstore
|
||||
from app.internal.cameras import general, regional
|
||||
from app.internal.cameras.base import (
|
||||
BBox, Camera, CameraProvider, Catalog, Licence, bbox_intersects, in_bbox,
|
||||
)
|
||||
from app.internal.logger import logger
|
||||
|
||||
COLLECTION, DOC_ID = "config", "camera_providers"
|
||||
_TTL_S = 30.0
|
||||
MAX_ITEMS = 1500 # per response, same cap as /traffic/511
|
||||
|
||||
PROVIDERS: Dict[str, CameraProvider] = {p.meta.id: p for p in [*regional.PROVIDERS, *general.PROVIDERS]}
|
||||
CATALOGS: Dict[str, Catalog] = {pid: Catalog(p) for pid, p in PROVIDERS.items() if p.meta.implemented}
|
||||
|
||||
_cache: Dict[str, dict] = {}
|
||||
_cache_ts = 0.0
|
||||
|
||||
|
||||
class ProviderError(Exception):
|
||||
"""A refused settings change. ``code`` is the HTTP status the router returns."""
|
||||
|
||||
def __init__(self, code: int, message: str, **extra):
|
||||
super().__init__(message)
|
||||
self.code, self.message, self.extra = code, message, extra
|
||||
|
||||
|
||||
def invalidate_cache() -> None:
|
||||
global _cache_ts
|
||||
_cache_ts = 0.0
|
||||
|
||||
|
||||
async def get_settings() -> Dict[str, dict]:
|
||||
"""Per-provider settings. Unreadable Firestore means everything is OFF (fail closed)."""
|
||||
global _cache, _cache_ts
|
||||
if _cache_ts and time.monotonic() - _cache_ts < _TTL_S:
|
||||
return _cache
|
||||
try:
|
||||
doc = await fstore.doc_get(COLLECTION, DOC_ID) or {}
|
||||
provs = doc.get("providers") if isinstance(doc.get("providers"), dict) else {}
|
||||
_cache = {k: v for k, v in provs.items() if isinstance(v, dict)}
|
||||
except Exception as e:
|
||||
logger.warning(f"camera providers: settings unreadable ({e}); treating every provider as OFF")
|
||||
_cache = {}
|
||||
_cache_ts = time.monotonic()
|
||||
return _cache
|
||||
|
||||
|
||||
def effective(provider: CameraProvider, entry: Optional[dict]) -> Tuple[bool, Optional[str]]:
|
||||
"""(serving?, reason-if-not) for a provider given its settings entry."""
|
||||
meta = provider.meta
|
||||
if not meta.implemented:
|
||||
return False, "adapter is a stub"
|
||||
if meta.licence.status == Licence.PROHIBITED:
|
||||
return False, "source terms forbid this use"
|
||||
if not entry or not entry.get("enabled"):
|
||||
return False, "disabled (default)"
|
||||
if meta.licence.gated:
|
||||
ack = entry.get("acknowledgement") or {}
|
||||
if ack.get("licence_status") != meta.licence.status.value:
|
||||
return False, "licence acknowledgement missing or out of date"
|
||||
return True, None
|
||||
|
||||
|
||||
async def is_serving(provider_id: str) -> bool:
|
||||
p = PROVIDERS.get(provider_id)
|
||||
if p is None:
|
||||
return False
|
||||
return effective(p, (await get_settings()).get(provider_id))[0]
|
||||
|
||||
|
||||
async def set_enabled(provider_id: str, enabled: bool, actor: Tuple[str, str],
|
||||
acknowledge_licence: bool = False) -> dict:
|
||||
p = PROVIDERS.get(provider_id)
|
||||
if p is None:
|
||||
raise ProviderError(404, f"unknown camera provider '{provider_id}'")
|
||||
meta, lic = p.meta, p.meta.licence
|
||||
uid, email = actor
|
||||
now = datetime.now(timezone.utc).isoformat()
|
||||
entry: dict = {"enabled": bool(enabled), "updated_at": now, "updated_by": {"uid": uid, "email": email}}
|
||||
|
||||
if enabled:
|
||||
if not meta.implemented:
|
||||
raise ProviderError(409, f"{meta.name}: no working adapter -- {meta.notes}")
|
||||
if lic.status == Licence.PROHIBITED:
|
||||
raise ProviderError(409, lic.warning() or "prohibited")
|
||||
if lic.gated:
|
||||
if not acknowledge_licence:
|
||||
raise ProviderError(409, f"{meta.name}: licence acknowledgement required",
|
||||
requires_acknowledgement=True, warning=lic.warning(),
|
||||
licence=lic.as_dict())
|
||||
entry["acknowledgement"] = {"by_uid": uid, "by_email": email, "at": now,
|
||||
"licence_status": lic.status.value, "warning": lic.warning()}
|
||||
# Precondition, not a side effect: a gated enable with no audit
|
||||
# record must not happen. A failure here aborts before the write.
|
||||
try:
|
||||
await _audit(actor, "camera_provider.enable_acknowledged", provider_id,
|
||||
{"licence_status": lic.status.value, "licence_label": lic.label,
|
||||
"warning": lic.warning(), "acknowledged_at": now})
|
||||
except Exception as e:
|
||||
logger.error(f"camera providers: audit write failed, refusing gated enable of {provider_id} ({e})")
|
||||
raise ProviderError(503, "audit log unavailable -- a licence-gated provider cannot be enabled "
|
||||
"without an audit record; try again")
|
||||
else:
|
||||
entry["acknowledgement"] = None # re-enabling a gated source needs a fresh acknowledgement
|
||||
|
||||
before = (await get_settings()).get(provider_id) or {}
|
||||
await fstore.doc_set(COLLECTION, DOC_ID, {"providers": {provider_id: entry}}, merge=True)
|
||||
invalidate_cache()
|
||||
if not (enabled and lic.gated):
|
||||
try:
|
||||
await _audit(actor, "camera_provider.enable" if enabled else "camera_provider.disable", provider_id,
|
||||
{"from": bool(before.get("enabled")), "to": bool(enabled),
|
||||
"licence_status": lic.status.value})
|
||||
except Exception as e: # the toggle already happened; never 500 a completed write
|
||||
logger.error(f"camera providers: audit write failed for {provider_id} ({e})")
|
||||
logger.info(f"camera provider {provider_id} -> enabled={enabled} by {email or uid}")
|
||||
return await describe(provider_id)
|
||||
|
||||
|
||||
async def _audit(actor: Tuple[str, str], action: str, provider_id: str, details: dict) -> None:
|
||||
from app.internal import audit
|
||||
await audit.write_audit(actor_uid=actor[0], actor_email=actor[1], action=action,
|
||||
details={"provider_id": provider_id, **details})
|
||||
|
||||
|
||||
async def describe(provider_id: str) -> dict:
|
||||
p = PROVIDERS[provider_id]
|
||||
entry = (await get_settings()).get(provider_id) or {}
|
||||
serving, reason = effective(p, entry)
|
||||
m = p.meta
|
||||
cat = CATALOGS.get(provider_id)
|
||||
key_missing = bool(m.key_setting) and not getattr(settings, m.key_setting, None)
|
||||
return {
|
||||
"id": m.id, "name": m.name, "region": m.region, "formats": m.formats,
|
||||
"implemented": m.implemented, "notes": m.notes, "homepage": m.homepage,
|
||||
"licence": m.licence.as_dict(),
|
||||
"enabled": bool(entry.get("enabled")),
|
||||
"serving": serving, "not_serving_reason": reason,
|
||||
"acknowledgement": entry.get("acknowledgement"),
|
||||
"updated_at": entry.get("updated_at"), "updated_by": entry.get("updated_by"),
|
||||
"key_setting": m.key_setting, "key_missing": key_missing,
|
||||
"health": cat.status() if cat else None,
|
||||
}
|
||||
|
||||
|
||||
async def list_providers() -> List[dict]:
|
||||
await get_settings()
|
||||
return [await describe(pid) for pid in PROVIDERS]
|
||||
|
||||
|
||||
def credit(provider_id: str) -> dict:
|
||||
lic = PROVIDERS[provider_id].meta.licence
|
||||
return {"attribution": lic.attribution, "attribution_url": lic.attribution_url, "disclaimer": lic.disclaimer}
|
||||
|
||||
|
||||
async def cameras_in_bbox(bbox: BBox) -> dict:
|
||||
"""Cameras from every SERVING provider whose coverage meets ``bbox``.
|
||||
Providers that are off are never fetched."""
|
||||
conf = await get_settings()
|
||||
live = [pid for pid, cat in CATALOGS.items()
|
||||
if effective(PROVIDERS[pid], conf.get(pid))[0] and bbox_intersects(PROVIDERS[pid].meta.coverage, bbox)]
|
||||
await asyncio.gather(*(CATALOGS[pid].get() for pid in live))
|
||||
cams: List[Camera] = []
|
||||
providers = []
|
||||
for pid in live:
|
||||
cat = CATALOGS[pid]
|
||||
hits = in_bbox(cat.items, bbox)
|
||||
room = max(0, MAX_ITEMS - len(cams))
|
||||
cams.extend(hits[:room])
|
||||
providers.append({"id": pid, "name": PROVIDERS[pid].meta.name, **credit(pid),
|
||||
"fetched_at": cat.fetched_at, "error": cat.error,
|
||||
"total_in_bbox": len(hits), "truncated": len(hits) > room})
|
||||
return {"cameras": cams, "providers": providers,
|
||||
"serving_count": sum(1 for pid in CATALOGS if effective(PROVIDERS[pid], conf.get(pid))[0])}
|
||||
@@ -9,6 +9,25 @@ makes no 511 calls at all.
|
||||
A failed refresh keeps serving the last good data and reports the error and
|
||||
its age to the caller -- an empty layer must never be the only symptom of a
|
||||
dead feed (the AI-silent-failures lesson).
|
||||
|
||||
**Feed status (server-26#198), 2026-10-04:** 511ny.org cut over to the CARS
|
||||
"511x" platform around 2026-09-24..30 and the legacy ``/api/getcameras`` and
|
||||
``/api/getevents`` endpoints now answer HTTP 200 with the SPA's HTML. The new
|
||||
developer feed is granted only after the NYSDOT Developer Access Agreement
|
||||
request is approved ("If approved for use, you will receive instructions for
|
||||
accessing the data feeds & documentation" -- 511NY "For Developers" page), so
|
||||
its URL shape is NOT public. This client therefore keeps the LEGACY request and
|
||||
record shape behind ``settings.ny511_api_base`` (default: the legacy base) and
|
||||
``settings.ny511_api_key``. UNVERIFIED until the grant arrives:
|
||||
* the new base URL and whether it still takes ``?key=&format=json``;
|
||||
* whether cameras still come as JSON (the public feed list says
|
||||
"Camera inventory (XML)") and keep the legacy field names;
|
||||
* the still/HLS URL shape and its CORS headers.
|
||||
Never point this at the new site's own backend (api-511x-nysdot.carsprogram.org):
|
||||
the 511NY Terms of Use ban robots and reverse engineering outside the DAA.
|
||||
|
||||
Access is also gated by the camera-provider registry (``ny511`` provider,
|
||||
default OFF, DAA acknowledgement required) -- see app/internal/cameras/.
|
||||
"""
|
||||
import asyncio
|
||||
import time
|
||||
@@ -20,11 +39,14 @@ import httpx
|
||||
from app.config import settings
|
||||
from app.internal.logger import logger
|
||||
|
||||
_BASE = "https://511ny.org/api"
|
||||
LEGACY_BASE = "https://511ny.org/api"
|
||||
CAMERAS_TTL_S = 60 * 60 # camera list is near-static
|
||||
EVENTS_TTL_S = 2 * 60 # accidents/closures change minute to minute
|
||||
RETRY_AFTER_FAILURE_S = 60
|
||||
_DESCRIPTION_MAX = 500
|
||||
# The DAA forbids altering "the substance of a report", so descriptions are
|
||||
# shown as published. This cap only guards against a pathological record; no
|
||||
# real 511NY description comes near it, and a cut one is marked with an ellipsis.
|
||||
_DESCRIPTION_MAX = 4000
|
||||
|
||||
|
||||
class _Feed:
|
||||
@@ -61,9 +83,22 @@ async def _fetch(path: str, normalize) -> List[Dict[str, Any]]:
|
||||
if settings.ny511_api_key:
|
||||
params["key"] = settings.ny511_api_key
|
||||
async with httpx.AsyncClient(timeout=20.0) as client:
|
||||
r = await client.get(f"{_BASE}/{path}", params=params)
|
||||
base = (settings.ny511_api_base or LEGACY_BASE).rstrip("/")
|
||||
r = await client.get(f"{base}/{path}", params=params)
|
||||
r.raise_for_status()
|
||||
raw = r.json()
|
||||
text = getattr(r, "text", None)
|
||||
if isinstance(text, str) and text.lstrip()[:1] == "<":
|
||||
# The 511x camera inventory is published as XML; HTML is the dead
|
||||
# legacy endpoint serving the SPA shell.
|
||||
raw = parse_inventory_xml(text)
|
||||
else:
|
||||
try:
|
||||
raw = r.json()
|
||||
except ValueError as e:
|
||||
raise ValueError(
|
||||
"511NY answered neither JSON nor XML (the legacy API has served the 511x "
|
||||
"site's HTML since the cutover, server-26#198)"
|
||||
) from e
|
||||
if not isinstance(raw, list):
|
||||
raise ValueError(f"expected a JSON list, got {type(raw).__name__}")
|
||||
out = [n for n in (normalize(x) for x in raw) if n is not None]
|
||||
@@ -73,6 +108,69 @@ async def _fetch(path: str, normalize) -> List[Dict[str, Any]]:
|
||||
return out
|
||||
|
||||
|
||||
# ── XML camera inventory (511x) -- UNVERIFIED shape ──────────────────────────
|
||||
# The 511NY "For Developers" page lists the camera feed as "Camera inventory
|
||||
# (XML)" but publishes no schema (it arrives with the DAA grant). This parser is
|
||||
# deliberately tolerant: any element carrying latitude + longitude children (or
|
||||
# attributes) is a record, and child names are matched case-insensitively onto
|
||||
# the legacy JSON field names so normalize_camera() works unchanged. Replace the
|
||||
# alias table with the real element names once the grant's documentation is in hand.
|
||||
_XML_ALIASES = {
|
||||
"ID": ("id", "cameraid", "camera_id", "deviceid", "device_id"),
|
||||
"Latitude": ("latitude", "lat"),
|
||||
"Longitude": ("longitude", "lon", "lng", "long"),
|
||||
"Name": ("name", "cameraname", "location", "description", "title"),
|
||||
"RoadwayName": ("roadwayname", "roadway", "road", "route"),
|
||||
"DirectionOfTravel": ("directionoftravel", "direction"),
|
||||
"Url": ("url", "imageurl", "image_url", "snapshoturl", "image", "stillurl"),
|
||||
"VideoUrl": ("videourl", "video_url", "streamurl", "video", "hlsurl"),
|
||||
"Disabled": ("disabled",),
|
||||
"Blocked": ("blocked",),
|
||||
}
|
||||
_XML_LOOKUP = {alias: key for key, aliases in _XML_ALIASES.items() for alias in aliases}
|
||||
_XML_MAX_BYTES = 32 * 1024 * 1024
|
||||
|
||||
|
||||
def _local(tag: str) -> str:
|
||||
return tag.rsplit("}", 1)[-1].lower()
|
||||
|
||||
|
||||
def _xml_bool(v: Any) -> Any:
|
||||
if isinstance(v, str) and v.strip().lower() in ("true", "false", "1", "0"):
|
||||
return v.strip().lower() in ("true", "1")
|
||||
return v
|
||||
|
||||
|
||||
def parse_inventory_xml(text: str) -> List[Dict[str, Any]]:
|
||||
"""Map an XML camera inventory onto legacy-shaped dicts. Raises on HTML or
|
||||
on any DTD/entity declaration (stdlib expat would expand entities)."""
|
||||
head = text.lstrip()[:512].lower()
|
||||
if head.startswith("<!doctype html") or head.startswith("<html"):
|
||||
raise ValueError("511NY answered HTML, not a feed (legacy API dead since the 511x cutover, server-26#198)")
|
||||
if len(text) > _XML_MAX_BYTES:
|
||||
raise ValueError("511NY XML inventory larger than the 32 MB safety cap")
|
||||
if "<!doctype" in text.lower() or "<!entity" in text.lower():
|
||||
raise ValueError("511NY XML carries a DTD/entity declaration -- refused")
|
||||
import xml.etree.ElementTree as ET
|
||||
root = ET.fromstring(text)
|
||||
out: List[Dict[str, Any]] = []
|
||||
for el in root.iter():
|
||||
fields: Dict[str, Any] = {}
|
||||
for k, v in el.attrib.items():
|
||||
key = _XML_LOOKUP.get(_local(k))
|
||||
if key:
|
||||
fields.setdefault(key, v)
|
||||
for child in el:
|
||||
key = _XML_LOOKUP.get(_local(child.tag))
|
||||
if key and len(child) == 0 and child.text is not None:
|
||||
fields.setdefault(key, child.text.strip())
|
||||
if "Latitude" in fields and "Longitude" in fields:
|
||||
fields["Disabled"] = _xml_bool(fields.get("Disabled", False))
|
||||
fields["Blocked"] = _xml_bool(fields.get("Blocked", False))
|
||||
out.append(fields)
|
||||
return out
|
||||
|
||||
|
||||
def _coords(x: Dict[str, Any]) -> Optional[tuple]:
|
||||
try:
|
||||
lat, lon = float(x["Latitude"]), float(x["Longitude"])
|
||||
|
||||
@@ -17,7 +17,7 @@ from app.internal.auth import (
|
||||
require_node_service_or_firebase_token,
|
||||
)
|
||||
from app.routers import nodes, systems, calls, upload, tokens, incidents, alerts, admin, trips, places, links, users
|
||||
from app.routers import enrollment, media, org, waitlist, telemetry, replay, traffic
|
||||
from app.routers import enrollment, media, org, waitlist, telemetry, replay, traffic, cameras
|
||||
from app.internal import dynsec
|
||||
from app.internal import firestore as fstore
|
||||
|
||||
@@ -128,6 +128,8 @@ app.include_router(alerts.router, dependencies=[Depends(require_service_or_fi
|
||||
app.include_router(trips.router, dependencies=[Depends(require_service_or_firebase_token)])
|
||||
app.include_router(places.router, dependencies=[Depends(require_service_or_firebase_token)])
|
||||
app.include_router(traffic.router, dependencies=[Depends(require_service_or_firebase_token)])
|
||||
app.include_router(cameras.router, dependencies=[Depends(require_service_or_firebase_token)])
|
||||
app.include_router(cameras.admin_router) # auth: admin only, per endpoint (needs the principal for audit)
|
||||
app.include_router(upload.router) # auth is per-node, handled inline
|
||||
app.include_router(admin.router) # auth is per-endpoint (read: firebase, write: admin)
|
||||
app.include_router(replay.router) # auth: admin only (every route spends or reads a replay run)
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
"""Public-camera endpoints for the live ops wall.
|
||||
|
||||
``GET /cameras`` -- any signed-in user (auth applied at include time in main.py):
|
||||
cameras inside a bbox from every provider an admin has enabled, each with the
|
||||
provider's required attribution, disclaimer and catalog freshness.
|
||||
|
||||
``/admin/camera-providers`` -- platform admin only: list every catalogued
|
||||
provider with its licence status and health, and toggle it. Gated licences
|
||||
need ``acknowledge_licence: true``; that acknowledgement is stored with who and
|
||||
when and written to audit_log (see app/internal/cameras/registry.py).
|
||||
"""
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from fastapi.responses import JSONResponse
|
||||
from pydantic import BaseModel
|
||||
|
||||
from app.internal.auth import describe_actor, require_admin_token
|
||||
from app.internal.cameras import registry
|
||||
|
||||
router = APIRouter(prefix="/cameras", tags=["cameras"])
|
||||
admin_router = APIRouter(prefix="/admin/camera-providers", tags=["admin"])
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def get_cameras(
|
||||
south: float = Query(..., ge=-90, le=90),
|
||||
west: float = Query(..., ge=-180, le=180),
|
||||
north: float = Query(..., ge=-90, le=90),
|
||||
east: float = Query(..., ge=-180, le=180),
|
||||
):
|
||||
if south > north or west > east:
|
||||
raise HTTPException(400, "bbox must satisfy south<=north and west<=east")
|
||||
return await registry.cameras_in_bbox((south, west, north, east))
|
||||
|
||||
|
||||
class ProviderToggle(BaseModel):
|
||||
enabled: bool
|
||||
acknowledge_licence: bool = False
|
||||
|
||||
|
||||
@admin_router.get("")
|
||||
async def list_camera_providers(_=Depends(require_admin_token)):
|
||||
return {"providers": await registry.list_providers()}
|
||||
|
||||
|
||||
@admin_router.put("/{provider_id}")
|
||||
async def set_camera_provider(provider_id: str, body: ProviderToggle, principal: dict = Depends(require_admin_token)):
|
||||
try:
|
||||
return await registry.set_enabled(provider_id, body.enabled, describe_actor(principal),
|
||||
acknowledge_licence=body.acknowledge_licence)
|
||||
except registry.ProviderError as e:
|
||||
return JSONResponse(status_code=e.code, content={"detail": e.message, **e.extra})
|
||||
@@ -4,6 +4,7 @@ from typing import Optional
|
||||
from fastapi import APIRouter, HTTPException, Query
|
||||
|
||||
from app.internal import ny511
|
||||
from app.internal.cameras import registry
|
||||
|
||||
router = APIRouter(prefix="/traffic", tags=["traffic"])
|
||||
|
||||
@@ -27,6 +28,13 @@ async def get_511(
|
||||
if south > north or west > east:
|
||||
raise HTTPException(400, "bbox must satisfy south<=north and west<=east")
|
||||
wanted = {s.strip() for s in (layers or "").split(",") if s.strip()}
|
||||
# 511NY data (events included) is covered by the same NYSDOT DAA as its
|
||||
# cameras, so the whole feed follows the ny511 camera provider's switch,
|
||||
# which defaults OFF and needs a licence acknowledgement (server-26#198).
|
||||
if not await registry.is_serving("ny511"):
|
||||
off = {"fetched_at": None, "error": None, "total_in_bbox": 0, "truncated": False, "disabled": True}
|
||||
return {**{n: [] for n in ("cameras", "events") if n in wanted},
|
||||
**{f"{n}_status": off for n in ("cameras", "events") if n in wanted}}
|
||||
feeds = {name: getattr(ny511, name) for name in ("cameras", "events") if name in wanted}
|
||||
await asyncio.gather(*(f.get() for f in feeds.values()))
|
||||
|
||||
@@ -35,4 +43,5 @@ async def get_511(
|
||||
hits = ny511.in_bbox(feed.items, south, west, north, east)
|
||||
out[name] = hits[:MAX_ITEMS]
|
||||
out[f"{name}_status"] = {**_feed_status(feed), "total_in_bbox": len(hits), "truncated": len(hits) > MAX_ITEMS}
|
||||
out["credit"] = registry.credit("ny511") # DAA: source credit + as-is disclaimer travel with the data
|
||||
return out
|
||||
|
||||
Reference in New Issue
Block a user