@@ -1855,9 +1866,13 @@ function applyLiveMarker(kind, p) {
}
}
function acColor(p) {
- const t = String(((p.extra || {}).type || '')).toUpperCase();
- if ((p.extra || {}).firefighter || firefighterHex.has(String(p.id)) || FF_ICAO.has(t)) return '#fb923c';
- return altColor((p.extra || {}).alt_baro);
+ const extra = p.extra || {};
+ const t = String(extra.type || '').toUpperCase();
+ const em = String(extra.emergency || '').toLowerCase();
+ if (em && em !== 'none') return '#ff5d5d';
+ if (extra.firefighter || firefighterHex.has(String(p.id)) || FF_ICAO.has(t)) return '#fb923c';
+ if (extra.role === 'military') return '#f472b6';
+ return altColor(extra.alt_baro);
}
function connectLiveWs() {
if (liveWs && (liveWs.readyState === 0 || liveWs.readyState === 1)) return;
@@ -2563,12 +2578,57 @@ function altColor(alt) {
if (a >= 1000) return '#fbbf24';
return '#fb923c';
}
+function _popVal(v) {
+ if (v == null || v === '' || v === 'none' || v === 'undefined') return null;
+ return v;
+}
function pointPopup(p) {
const extra = p.extra || {};
- const rows = Object.keys(extra).filter(k => k !== 'stations' && extra[k] != null && extra[k] !== '')
- .slice(0, 8)
- .map(k => `
| ${esc(k)} | ${esc(extra[k])} |
`).join('');
- return `
`;
+ const src = extra.src || '';
+ const role = extra.firefighter ? 'firefighter' : extra.role;
+ const badge = role
+ ? `
${esc(String(role).toUpperCase())}`
+ : '';
+ const rows = [];
+ const add = (k, v) => {
+ const val = _popVal(v);
+ if (val == null) return;
+ rows.push(`
| ${esc(k)} | ${esc(val)} |
`);
+ };
+ if (src === 'adsb.lol') {
+ add('type', extra.type);
+ add('aircraft', extra.desc);
+ add('operator', extra.ownOp);
+ add('reg', extra.reg);
+ const alt = extra.alt_baro;
+ add('alt', alt != null ? `${alt} ft` : null);
+ add('vs', extra.vs != null ? `${extra.vs} fpm` : null);
+ add('gs', p.speed != null ? `${p.speed} kt` : null);
+ add('hdg', p.heading != null ? `${Math.round(p.heading)}°` : null);
+ add('squawk', extra.squawk);
+ add('emergency', extra.emergency);
+ add('class', extra.emitter);
+ add('hex', extra.hex);
+ } else if (src === 'aisstream') {
+ add('kind', extra.kind);
+ add('flag', extra.country);
+ add('dest', extra.dest);
+ add('nav', extra.nav);
+ add('callsign', extra.callsign);
+ add('imo', extra.imo);
+ add('mmsi', extra.mmsi);
+ if (extra.length && extra.beam) add('size', `${extra.length} × ${extra.beam} m`);
+ else add('length', extra.length != null ? `${extra.length} m` : null);
+ add('draught', extra.draught != null ? `${extra.draught} m` : null);
+ add('sog', p.speed != null ? `${p.speed} kt` : null);
+ add('hdg', p.heading != null ? `${Math.round(p.heading)}°` : null);
+ add('eta', extra.eta);
+ } else {
+ Object.keys(extra).filter(k => k !== 'stations' && extra[k] != null && extra[k] !== '')
+ .slice(0, 8)
+ .forEach(k => add(k, extra[k]));
+ }
+ return `
${esc(p.label || p.id)}${badge}
`;
}
/* ── Heading-aware live-feed glyph markers ───────────────────────────────
@@ -2617,15 +2677,19 @@ function feedIcon(feed, color, heading) {
function makePointMarker(p, colorFn, feed, renderer) {
if (p.lat == null || p.lon == null) return null;
const col = sanitizeColor(colorFn(p), '#35e0ff');
+ let m;
if (feed) {
const heading = Number(p.heading);
const icon = feedIcon(feed, col, Number.isNaN(heading) ? null : heading);
- return L.marker([p.lat, p.lon], { icon }).bindPopup(() => pointPopup(p));
+ m = L.marker([p.lat, p.lon], { icon });
+ } else {
+ m = L.circleMarker([p.lat, p.lon], {
+ radius: 5, color: col, fillColor: col, fillOpacity: 0.9, weight: 1,
+ renderer,
+ });
}
- return L.circleMarker([p.lat, p.lon], {
- radius: 5, color: col, fillColor: col, fillOpacity: 0.9, weight: 1,
- renderer,
- }).bindPopup(() => pointPopup(p));
+ m._osintP = p;
+ return m.bindPopup(() => pointPopup(m._osintP || p));
}
function renderPoints(existing, points, colorFn, cluster, feed) {
const zoom = map.getZoom();
@@ -2662,6 +2726,7 @@ function renderPoints(existing, points, colorFn, cluster, feed) {
const m = byId.get(id);
if (m) {
m.setLatLng([p.lat, p.lon]);
+ m._osintP = p;
if (feed) m.setIcon(feedIcon(feed, col, p.heading));
else if (m.setStyle) m.setStyle({ color: col, fillColor: col });
} else {
@@ -2920,6 +2985,9 @@ async function loadVessels() {
const pts = await r.json();
if (req !== overlayReq.vessels) return;
vesselsGroup = renderPoints(vesselsGroup, Array.isArray(pts) ? pts : [], p => {
+ const extra = p.extra || {};
+ if (extra.role === 'military') return '#f472b6';
+ if (extra.role === 'government') return '#facc15';
const sog = Number((p.speed) || 0);
return sog > 0.5 ? '#2dd4bf' : '#64748b';
}, true, 'vessel');
diff --git a/tests/test_live_layers.py b/tests/test_live_layers.py
index fedf6dd..0a1bf1b 100644
--- a/tests/test_live_layers.py
+++ b/tests/test_live_layers.py
@@ -362,3 +362,113 @@ def test_wfigs_params_requests_simplified_geometry():
# Envelope is the quantized cell, not the raw pan box.
geom = params["geometry"]
assert geom != "-84.5,33.8,-75.4,36.6"
+
+
+def test_transform_adsb_lol_flags_military_from_dbflags():
+ payload = {
+ "ac": [
+ {
+ "hex": "ae01ab",
+ "flight": "RCH123 ",
+ "r": "04-1234",
+ "t": "C17",
+ "lat": 35.1,
+ "lon": -77.9,
+ "alt_baro": 24000,
+ "gs": 410,
+ "track": 90,
+ "squawk": "5101",
+ "emergency": "none",
+ "category": "A5",
+ "dbFlags": 1,
+ "baro_rate": 64,
+ "alt_geom": 24500,
+ "desc": "Boeing C-17A Globemaster III",
+ "ownOp": "USAF",
+ },
+ {
+ "hex": "a1b2c3",
+ "flight": "AAL123",
+ "r": "N123AA",
+ "t": "B738",
+ "lat": 35.88,
+ "lon": -78.79,
+ "alt_baro": 32000,
+ "gs": 430,
+ "track": 87,
+ "squawk": "1200",
+ "emergency": "none",
+ "category": "A3",
+ },
+ ]
+ }
+ rows = {r["id"]: r for r in transform_adsb_lol(payload)}
+ mil = rows["ae01ab"]["extra"]
+ civ = rows["a1b2c3"]["extra"]
+ assert mil["role"] == "military"
+ assert mil["role_src"] == "dbFlags"
+ assert mil["emitter"] == "heavy"
+ assert mil["desc"] == "Boeing C-17A Globemaster III"
+ assert mil["ownOp"] == "USAF"
+ assert mil["vs"] == 64
+ assert mil["alt_geom"] == 24500
+ assert civ["role"] == "civilian"
+ assert civ["emitter"] == "large"
+
+
+def test_transform_adsb_lol_military_from_icao_type_and_hex():
+ payload = {
+ "ac": [
+ {"hex": "3b76aa", "flight": "FAF123", "t": "F16", "lat": 1, "lon": 2, "category": "A1"},
+ {"hex": "ae1234", "flight": "BOXER1", "t": "C172", "lat": 1, "lon": 2, "category": "A1"},
+ ]
+ }
+ rows = {r["id"]: r for r in transform_adsb_lol(payload)}
+ assert rows["3b76aa"]["extra"]["role"] == "military"
+ assert rows["3b76aa"]["extra"]["role_src"] == "type"
+ assert rows["ae1234"]["extra"]["role"] == "military"
+ assert rows["ae1234"]["extra"]["role_src"] == "hex"
+
+
+def test_transform_ais_static_classifies_military_and_cargo():
+ mil = transform_ais_frame({
+ "MessageType": "ShipStaticData",
+ "MetaData": {"MMSI": 338123456, "ShipName": "USNS BOB", "Latitude": 32.7, "Longitude": -117.2},
+ "Message": {"ShipStaticData": {
+ "Type": 35, "CallSign": "NBXX", "ImoNumber": 0,
+ "Destination": "SAN DIEGO", "MaximumStaticDraught": 8.2,
+ "Dimension": {"A": 80, "B": 20, "C": 8, "D": 8},
+ "Eta": {"Month": 8, "Day": 29, "Hour": 14, "Minute": 0},
+ }},
+ })
+ cargo = transform_ais_frame({
+ "MessageType": "ShipStaticData",
+ "MetaData": {"MMSI": 477123456, "ShipName": "EVER GIVEN", "Latitude": 36.9, "Longitude": -76.3},
+ "Message": {"ShipStaticData": {
+ "Type": 70, "CallSign": "VRXX", "ImoNumber": 9811000,
+ "Destination": "NORFOLK", "MaximumStaticDraught": 14.5,
+ "Dimension": {"A": 200, "B": 150, "C": 20, "D": 20},
+ }},
+ })
+ assert mil is not None and cargo is not None
+ assert mil["extra"]["role"] == "military"
+ assert mil["extra"]["kind"] == "military"
+ assert mil["extra"]["callsign"] == "NBXX"
+ assert mil["extra"]["length"] == 100
+ assert mil["extra"]["beam"] == 16
+ assert mil["extra"]["dest"] == "SAN DIEGO"
+ assert mil["extra"]["country"] == "United States"
+ assert cargo["extra"]["role"] == "civilian"
+ assert cargo["extra"]["kind"] == "cargo"
+ assert cargo["extra"]["imo"] == 9811000
+
+
+def test_transform_ais_position_decodes_navstat():
+ row = transform_ais_frame({
+ "MessageType": "PositionReport",
+ "MetaData": {"MMSI": 366912810, "ShipName": "EVER GIVEN", "latitude": 36.9, "longitude": -76.3},
+ "Message": {"PositionReport": {"Sog": 0.1, "Cog": 88.0, "TrueHeading": 90, "NavigationalStatus": 5}},
+ })
+ assert row is not None
+ assert row["extra"]["nav"] == "moored"
+ assert row["extra"]["navstat"] == 5