${pass.quality}
@@ -1334,12 +1465,18 @@ const WeatherSat = (function() {
if (hoursEl) hoursEl.textContent = h.toString().padStart(2, '0');
if (minsEl) minsEl.textContent = m.toString().padStart(2, '0');
if (secsEl) secsEl.textContent = s.toString().padStart(2, '0');
+ const passTimeStr = formatShortTime(nextPass.startTimeISO) + getTZLabel();
if (satEl) satEl.textContent = `${nextPass.name} ${nextPass.frequency} MHz`;
if (detailEl) {
if (isActive) {
detailEl.textContent = `ACTIVE - ${nextPass.maxEl}\u00b0 max el`;
} else {
- detailEl.textContent = `${nextPass.maxEl}\u00b0 max el / ${nextPass.duration} min`;
+ const bestPass = findBestPass(filtered);
+ const durMin = Math.round((nextPass.duration || 0) / 60);
+ const bestNote = bestPass && bestPass.startTimeISO !== nextPass.startTimeISO
+ ? ` | Best: ${bestPass.name} ${formatShortTime(bestPass.startTimeISO)}${getTZLabel()} (${bestPass.maxEl}\u00b0)`
+ : '';
+ detailEl.textContent = `${passTimeStr} / ${nextPass.maxEl}\u00b0 max el / ${durMin} min${bestNote}`;
}
}
@@ -1391,7 +1528,7 @@ const WeatherSat = (function() {
marker.className = `wxsat-timeline-pass ${pass.mode === 'LRPT' ? 'lrpt' : 'apt'}`;
marker.style.left = startPct + '%';
marker.style.width = widthPct + '%';
- marker.title = `${pass.name} ${pass.startTime} (${pass.maxEl}\u00b0)`;
+ marker.title = `${pass.name} ${formatShortTime(pass.startTimeISO)}${getTZLabel()} (${pass.maxEl}\u00b0)`;
marker.onclick = () => selectPass(idx);
track.appendChild(marker);
});
@@ -1414,6 +1551,73 @@ const WeatherSat = (function() {
cursor.style.left = pct + '%';
}
+ /**
+ * Update timeline hour labels to match the selected timezone.
+ */
+ function updateTimelineLabels() {
+ const labels = document.querySelector('.wxsat-timeline-labels');
+ if (!labels) return;
+ const hours = [0, 6, 12, 18, 24];
+ const spans = labels.querySelectorAll('span');
+ if (spans.length !== hours.length) return;
+
+ const tz = typeof InterceptTime !== 'undefined' ? InterceptTime.getTimezone() : 'UTC';
+ const ianaName = typeof InterceptTime !== 'undefined' ? InterceptTime.getIANA() : undefined;
+
+ hours.forEach((h, i) => {
+ if (h === 24) {
+ spans[i].textContent = '24:00';
+ return;
+ }
+ if (tz === 'UTC' || tz === 'local') {
+ spans[i].textContent = `${String(h).padStart(2, '0')}:00`;
+ } else {
+ const d = new Date();
+ d.setHours(h, 0, 0, 0);
+ const opts = { hour: '2-digit', minute: '2-digit', hour12: false };
+ if (ianaName) opts.timeZone = ianaName;
+ spans[i].textContent = d.toLocaleTimeString(undefined, opts).slice(0, 5);
+ }
+ });
+ }
+
+ /**
+ * Update the pass analysis bar with stats about current passes.
+ */
+ function updatePassAnalysis(passList) {
+ const totalEl = document.getElementById('wxsatAnalysisTotal');
+ const excellentEl = document.getElementById('wxsatAnalysisExcellent');
+ const goodEl = document.getElementById('wxsatAnalysisGood');
+ const fairEl = document.getElementById('wxsatAnalysisFair');
+ const bestEl = document.getElementById('wxsatAnalysisBest');
+
+ const now = new Date();
+ const upcoming = passList.filter(p => {
+ const end = parsePassDate(p.endTimeISO);
+ return end && end > now;
+ });
+
+ const excellent = upcoming.filter(p => p.quality === 'excellent').length;
+ const good = upcoming.filter(p => p.quality === 'good').length;
+ const fair = upcoming.filter(p => p.quality === 'fair').length;
+
+ if (totalEl) totalEl.textContent = upcoming.length;
+ if (excellentEl) excellentEl.textContent = excellent;
+ if (goodEl) goodEl.textContent = good;
+ if (fairEl) fairEl.textContent = fair;
+
+ const best = findBestPass(passList);
+ if (bestEl) {
+ if (best) {
+ const t = formatShortTime(best.startTimeISO) + getTZLabel();
+ const bestDurMin = Math.round((best.duration || 0) / 60);
+ bestEl.textContent = `Best: ${best.name} at ${t} (${best.maxEl}\u00b0 el, ${bestDurMin} min)`;
+ } else {
+ bestEl.textContent = 'No upcoming passes';
+ }
+ }
+ }
+
// ========================
// Auto-Scheduler
// ========================
@@ -1627,12 +1831,15 @@ const WeatherSat = (function() {
return new Date(b.timestamp || 0) - new Date(a.timestamp || 0);
});
- // Group by date
+ // Group by date (timezone-aware via global InterceptTime)
const groups = {};
sorted.forEach(img => {
- const dateKey = img.timestamp
- ? new Date(img.timestamp).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })
- : 'Unknown Date';
+ let dateKey = 'Unknown Date';
+ if (img.timestamp) {
+ dateKey = typeof InterceptTime !== 'undefined'
+ ? InterceptTime.dateOnly(img.timestamp)
+ : new Date(img.timestamp).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' });
+ }
if (!groups[dateKey]) groups[dateKey] = [];
groups[dateKey].push(img);
});
@@ -1788,11 +1995,7 @@ const WeatherSat = (function() {
*/
function formatTimestamp(isoString) {
if (!isoString) return '--';
- try {
- return new Date(isoString).toLocaleString();
- } catch {
- return isoString;
- }
+ return formatDateTime(isoString) + getTZLabel();
}
function ensureImageRefresh() {
@@ -1969,11 +2172,23 @@ const WeatherSat = (function() {
const log = document.getElementById('wxsatConsoleLog');
if (!log) return;
+ const type = logType || 'info';
+ const now = new Date();
+ const ts = typeof InterceptTime !== 'undefined'
+ ? InterceptTime.fullTime(now)
+ : now.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit', second: '2-digit' });
+
const entry = document.createElement('div');
- entry.className = `wxsat-console-entry wxsat-log-${logType || 'info'}`;
- entry.textContent = message;
- log.appendChild(entry);
+ entry.className = `wxsat-console-entry wxsat-log-${type}`;
+ entry.dataset.logType = type;
+ entry.innerHTML = `
${ts}${escapeHtml(message)}`;
+ // Apply current filter visibility
+ if (consoleFilter !== 'all' && type !== consoleFilter) {
+ entry.style.display = 'none';
+ }
+
+ log.appendChild(entry);
consoleEntries.push(entry);
// Cap at 200 entries
@@ -1986,6 +2201,40 @@ const WeatherSat = (function() {
log.scrollTop = log.scrollHeight;
}
+ /**
+ * Filter console entries by log type.
+ */
+ function filterConsole(filter) {
+ consoleFilter = filter;
+ // Update filter button states
+ document.querySelectorAll('.wxsat-console-filter').forEach(btn => {
+ btn.classList.toggle('active', btn.dataset.filter === filter);
+ });
+ // Show/hide entries
+ consoleEntries.forEach(entry => {
+ if (filter === 'all') {
+ entry.style.display = '';
+ } else {
+ entry.style.display = entry.dataset.logType === filter ? '' : 'none';
+ }
+ });
+ // Scroll to bottom
+ const log = document.getElementById('wxsatConsoleLog');
+ if (log) log.scrollTop = log.scrollHeight;
+ }
+
+ /**
+ * Export console contents to clipboard.
+ */
+ function exportConsole() {
+ const text = consoleEntries.map(e => e.textContent).join('\n');
+ navigator.clipboard.writeText(text).then(() => {
+ showNotification('Weather Sat', 'Console log copied to clipboard');
+ }).catch(() => {
+ showNotification('Weather Sat', 'Failed to copy console log');
+ });
+ }
+
/**
* Update the phase indicator steps
*/
@@ -2048,8 +2297,14 @@ const WeatherSat = (function() {
const log = document.getElementById('wxsatConsoleLog');
if (log) log.innerHTML = '';
consoleEntries = [];
+ consoleFilter = 'all';
currentPhase = 'idle';
+ // Reset filter buttons
+ document.querySelectorAll('.wxsat-console-filter').forEach(btn => {
+ btn.classList.toggle('active', btn.dataset.filter === 'all');
+ });
+
document.querySelectorAll('#wxsatPhaseIndicator .wxsat-phase-step').forEach(step => {
step.classList.remove('active', 'completed', 'error');
});
@@ -2092,6 +2347,90 @@ const WeatherSat = (function() {
stopStream();
}
+ /**
+ * Load demo/sample data for UI testing without a live satellite pass.
+ * Populates passes, console, and analysis bar with realistic fake data.
+ */
+ function loadDemoData() {
+ const now = new Date();
+
+ // Generate sample passes over next 24h
+ const demoSats = ['METEOR-M2-3', 'METEOR-M2-4'];
+ const demoPasses = [];
+
+ const offsets = [25, 95, 200, 340, 510, 720, 880, 1020];
+ const elevations = [72, 45, 28, 63, 18, 55, 82, 35];
+ const durations = [840, 720, 480, 780, 360, 660, 900, 600]; // seconds
+ const riseAzs = [350, 15, 200, 310, 170, 40, 280, 90];
+ const setAzs = [170, 195, 20, 130, 350, 220, 100, 270];
+
+ offsets.forEach((offset, i) => {
+ const start = new Date(now.getTime() + offset * 60000);
+ const end = new Date(start.getTime() + durations[i] * 1000);
+ const sat = demoSats[i % 2];
+ const el = elevations[i];
+ const quality = el >= 60 ? 'excellent' : el >= 30 ? 'good' : 'fair';
+
+ demoPasses.push({
+ id: `${sat}_demo_${i}`,
+ satellite: sat,
+ name: sat === 'METEOR-M2-3' ? 'Meteor-M2-3' : 'Meteor-M2-4',
+ frequency: 137.9,
+ mode: 'LRPT',
+ startTime: start.toISOString().replace('T', ' ').slice(0, 16) + ' UTC',
+ startTimeISO: start.toISOString(),
+ endTimeISO: end.toISOString(),
+ maxEl: el,
+ maxElAz: (riseAzs[i] + setAzs[i]) / 2,
+ riseAz: riseAzs[i],
+ setAz: setAzs[i],
+ duration: durations[i],
+ quality: quality,
+ trajectory: [],
+ groundTrack: [],
+ });
+ });
+
+ allPasses = demoPasses;
+ applyPassFilter();
+
+ // Simulate console output
+ clearConsole();
+ showConsole(true);
+ const demoLogs = [
+ ['SatDump v1.2.2 initialized', 'info'],
+ ['Pipeline: meteor_m2-x_lrpt', 'info'],
+ ['Frequency: 137.900 MHz | Sample rate: 2.4 MHz', 'info'],
+ ['RTL-SDR device 0 (SN: 00000101) opened', 'info'],
+ ['Tuning to 137900000 Hz...', 'info'],
+ ['Gain set to 40.0 dB', 'debug'],
+ ['Waiting for signal...', 'info'],
+ ['LRPT signal detected! SNR: 8.2 dB', 'signal'],
+ ['Viterbi lock acquired', 'signal'],
+ ['Frame sync OK - decoding frames', 'signal'],
+ ['Decoding LRPT... 15%', 'progress'],
+ ['Decoding LRPT... 30%', 'progress'],
+ ['Decoding LRPT... 45%', 'progress'],
+ ['Channel 1 (visible) - 1540 lines', 'info'],
+ ['Channel 2 (infrared) - 1540 lines', 'info'],
+ ['Decoding LRPT... 60%', 'progress'],
+ ['Decoding LRPT... 75%', 'progress'],
+ ['Decoding LRPT... 90%', 'progress'],
+ ['Image saved: meteor_m2-3_rgb_composite.png (2.4 MB)', 'save'],
+ ['Image saved: meteor_m2-3_channel_1.png (1.1 MB)', 'save'],
+ ['Image saved: meteor_m2-3_thermal.png (1.3 MB)', 'save'],
+ ['Decoding complete - 3 images produced', 'info'],
+ ['Signal lost - satellite below horizon', 'warning'],
+ ['Pass duration: 13m 42s', 'info'],
+ ];
+
+ demoLogs.forEach((entry, i) => {
+ setTimeout(() => addConsoleEntry(entry[0], entry[1]), i * 120);
+ });
+
+ showNotification('Weather Sat', 'Demo data loaded - showing sample passes and console output');
+ }
+
// Public API
return {
init,
@@ -2113,6 +2452,11 @@ const WeatherSat = (function() {
toggleScheduler,
invalidateMap,
toggleConsole,
+ setTimezone,
+ filterConsole,
+ exportConsole,
+ clearConsole,
+ loadDemoData,
_getModalFilename: () => currentModalFilename,
};
})();
diff --git a/templates/adsb_dashboard.html b/templates/adsb_dashboard.html
index 78bab319..e70f3c2f 100644
--- a/templates/adsb_dashboard.html
+++ b/templates/adsb_dashboard.html
@@ -23,6 +23,7 @@
window.INTERCEPT_DEFAULT_LAT = {{ default_latitude | tojson }};
window.INTERCEPT_DEFAULT_LON = {{ default_longitude | tojson }};
+
@@ -3489,15 +3490,17 @@
Aircraft Log (${report.aircraftLog.length})
return '
' + lbl + '';
}
- // TODO: Similar to renderAcarsMainCard in partials/modes/acars.html — consider unifying
function renderAcarsCard(msg) {
const type = msg.message_type || 'other';
const badge = getAcarsTypeBadge(type);
const desc = escapeHtml(msg.label_description || ('Label ' + (msg.label || '?')));
const text = msg.text || msg.msg || '';
- const truncText = escapeHtml(text.length > 120 ? text.substring(0, 120) + '...' : text);
- const time = msg.timestamp ? new Date(msg.timestamp).toLocaleTimeString() : '';
+ const truncText = escapeHtml(text.length > 200 ? text.substring(0, 200) + '...' : text);
+ const time = msg.timestamp && typeof InterceptTime !== 'undefined'
+ ? InterceptTime.shortTime(msg.timestamp) + InterceptTime.tzSuffix()
+ : (msg.timestamp ? new Date(msg.timestamp).toLocaleTimeString() : '');
const flight = escapeHtml(msg.flight || '');
+ const tail = escapeHtml(msg.tail || msg.reg || '');
let parsedHtml = '';
if (msg.parsed) {
@@ -3505,23 +3508,35 @@
Aircraft Log (${report.aircraftLog.length})
if (type === 'position' && p.lat !== undefined) {
parsedHtml = '
' +
p.lat.toFixed(4) + ', ' + p.lon.toFixed(4) +
- (p.flight_level ? ' • ' + escapeHtml(String(p.flight_level)) : '') +
- (p.destination ? ' → ' + escapeHtml(String(p.destination)) : '') + '
';
+ (p.flight_level ? ' • FL' + escapeHtml(String(p.flight_level)) : '') +
+ (p.destination ? ' → ' + escapeHtml(String(p.destination)) : '') + '
';
} else if (type === 'engine_data') {
const parts = [];
Object.keys(p).forEach(k => {
- parts.push(escapeHtml(k) + ': ' + escapeHtml(String(p[k].value)));
+ const val = typeof p[k] === 'object' ? p[k].value : p[k];
+ parts.push(escapeHtml(k) + ': ' + escapeHtml(String(val)));
});
if (parts.length) {
parsedHtml = '
';
}
} else if (type === 'oooi' && p.origin) {
parsedHtml = '
' +
- escapeHtml(String(p.origin)) + ' → ' + escapeHtml(String(p.destination)) +
+ escapeHtml(String(p.origin)) + ' → ' + escapeHtml(String(p.destination)) +
(p.out ? ' | OUT ' + escapeHtml(String(p.out)) : '') +
(p.off ? ' OFF ' + escapeHtml(String(p.off)) : '') +
(p.on ? ' ON ' + escapeHtml(String(p.on)) : '') +
(p['in'] ? ' IN ' + escapeHtml(String(p['in'])) : '') + '
';
+ } else if (type === 'weather' && (p.wind_speed || p.temperature)) {
+ const wx = [];
+ if (p.wind_speed) wx.push('Wind ' + escapeHtml(String(p.wind_speed)) + (p.wind_dir ? '/' + escapeHtml(String(p.wind_dir)) : ''));
+ if (p.temperature) wx.push(escapeHtml(String(p.temperature)) + '°C');
+ if (p.turbulence) wx.push('Turb: ' + escapeHtml(String(p.turbulence)));
+ if (wx.length) parsedHtml = '
';
+ } else if (type === 'cpdlc') {
+ const cpdlcText = p.message || p.text || '';
+ if (cpdlcText) parsedHtml = '
';
+ } else if (type === 'squawk' && p.squawk) {
+ parsedHtml = '
' : '') +
parsedHtml +
(truncText && type !== 'link_test' && type !== 'handshake' ?
'
const labelDesc = data.label_description || '';
const msgType = data.message_type || 'other';
const text = data.text || data.msg || '';
- const time = new Date().toLocaleTimeString();
+ const time = typeof InterceptTime !== 'undefined'
+ ? InterceptTime.shortTime(new Date()) + InterceptTime.tzSuffix()
+ : new Date().toLocaleTimeString();
// Escape user-controlled strings for safe innerHTML insertion
const eFlight = escapeHtml(flight);
@@ -4878,7 +4895,9 @@
const acars = avlc.acars || {};
const flight = acars.flight || '';
const msgText = acars.msg_text || '';
- const time = new Date().toLocaleTimeString();
+ const time = typeof InterceptTime !== 'undefined'
+ ? InterceptTime.shortTime(new Date()) + InterceptTime.tzSuffix()
+ : new Date().toLocaleTimeString();
const freq = inner.freq ? (inner.freq / 1000000).toFixed(3) : '';
// Store for CSV export
@@ -5676,6 +5695,16 @@
{% include 'partials/settings-modal.html' %}
+
{% include 'partials/help-modal.html' %}
diff --git a/templates/index.html b/templates/index.html
index a7640bbe..787ec8f7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2545,6 +2545,25 @@