feat: ADS-B historical playback map (closes #208)

- New GET /adsb/history/playback endpoint returns time-bucketed snapshots
  (one position per aircraft per N-second bucket) via a SQL window function
- Playback tab added to adsb_history.html: Leaflet map with animated
  aircraft markers, play/pause, 1x–20x speed, scrubber, and time display
- Configurable window (15 min – 24 h) and bucket step (10 s – 5 min)
- Requires the history Docker profile or INTERCEPT_ADSB_HISTORY_ENABLED=true
- Bump version to 2.32.0

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
James Smith
2026-07-07 13:04:23 +01:00
parent 1faa390ea7
commit 456404a266
6 changed files with 504 additions and 2 deletions
+7
View File
@@ -2,6 +2,13 @@
All notable changes to iNTERCEPT will be documented in this file. All notable changes to iNTERCEPT will be documented in this file.
## [2.32.0] - 2026-07-07
### Added
- **ADS-B historical playback** — new Playback tab on the ADS-B history page. Loads time-bucketed snapshots from the Postgres history database and animates aircraft positions on a Leaflet map. Controls: configurable time window (15 min 24 h), bucket step (10 s 5 min), play/pause, speed multiplier (1×–20×), and a time scrubber. Requires the `history` Docker profile or `INTERCEPT_ADSB_HISTORY_ENABLED=true`. Backed by new `GET /adsb/history/playback` endpoint.
---
## [2.31.0] - 2026-07-07 ## [2.31.0] - 2026-07-07
### Added ### Added
+8 -1
View File
@@ -7,10 +7,17 @@ import os
import sys import sys
# Application version # Application version
VERSION = "2.31.0" VERSION = "2.32.0"
# Changelog - latest release notes (shown on welcome screen) # Changelog - latest release notes (shown on welcome screen)
CHANGELOG = [ CHANGELOG = [
{
"version": "2.32.0",
"date": "July 2026",
"highlights": [
"Feat: ADS-B historical playback — replay past aircraft positions on an interactive map with play/pause, speed control, and time scrubber (requires history profile)",
],
},
{ {
"version": "2.31.0", "version": "2.31.0",
"date": "July 2026", "date": "July 2026",
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "intercept" name = "intercept"
version = "2.31.0" version = "2.32.0"
description = "Signal Intelligence Platform - Pager/433MHz/ADS-B/Satellite/WiFi/Bluetooth" description = "Signal Intelligence Platform - Pager/433MHz/ADS-B/Satellite/WiFi/Bluetooth"
readme = "README.md" readme = "README.md"
requires-python = ">=3.9" requires-python = ">=3.9"
+81
View File
@@ -1664,6 +1664,87 @@ def adsb_history_export():
return response return response
@adsb_bp.route("/history/playback")
def adsb_history_playback():
"""Return time-bucketed snapshots for map playback.
Query params:
since_minutes: window size in minutes (default 60, max 1440)
bucket_seconds: bucket width in seconds (default 30, min 10, max 300)
Returns one position per aircraft per bucket (latest within bucket),
structured as a list of {t, aircraft:[]} frames ready for animation.
"""
if not ADSB_HISTORY_ENABLED or not PSYCOPG2_AVAILABLE:
return api_error("ADS-B history is disabled", 503)
_ensure_history_schema()
since_minutes = _parse_int_param(request.args.get("since_minutes"), 60, 1, 1440)
bucket_seconds = _parse_int_param(request.args.get("bucket_seconds"), 30, 10, 300)
window = f"{since_minutes} minutes"
sql = """
WITH bucketed AS (
SELECT
(EXTRACT(EPOCH FROM captured_at)::bigint / %(bkt)s) * %(bkt)s AS bucket_epoch,
icao,
callsign,
lat,
lon,
altitude,
heading,
speed,
ROW_NUMBER() OVER (
PARTITION BY (EXTRACT(EPOCH FROM captured_at)::bigint / %(bkt)s), icao
ORDER BY captured_at DESC
) AS rn
FROM adsb_snapshots
WHERE captured_at >= NOW() - INTERVAL %(window)s
AND lat IS NOT NULL
AND lon IS NOT NULL
)
SELECT bucket_epoch, icao, callsign, lat, lon, altitude, heading, speed
FROM bucketed
WHERE rn = 1
ORDER BY bucket_epoch ASC, icao ASC
"""
try:
with _get_history_connection() as conn, conn.cursor(cursor_factory=RealDictCursor) as cur:
cur.execute(sql, {"bkt": bucket_seconds, "window": window})
rows = cur.fetchall()
# Group rows into frames keyed by bucket timestamp
frames: dict[int, list] = {}
for row in rows:
epoch = int(row["bucket_epoch"])
frames.setdefault(epoch, []).append(
{
"icao": row["icao"],
"callsign": row["callsign"] or "",
"lat": float(row["lat"]),
"lon": float(row["lon"]),
"alt": row["altitude"],
"hdg": row["heading"],
"spd": row["speed"],
}
)
buckets = [{"t": epoch, "aircraft": aircraft} for epoch, aircraft in sorted(frames.items())]
return jsonify(
{
"buckets": buckets,
"bucket_seconds": bucket_seconds,
"since_minutes": since_minutes,
"count": len(buckets),
}
)
except Exception as exc:
logger.warning("ADS-B history playback query failed: %s", exc)
return api_error("History database unavailable", 503)
@adsb_bp.route("/history/prune", methods=["POST"]) @adsb_bp.route("/history/prune", methods=["POST"])
def adsb_history_prune(): def adsb_history_prune():
"""Delete ADS-B history for a selected time range or entire dataset.""" """Delete ADS-B history for a selected time range or entire dataset."""
+135
View File
@@ -746,3 +746,138 @@ html[data-ui-tier="lean"] {
--border-glow: transparent; --border-glow: transparent;
--grid-line: transparent; --grid-line: transparent;
} }
/* ── View toggle ───────────────────────────────────────────────────────── */
.view-toggle {
display: flex;
gap: 2px;
border: 1px solid var(--border-color);
border-radius: 4px;
overflow: hidden;
}
.view-btn {
padding: 6px 14px;
background: transparent;
border: none;
color: var(--text-secondary);
font-size: 11px;
font-family: var(--font-mono);
letter-spacing: 0.05em;
cursor: pointer;
transition: background 0.15s, color 0.15s;
}
.view-btn.active,
.view-btn:hover {
background: var(--accent-cyan);
color: #000;
}
/* ── Playback section ──────────────────────────────────────────────────── */
.playback-section {
display: flex;
flex-direction: column;
gap: 0;
height: calc(100vh - 320px);
min-height: 420px;
border: 1px solid var(--border-color);
border-radius: 6px;
overflow: hidden;
margin: 0 var(--page-gutter, 16px);
}
.playback-map {
flex: 1;
min-height: 300px;
background: var(--bg-card);
}
.playback-controls {
padding: 10px 14px;
background: var(--bg-card);
border-top: 1px solid var(--border-color);
display: flex;
flex-direction: column;
gap: 8px;
}
.playback-ctrl-row {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 10px;
}
.playback-scrubber-row {
display: flex;
align-items: center;
gap: 10px;
}
.playback-scrubber-row input[type="range"] {
flex: 1;
accent-color: var(--accent-cyan);
cursor: pointer;
}
.playback-scrubber-row input[type="range"]:disabled {
opacity: 0.4;
cursor: not-allowed;
}
.playback-time {
font-family: var(--font-mono);
font-size: 10px;
color: var(--text-secondary);
white-space: nowrap;
min-width: 140px;
}
.playback-time:last-child { text-align: right; }
.playback-current-time {
font-family: var(--font-mono);
font-size: 13px;
color: var(--accent-cyan);
text-align: center;
letter-spacing: 0.05em;
}
.playback-counters {
display: flex;
flex-direction: column;
align-items: center;
min-width: 52px;
}
.playback-label {
font-size: 9px;
text-transform: uppercase;
letter-spacing: 0.1em;
color: var(--text-secondary);
}
.playback-value {
font-family: var(--font-mono);
font-size: 13px;
color: var(--text-primary);
}
/* Aircraft markers on playback map */
.pb-aircraft-icon {
background: none;
border: none;
}
.pb-tooltip {
font-family: var(--font-mono);
font-size: 11px;
color: #fff;
white-space: nowrap;
}
.status-pill.loading { background: var(--accent-yellow, #f0a500); color: #000; }
.status-pill.active { background: var(--accent-cyan); color: #000; }
.status-pill.warn { background: var(--accent-orange, #e06c00); color: #fff; }
.status-pill.error { background: var(--accent-red, #c0392b); color: #fff; }
+272
View File
@@ -16,6 +16,9 @@
<link rel="stylesheet" href="{{ url_for('static', filename='css/settings.css') }}?v={{ version }}&r=maptheme17"> <link rel="stylesheet" href="{{ url_for('static', filename='css/settings.css') }}?v={{ version }}&r=maptheme17">
<link rel="stylesheet" href="{{ url_for('static', filename='css/help-modal.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='css/help-modal.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/adsb_history.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='css/adsb_history.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='vendor/leaflet/leaflet.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/core/map-utils.css') }}">
<script defer src="{{ url_for('static', filename='vendor/leaflet/leaflet.js') }}"></script>
</head> </head>
<body> <body>
<div class="radar-bg"></div> <div class="radar-bg"></div>
@@ -145,6 +148,10 @@
</div> </div>
</div> </div>
<button class="primary-btn" id="refreshBtn">Refresh</button> <button class="primary-btn" id="refreshBtn">Refresh</button>
<div class="view-toggle">
<button class="view-btn active" id="viewDataBtn" type="button">Data</button>
<button class="view-btn" id="viewPlaybackBtn" type="button">&#9654; Playback</button>
</div>
<div class="status-pill" id="historyStatus"> <div class="status-pill" id="historyStatus">
{% if history_enabled %} {% if history_enabled %}
HISTORY ONLINE HISTORY ONLINE
@@ -218,6 +225,62 @@
</div> </div>
</div> </div>
</section> </section>
<!-- ── PLAYBACK SECTION ─────────────────────────────── -->
<section class="playback-section" id="playbackSection" style="display:none;">
<div class="playback-map" id="playbackMap"></div>
<div class="playback-controls">
<div class="playback-ctrl-row">
<div class="control-group">
<label for="playbackWindowSelect">Window</label>
<select id="playbackWindowSelect">
<option value="15">15 min</option>
<option value="60" selected>1 hour</option>
<option value="360">6 hours</option>
<option value="1440">24 hours</option>
</select>
</div>
<div class="control-group">
<label for="playbackBucketSelect">Step</label>
<select id="playbackBucketSelect">
<option value="10">10 s</option>
<option value="30" selected>30 s</option>
<option value="60">1 min</option>
<option value="300">5 min</option>
</select>
</div>
<button class="primary-btn" id="playbackLoadBtn" type="button">Load</button>
<button class="primary-btn" id="playbackPlayBtn" type="button" disabled>&#9654; Play</button>
<div class="control-group">
<label for="playbackSpeedSelect">Speed</label>
<select id="playbackSpeedSelect">
<option value="1">1×</option>
<option value="2">2×</option>
<option value="5" selected>5×</option>
<option value="10">10×</option>
<option value="20">20×</option>
</select>
</div>
<div class="playback-counters">
<span class="playback-label">Aircraft</span>
<span class="playback-value" id="playbackAircraftCount">--</span>
</div>
<div class="playback-counters">
<span class="playback-label">Frames</span>
<span class="playback-value" id="playbackFrameCount">--</span>
</div>
<div class="status-pill" id="playbackStatus">READY</div>
</div>
<div class="playback-scrubber-row">
<span class="playback-time" id="playbackTimeStart">--</span>
<input type="range" id="playbackScrubber" min="0" max="0" value="0" step="1" disabled>
<span class="playback-time" id="playbackTimeEnd">--</span>
</div>
<div class="playback-current-time" id="playbackCurrentTime">--</div>
</div>
</section>
<!-- ── END PLAYBACK ──────────────────────────────────── -->
</main> </main>
<div class="modal-backdrop" id="aircraftModalBackdrop" aria-hidden="true"> <div class="modal-backdrop" id="aircraftModalBackdrop" aria-hidden="true">
@@ -1101,5 +1164,214 @@
<script src="{{ url_for('static', filename='js/core/settings-manager.js') }}?v={{ version }}&r=maptheme17"></script> <script src="{{ url_for('static', filename='js/core/settings-manager.js') }}?v={{ version }}&r=maptheme17"></script>
<script src="{{ url_for('static', filename='js/core/global-nav.js') }}"></script> <script src="{{ url_for('static', filename='js/core/global-nav.js') }}"></script>
<script src="{{ url_for('static', filename='js/map-utils.js') }}"></script>
<script>
// ── ADS-B HISTORY PLAYBACK ────────────────────────────────────────────
(function () {
const viewDataBtn = document.getElementById('viewDataBtn');
const viewPlaybackBtn = document.getElementById('viewPlaybackBtn');
const contentGrid = document.querySelector('.content-grid');
const playbackSection = document.getElementById('playbackSection');
const playbackLoadBtn = document.getElementById('playbackLoadBtn');
const playbackPlayBtn = document.getElementById('playbackPlayBtn');
const playbackScrubber = document.getElementById('playbackScrubber');
const playbackStatus = document.getElementById('playbackStatus');
const playbackAircraftCount = document.getElementById('playbackAircraftCount');
const playbackFrameCount = document.getElementById('playbackFrameCount');
const playbackTimeStart = document.getElementById('playbackTimeStart');
const playbackTimeEnd = document.getElementById('playbackTimeEnd');
const playbackCurrentTime = document.getElementById('playbackCurrentTime');
let pbMap = null;
let buckets = [];
let markers = {};
let frameIndex = 0;
let playing = false;
let playTimer = null;
// ── View toggle ───────────────────────────────────────────────────
viewDataBtn.addEventListener('click', () => {
viewDataBtn.classList.add('active');
viewPlaybackBtn.classList.remove('active');
contentGrid.style.display = '';
playbackSection.style.display = 'none';
stopPlayback();
});
viewPlaybackBtn.addEventListener('click', () => {
viewPlaybackBtn.classList.add('active');
viewDataBtn.classList.remove('active');
contentGrid.style.display = 'none';
playbackSection.style.display = 'flex';
initPlaybackMap();
});
// ── Map init ──────────────────────────────────────────────────────
function initPlaybackMap() {
if (pbMap) { pbMap.invalidateSize(); return; }
pbMap = MapUtils.init('playbackMap', { zoom: 6 });
}
// ── Load data ─────────────────────────────────────────────────────
playbackLoadBtn.addEventListener('click', loadPlayback);
async function loadPlayback() {
if (!pbMap) initPlaybackMap();
stopPlayback();
clearMarkers();
const minutes = document.getElementById('playbackWindowSelect').value;
const bucket = document.getElementById('playbackBucketSelect').value;
playbackStatus.textContent = 'LOADING…';
playbackStatus.className = 'status-pill loading';
try {
const resp = await fetch(`/adsb/history/playback?since_minutes=${minutes}&bucket_seconds=${bucket}`);
if (!resp.ok) throw new Error(resp.statusText);
const data = await resp.json();
buckets = data.buckets || [];
if (!buckets.length) {
playbackStatus.textContent = 'NO DATA';
playbackStatus.className = 'status-pill warn';
playbackFrameCount.textContent = '0';
playbackAircraftCount.textContent = '0';
return;
}
playbackScrubber.max = buckets.length - 1;
playbackScrubber.value = 0;
playbackScrubber.disabled = false;
playbackPlayBtn.disabled = false;
frameIndex = 0;
const startEpoch = buckets[0].t;
const endEpoch = buckets[buckets.length - 1].t;
playbackTimeStart.textContent = epochToStr(startEpoch);
playbackTimeEnd.textContent = epochToStr(endEpoch);
const maxAircraft = Math.max(...buckets.map(b => b.aircraft.length));
playbackFrameCount.textContent = buckets.length;
playbackAircraftCount.textContent = maxAircraft;
playbackStatus.textContent = 'READY';
playbackStatus.className = 'status-pill';
renderFrame(0);
} catch (e) {
playbackStatus.textContent = 'ERROR';
playbackStatus.className = 'status-pill error';
console.error('Playback load error:', e);
}
}
// ── Scrubber ──────────────────────────────────────────────────────
playbackScrubber.addEventListener('input', () => {
frameIndex = parseInt(playbackScrubber.value);
renderFrame(frameIndex);
});
// ── Play / Pause ──────────────────────────────────────────────────
playbackPlayBtn.addEventListener('click', () => {
playing ? stopPlayback() : startPlayback();
});
function startPlayback() {
if (!buckets.length) return;
playing = true;
playbackPlayBtn.textContent = '⏸ Pause';
playbackStatus.textContent = 'PLAYING';
playbackStatus.className = 'status-pill active';
if (frameIndex >= buckets.length - 1) frameIndex = 0;
step();
}
function stopPlayback() {
playing = false;
clearTimeout(playTimer);
playbackPlayBtn.textContent = '▶ Play';
if (buckets.length) {
playbackStatus.textContent = 'PAUSED';
playbackStatus.className = 'status-pill';
}
}
function step() {
if (!playing) return;
renderFrame(frameIndex);
playbackScrubber.value = frameIndex;
if (frameIndex < buckets.length - 1) {
frameIndex++;
const speed = parseInt(document.getElementById('playbackSpeedSelect').value);
const bucketSec = buckets.length > 1 ? (buckets[1].t - buckets[0].t) : 30;
const delay = Math.max(50, (bucketSec / speed) * 1000);
playTimer = setTimeout(step, delay);
} else {
stopPlayback();
playbackStatus.textContent = 'DONE';
}
}
// ── Render a frame ────────────────────────────────────────────────
function renderFrame(idx) {
if (!buckets[idx]) return;
const bucket = buckets[idx];
playbackCurrentTime.textContent = epochToStr(bucket.t);
const seen = new Set();
for (const ac of bucket.aircraft) {
seen.add(ac.icao);
const latlng = [ac.lat, ac.lon];
if (markers[ac.icao]) {
markers[ac.icao].setLatLng(latlng);
markers[ac.icao].setTooltipContent(acLabel(ac));
} else {
const icon = L.divIcon({
className: 'pb-aircraft-icon',
html: headingArrow(ac.hdg),
iconSize: [18, 18],
iconAnchor: [9, 9],
});
const m = L.marker(latlng, { icon })
.bindTooltip(acLabel(ac), { permanent: false, direction: 'top', offset: [0, -10] })
.addTo(pbMap);
markers[ac.icao] = m;
}
}
// Remove aircraft that aren't in this frame
for (const icao of Object.keys(markers)) {
if (!seen.has(icao)) {
pbMap.removeLayer(markers[icao]);
delete markers[icao];
}
}
playbackAircraftCount.textContent = Object.keys(markers).length;
}
function clearMarkers() {
for (const m of Object.values(markers)) { if (pbMap) pbMap.removeLayer(m); }
markers = {};
}
// ── Helpers ───────────────────────────────────────────────────────
function epochToStr(epoch) {
return new Date(epoch * 1000).toISOString().replace('T', ' ').substring(0, 19) + ' UTC';
}
function acLabel(ac) {
const id = ac.callsign || ac.icao;
const alt = ac.alt != null ? ` ${ac.alt.toLocaleString()}ft` : '';
return `<span class="pb-tooltip">${id}${alt}</span>`;
}
function headingArrow(hdg) {
const deg = hdg != null ? hdg : 0;
return `<svg viewBox="0 0 18 18" width="18" height="18" style="transform:rotate(${deg}deg)">
<polygon points="9,1 13,17 9,13 5,17" fill="var(--accent-cyan)" stroke="var(--bg-card)" stroke-width="1"/>
</svg>`;
}
})();
</script>
</body> </body>
</html> </html>