FIRMS —
@@ -1960,6 +2032,8 @@ let lastVesselSubBox = ''; // last viewport box sent to the AIS stream
let chokepointCatalog = []; // GET /api/map/chokepoints, fetched once
let vesselSrcPref = ''; // 'vesselapi' only on Hormuz preset — no extra polls
let vesselRefollowTimer = null; // one follow-up fetch after a retune
+let lastCams = [], lastFires = [], lastAircraft = [], lastVessels = [], lastAlerts = [];
+let placeMarker = null, placeReq = 0, placeLongPress = null;
function bboxCell() {
if (!map) return '';
return currentBBox().split(',').map(n => Number(n).toFixed(2)).join(',') + '@' + map.getZoom();
@@ -2183,6 +2257,17 @@ async function initMap() {
map.on('popupclose', () => { camPopupOpen = false; });
map.on('zoomstart', () => { if (camPopupOpen) map.closePopup(); });
map.on('dragstart', () => { if (camPopupOpen) map.closePopup(); });
+ map.on('contextmenu', (e) => {
+ if (e.originalEvent) e.originalEvent.preventDefault();
+ if (typeof gfDrawOn !== 'undefined' && gfDrawOn) return;
+ openPlaceDossier(e.latlng);
+ });
+ bindPlaceLongPress(map);
+ const pdClose = document.getElementById('pd-close');
+ if (pdClose) pdClose.addEventListener('click', closePlaceDossier);
+ document.addEventListener('keydown', (ev) => {
+ if (ev.key === 'Escape') closePlaceDossier();
+ });
map.on('moveend', () => {
if (camPopupOpen) return; // only the popup's own autopan now
if (moveDebounce) clearTimeout(moveDebounce);
@@ -2529,7 +2614,7 @@ function sinceToISO(sel) {
async function toggleFires() {
firesOn = document.getElementById('lp-fires-on').checked;
if (firesOn) await loadFires();
- else if (firesHeat) { map.removeLayer(firesHeat); firesHeat = null; }
+ else if (firesHeat) { map.removeLayer(firesHeat); firesHeat = null; lastFires = []; }
hudFiresCount = null;
syncHud();
}
@@ -2559,6 +2644,7 @@ async function loadFires() {
if (req !== fireReq) return; // superseded by a newer pan/zoom
if (firesHeat) map.removeLayer(firesHeat);
const pts = fires.map(f => [f.lat ?? f.latitude, f.lon ?? f.longitude, firesIntensity(f)]);
+ lastFires = Array.isArray(fires) ? fires : [];
firesHeat = L.heatLayer(pts, {
radius: 22, blur: 20, maxZoom: 9, max: 1.0, minOpacity: 0.2,
gradient: firesGradient(),
@@ -2581,7 +2667,7 @@ async function loadFires() {
async function toggleCams() {
camsOn = document.getElementById('lp-cams-on').checked;
if (camsOn) await loadCams();
- else if (camsGroup) { map.removeLayer(camsGroup); camsGroup = null; }
+ else if (camsGroup) { map.removeLayer(camsGroup); camsGroup = null; lastCams = []; }
hudCamsCount = null;
syncHud();
}
@@ -2653,6 +2739,7 @@ async function loadCams() {
if (!map) return;
if (tooZoomedOut()) {
camsGroup = dropLayer(camsGroup);
+ lastCams = [];
markZoom('lp-cams-count');
hudCamsCount = null;
syncHud();
@@ -2663,6 +2750,7 @@ async function loadCams() {
const r = await overlayFetch(`${API}/api/cameras?bbox=${currentBBox()}&limit=2000`);
const cams = await r.json();
if (req !== camReq) return; // superseded by a newer pan/zoom
+ lastCams = Array.isArray(cams) ? cams : [];
if (camsGroup) map.removeLayer(camsGroup);
// Clustered markers: camera coverage stays visible as numbered
// clusters at every zoom instead of vanishing into a sparse/empty
@@ -3252,12 +3340,13 @@ function loadThermal() {
async function toggleWxAlerts() {
wxAlertsOn = document.getElementById('lp-alerts-on').checked;
if (wxAlertsOn) await loadWxAlerts();
- else wxAlertsGroup = dropLayer(wxAlertsGroup);
+ else { wxAlertsGroup = dropLayer(wxAlertsGroup); lastAlerts = []; }
}
async function loadWxAlerts() {
if (!map) return;
if (tooZoomedOut()) {
wxAlertsGroup = dropLayer(wxAlertsGroup);
+ lastAlerts = [];
markZoom('lp-alerts-count');
return;
}
@@ -3268,6 +3357,7 @@ async function loadWxAlerts() {
if (req !== overlayReq.alerts) return;
wxAlertsGroup = dropLayer(wxAlertsGroup);
const feats = fc.features || [];
+ lastAlerts = feats;
wxAlertsGroup = L.geoJSON(fc, {
renderer: L.canvas({ padding: 0.5 }),
style: (f) => ({
@@ -3356,7 +3446,7 @@ async function loadIncidents() {
async function toggleAircraft() {
acOn = document.getElementById('lp-ac-on').checked;
if (acOn) await loadAircraft();
- else acGroup = dropLayer(acGroup);
+ else { acGroup = dropLayer(acGroup); lastAircraft = []; }
}
function toggleAircraftMil() {
acMilOn = document.getElementById('lp-ac-mil-on').checked;
@@ -3376,6 +3466,7 @@ async function loadAircraft() {
const all = Array.isArray(pts) ? pts : [];
noteMilSupport(all);
const shown = acMilOn ? all.filter(acVisible) : all;
+ lastAircraft = shown;
acGroup = renderPoints(acGroup, shown, p => acColor(p), true, 'ac');
document.getElementById('lp-ac-count').textContent = shown.length.toLocaleString();
const milEl = document.getElementById('lp-ac-mil-count');
@@ -3420,6 +3511,7 @@ async function toggleVessels() {
await loadVessels();
} else {
vesselsGroup = dropLayer(vesselsGroup);
+ lastVessels = [];
clearTimeout(vesselRefollowTimer);
}
}
@@ -3454,7 +3546,8 @@ async function loadVessels() {
const r = await overlayFetch(`${API}/api/vessels?bbox=${bb}${srcQs}${dvrQs()}`);
const pts = await r.json();
if (req !== overlayReq.vessels) return;
- vesselsGroup = renderPoints(vesselsGroup, Array.isArray(pts) ? pts : [], p => {
+ lastVessels = Array.isArray(pts) ? pts : [];
+ vesselsGroup = renderPoints(vesselsGroup, lastVessels, p => {
const extra = p.extra || {};
if (extra.role === 'military') return '#f472b6';
if (extra.role === 'government') return '#facc15';
@@ -3496,6 +3589,163 @@ async function loadStorms() {
}
}
+/* ── Place dossier (“What’s here?”) — Nominatim + already-loaded overlays ── */
+const PLACE_PAD_KM = 5;
+function haversineKm(aLat, aLon, bLat, bLon) {
+ const toRad = (d) => d * Math.PI / 180;
+ const dLat = toRad(bLat - aLat), dLon = toRad(bLon - aLon);
+ const a = Math.sin(dLat / 2) ** 2
+ + Math.cos(toRad(aLat)) * Math.cos(toRad(bLat)) * Math.sin(dLon / 2) ** 2;
+ return 2 * 6371 * Math.asin(Math.min(1, Math.sqrt(a)));
+}
+function placePt(p) {
+ const lat = p.lat ?? p.latitude;
+ const lon = p.lon ?? p.longitude;
+ if (lat == null || lon == null) return null;
+ return { lat: Number(lat), lon: Number(lon) };
+}
+function nearbyFromPoints(rows, origin, kind, labelFn) {
+ const out = [];
+ (rows || []).forEach((p) => {
+ const pt = placePt(p);
+ if (!pt) return;
+ const km = haversineKm(origin.lat, origin.lng, pt.lat, pt.lon);
+ if (km <= PLACE_PAD_KM) out.push({ kind, km, label: labelFn(p), lat: pt.lat, lon: pt.lon });
+ });
+ return out;
+}
+function alertCentroid(f) {
+ const g = f && f.geometry;
+ if (!g) return null;
+ let c = g.coordinates;
+ if (g.type === 'Point' && Array.isArray(c)) return { lat: c[1], lon: c[0] };
+ while (Array.isArray(c) && Array.isArray(c[0])) c = c[0];
+ if (Array.isArray(c) && typeof c[0] === 'number') return { lat: c[1], lon: c[0] };
+ return null;
+}
+function nearbyFromAlerts(feats, origin) {
+ const out = [];
+ (feats || []).forEach((f) => {
+ const p = f.properties || {};
+ const label = p.event || p.headline || 'Alert';
+ const pt = alertCentroid(f);
+ if (!pt) return;
+ const km = haversineKm(origin.lat, origin.lng, pt.lat, pt.lon);
+ if (km <= PLACE_PAD_KM) out.push({ kind: 'alert', km, label, lat: pt.lat, lon: pt.lon });
+ });
+ return out;
+}
+function collectNearby(origin) {
+ const items = [
+ ...nearbyFromPoints(lastCams, origin, 'camera', (p) => p.location_name || 'Camera'),
+ ...nearbyFromPoints(lastAircraft, origin, 'aircraft', (p) => p.label || (p.extra || {}).hex || 'Aircraft'),
+ ...nearbyFromPoints(lastVessels, origin, 'vessel', (p) => p.label || 'Vessel'),
+ ...nearbyFromPoints(lastFires, origin, 'fire', () => 'FIRMS hotspot'),
+ ...nearbyFromAlerts(lastAlerts, origin),
+ ];
+ items.sort((a, b) => a.km - b.km);
+ return items;
+}
+function renderNearby(origin) {
+ const box = document.getElementById('pd-nearby');
+ if (!box) return;
+ const items = collectNearby(origin);
+ if (!items.length) {
+ box.innerHTML = '
No loaded cameras, aircraft, vessels, fires, or alerts within 5 km.
';
+ return;
+ }
+ const shown = items.slice(0, 24);
+ const more = items.length - shown.length;
+ box.innerHTML = shown.map((it) => {
+ const km = it.km < 1 ? `${Math.round(it.km * 1000)} m` : `${it.km.toFixed(1)} km`;
+ return `
`;
+ }).join('') + (more > 0 ? `
+ ${more} more
` : '');
+ box.querySelectorAll('.pd-item').forEach((btn) => {
+ btn.addEventListener('click', () => {
+ const lat = Number(btn.dataset.lat), lon = Number(btn.dataset.lon);
+ if (!map || Number.isNaN(lat) || Number.isNaN(lon)) return;
+ map.setView([lat, lon], Math.max(map.getZoom(), 10));
+ });
+ });
+}
+function closePlaceDossier() {
+ const panel = document.getElementById('place-dossier');
+ if (panel) {
+ panel.classList.remove('open');
+ panel.setAttribute('aria-hidden', 'true');
+ }
+ if (placeMarker && map) { map.removeLayer(placeMarker); placeMarker = null; }
+}
+function bindPlaceLongPress(m) {
+ const el = m.getContainer();
+ const clear = () => {
+ if (placeLongPress) { clearTimeout(placeLongPress.timer); placeLongPress = null; }
+ };
+ el.addEventListener('touchstart', (ev) => {
+ if (ev.touches.length !== 1) { clear(); return; }
+ const t = ev.touches[0];
+ placeLongPress = {
+ x: t.clientX, y: t.clientY,
+ timer: setTimeout(() => {
+ const start = placeLongPress;
+ placeLongPress = null;
+ if (!start || gfDrawOn) return;
+ const latlng = m.mouseEventToLatLng({ clientX: start.x, clientY: start.y });
+ openPlaceDossier(latlng);
+ }, 550),
+ };
+ }, { passive: true });
+ el.addEventListener('touchmove', (ev) => {
+ if (!placeLongPress) return;
+ const t = ev.touches[0];
+ if (Math.hypot(t.clientX - placeLongPress.x, t.clientY - placeLongPress.y) > 14) clear();
+ }, { passive: true });
+ el.addEventListener('touchend', clear);
+ el.addEventListener('touchcancel', clear);
+ el.addEventListener('contextmenu', (ev) => ev.preventDefault());
+}
+async function openPlaceDossier(latlng) {
+ if (!latlng || !map) return;
+ const panel = document.getElementById('place-dossier');
+ const status = document.getElementById('pd-status');
+ const coords = document.getElementById('pd-coords');
+ const nameEl = document.getElementById('pd-name');
+ const addrEl = document.getElementById('pd-addr');
+ if (!panel) return;
+ panel.classList.add('open');
+ panel.setAttribute('aria-hidden', 'false');
+ const lat = latlng.lat, lon = latlng.lng;
+ if (coords) coords.textContent = `${lat.toFixed(5)}, ${lon.toFixed(5)}`;
+ if (nameEl) nameEl.textContent = '';
+ if (addrEl) addrEl.textContent = '';
+ if (status) { status.classList.remove('err'); status.textContent = 'Looking up place…'; }
+ if (placeMarker) map.removeLayer(placeMarker);
+ placeMarker = L.circleMarker([lat, lon], {
+ radius: 7, color: '#35e0ff', weight: 2, fillColor: '#35e0ff', fillOpacity: 0.25,
+ pane: 'markerPane',
+ }).addTo(map);
+ renderNearby(latlng);
+ const req = ++placeReq;
+ try {
+ const r = await fetch(`${API}/api/place?lat=${encodeURIComponent(lat)}&lon=${encodeURIComponent(lon)}`);
+ if (req !== placeReq) return;
+ if (!r.ok) throw new Error(`place ${r.status}`);
+ const d = await r.json();
+ if (req !== placeReq) return;
+ if (nameEl) nameEl.textContent = d.name || d.display_name || 'Unknown place';
+ if (addrEl) addrEl.textContent = d.display_name && d.name && d.display_name !== d.name
+ ? d.display_name : '';
+ if (status) status.textContent = d.display_name ? 'Nominatim · OSM' : 'No reverse geocode for this point';
+ const closeBtn = document.getElementById('pd-close');
+ if (closeBtn) closeBtn.focus();
+ } catch (e) {
+ if (req !== placeReq) return;
+ if (status) { status.classList.add('err'); status.textContent = 'Place lookup failed — nearby list is still from loaded overlays.'; }
+ }
+}
+
function conflictSeverityColor(sev) {
const s = String(sev || '').toLowerCase();
if (s === 'war') return '#ff2a6d';
diff --git a/docker-compose.yml b/docker-compose.yml
index 76d0431..01abd37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -138,6 +138,8 @@ services:
FIRMS_DATASETS: ${FIRMS_DATASETS:-VIIRS_NOAA20_NRT,VIIRS_NOAA21_NRT}
FIRMS_BBOX: ${FIRMS_BBOX:--180,-60,180,75}
OSINT_USER_AGENT: ${OSINT_USER_AGENT:-osint-dashboard/1.0 (self-hosted; lancewalters94@gmail.com)}
+ NOMINATIM_URL: ${NOMINATIM_URL:-https://nominatim.openstreetmap.org}
+ NOMINATIM_MIN_INTERVAL: ${NOMINATIM_MIN_INTERVAL:-1.0}
AISSTREAM_API_KEY: ${AISSTREAM_API_KEY:-}
AISSTREAM_BBOX: ${AISSTREAM_BBOX:-24,-125,50,-66}
AISSTREAM_IN_APP: ${AISSTREAM_IN_APP:-1}
diff --git a/tests/test_api_place.py b/tests/test_api_place.py
new file mode 100644
index 0000000..52e15ad
--- /dev/null
+++ b/tests/test_api_place.py
@@ -0,0 +1,127 @@
+"""GET /api/place — Nominatim reverse proxy (60s cache, 500 keys, 1 req/s)."""
+
+from __future__ import annotations
+
+import asyncio
+
+import httpx
+import pytest
+
+from main import app
+from place import cache_key, place_cache, slim_place
+
+BASE = "http://test"
+
+SAMPLE = {
+ "display_name": "Raleigh, Wake County, North Carolina, United States",
+ "name": "Raleigh",
+ "osm_type": "relation",
+ "osm_id": 123,
+ "address": {
+ "city": "Raleigh",
+ "state": "North Carolina",
+ "country": "United States",
+ "country_code": "us",
+ "tourism": "ignore-me",
+ },
+}
+
+
+class _FakeResp:
+ def __init__(self, payload, status=200):
+ self._payload = payload
+ self.status_code = status
+
+ def raise_for_status(self):
+ if self.status_code >= 400:
+ req = httpx.Request("GET", "https://nominatim.openstreetmap.org/reverse")
+ raise httpx.HTTPStatusError(
+ "upstream", request=req,
+ response=httpx.Response(self.status_code, request=req),
+ )
+
+ def json(self):
+ return self._payload
+
+
+class _FakeNominatim:
+ calls: list[dict] = []
+
+ def __init__(self, *args, **kwargs):
+ pass
+
+ async def __aenter__(self):
+ return self
+
+ async def __aexit__(self, *args):
+ return False
+
+ async def get(self, url, params=None, headers=None):
+ _FakeNominatim.calls.append({"url": url, "params": params, "headers": headers})
+ return _FakeResp(SAMPLE)
+
+
+def _nominatim_client(**kwargs):
+ return _FakeNominatim()
+
+
+async def _get(path: str) -> httpx.Response:
+ transport = httpx.ASGITransport(app=app)
+ async with httpx.AsyncClient(transport=transport, base_url=BASE) as client:
+ return await client.get(path)
+
+
+@pytest.fixture(autouse=True)
+def _reset_place(monkeypatch):
+ place_cache.clear()
+ _FakeNominatim.calls = []
+ monkeypatch.setattr("place._http_client", _nominatim_client)
+ monkeypatch.setattr("place.NOMINATIM_MIN_INTERVAL", 0.0)
+ monkeypatch.setattr("place._last_req", 0.0)
+ yield
+ place_cache.clear()
+
+
+def test_slim_place_keeps_address_subset():
+ body = slim_place(35.78, -78.64, SAMPLE)
+ assert body["display_name"].startswith("Raleigh")
+ assert body["name"] == "Raleigh"
+ assert body["address"]["city"] == "Raleigh"
+ assert "tourism" not in body["address"]
+ assert body["attribution"].startswith("© OpenStreetMap")
+
+
+def test_cache_key_quantizes_to_4_decimals():
+ assert cache_key(35.77961, -78.63821) == cache_key(35.77964, -78.63819)
+
+
+def test_place_requires_lat_lon():
+ resp = asyncio.run(_get("/api/place"))
+ assert resp.status_code == 422
+
+
+def test_place_rejects_out_of_range():
+ assert asyncio.run(_get("/api/place?lat=99&lon=0")).status_code == 422
+ assert asyncio.run(_get("/api/place?lat=0&lon=200")).status_code == 422
+
+
+def test_place_reverse_and_cache():
+ r1 = asyncio.run(_get("/api/place?lat=35.7796&lon=-78.6382"))
+ assert r1.status_code == 200
+ body = r1.json()
+ assert body["display_name"].startswith("Raleigh")
+ assert body["lat"] == pytest.approx(35.7796, abs=0.001)
+ assert "max-age=60" in (r1.headers.get("cache-control") or "").lower()
+ assert len(_FakeNominatim.calls) == 1
+ ua = _FakeNominatim.calls[0]["headers"]["User-Agent"]
+ assert "osint-dashboard" in ua.lower() or "@" in ua
+ r2 = asyncio.run(_get("/api/place?lat=35.77961&lon=-78.63821"))
+ assert r2.status_code == 200
+ assert len(_FakeNominatim.calls) == 1 # cache hit, same 4-decimal key
+
+
+def test_place_cache_cap_500():
+ from cachetools import TTLCache
+ assert isinstance(place_cache, TTLCache)
+ assert place_cache.maxsize == 500
+ assert place_cache.ttl == 60
diff --git a/tests/test_place_dossier_frontend.py b/tests/test_place_dossier_frontend.py
new file mode 100644
index 0000000..6fc1fd8
--- /dev/null
+++ b/tests/test_place_dossier_frontend.py
@@ -0,0 +1,59 @@
+"""Right-click place dossier HUD contract."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parent.parent
+HTML = (ROOT / "app/static/index.html").read_text()
+
+
+def test_place_dossier_panel_markup():
+ assert 'id="place-dossier"' in HTML
+ assert "What’s here?" in HTML or "What's here?" in HTML
+ assert 'id="pd-nearby"' in HTML
+ assert 'id="pd-close"' in HTML
+ assert 'role="dialog"' in HTML
+
+
+def test_place_dossier_uses_backend_nominatim_proxy():
+ js = HTML.split("async function openPlaceDossier", 1)[1].split(
+ "/* ═══════════════ INITIAL LOAD", 1
+ )[0]
+ assert "/api/place?lat=" in js
+ assert "nominatim.openstreetmap.org" not in js
+ assert "/api/aircraft" not in js
+ assert "/api/vessels" not in js
+ assert "/api/cameras" not in js
+ assert "/api/fires" not in js
+ assert "/api/weather-alerts" not in js
+ assert "/api/infrastructure" not in js
+
+
+def test_place_dossier_scans_loaded_overlays_5km():
+ assert "const PLACE_PAD_KM = 5" in HTML
+ assert "function collectNearby" in HTML
+ assert "lastCams" in HTML
+ assert "lastAircraft" in HTML
+ assert "lastVessels" in HTML
+ assert "lastFires" in HTML
+ assert "lastAlerts" in HTML
+ assert "function haversineKm" in HTML
+
+
+def test_place_dossier_right_click_and_long_press():
+ assert "map.on('contextmenu'" in HTML
+ assert "function bindPlaceLongPress" in HTML
+ assert "function closePlaceDossier" in HTML
+ assert "Escape" in HTML.split("function initMap", 1)[1][:8000] or "Escape" in HTML.split(
+ "bindPlaceLongPress(map)", 1
+ )[0][-500:]
+
+
+def test_place_dossier_mobile_is_bottom_sheet():
+ mobile = HTML.split("@media (max-width: 820px)")[1].split(
+ "@media (prefers-reduced-motion"
+ )[0]
+ assert "#place-dossier" in mobile
+ assert "bottom: 56px" in mobile
+ assert "max-height: 36vh" in mobile