Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-07-07 17:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from xdep/testing-branch

Browse Source
This commit is contained in:
Smittix
2026-01-25 19:44:31 +00:00
committed by GitHub
parent 43e80b4aa4 6d797181bf
commit b6f19f2052
4 changed files with 126 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/ais.py
+6 -3
View File
@@ -163,10 +163,13 @@ def process_ais_message(msg: dict) -> dict | None:
vessel = app_module.ais_vessels.get(mmsi) or {'mmsi': mmsi} vessel = app_module.ais_vessels.get(mmsi) or {'mmsi': mmsi}
# Extract common fields # Extract common fields
if 'lat' in msg and 'lon' in msg: # AIS-catcher JSON_FULL uses 'longitude'/'latitude', but some versions use 'lon'/'lat'
lat_val = msg.get('latitude') or msg.get('lat')
lon_val = msg.get('longitude') or msg.get('lon')
if lat_val is not None and lon_val is not None:
try: try:
lat = float(msg['lat']) lat = float(lat_val)
lon = float(msg['lon']) lon = float(lon_val)
# Validate coordinates (AIS uses 181 for unavailable) # Validate coordinates (AIS uses 181 for unavailable)
if -90 <= lat <= 90 and -180 <= lon <= 180: if -90 <= lat <= 90 and -180 <= lon <= 180:
vessel['lat'] = lat vessel['lat'] = lat
static/css/ais_dashboard.css
+12 -15
View File
@@ -495,9 +495,8 @@ body {
} }
.no-vessel-icon { .no-vessel-icon {
font-size: 36px;
margin-bottom: 10px; margin-bottom: 10px;
opacity: 0.5; color: var(--accent-cyan);
} }
.vessel-header { .vessel-header {
@@ -508,7 +507,9 @@ body {
} }
.vessel-icon { .vessel-icon {
font-size: 32px; display: flex;
align-items: center;
justify-content: center;
} }
.vessel-name { .vessel-name {
@@ -595,7 +596,10 @@ body {
} }
.vessel-item-icon { .vessel-item-icon {
font-size: 20px; display: flex;
align-items: center;
justify-content: center;
width: 24px;
} }
.vessel-item-info { .vessel-item-info {
@@ -747,19 +751,12 @@ body {
border: none; border: none;
} }
.vessel-marker-inner { .vessel-marker svg {
width: 24px; transition: filter 0.2s ease;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
font-size: 18px;
filter: drop-shadow(0 0 2px rgba(0,0,0,0.8));
transition: transform 0.3s ease;
} }
.vessel-marker.selected .vessel-marker-inner { .vessel-marker.selected svg {
filter: drop-shadow(0 0 6px var(--accent-cyan)); filter: drop-shadow(0 0 8px rgba(255,255,255,0.8)) !important;
} }
/* Range rings */ /* Range rings */
templates/ais_dashboard.html
+107 -54
View File
@@ -78,7 +78,11 @@
</div> </div>
<div class="selected-info" id="selectedInfo"> <div class="selected-info" id="selectedInfo">
<div class="no-vessel"> <div class="no-vessel">
<div class="no-vessel-icon">&#128674;</div> <div class="no-vessel-icon">
<svg width="32" height="32" viewBox="0 0 24 24" style="opacity: 0.5;">
<path fill="currentColor" d="M12 2L8 6V18L10 20H14L16 18V6L12 2Z"/>
</svg>
</div>
<div>Select a vessel</div> <div>Select a vessel</div>
</div> </div>
</div> </div>
@@ -204,34 +208,48 @@
let messageRateInterval = null; let messageRateInterval = null;
let lastMessageCount = 0; let lastMessageCount = 0;
// Ship type to icon mapping // Vessel SVG icon paths (top-down view, pointing up)
const SHIP_ICONS = { const VESSEL_ICONS = {
30: '&#128031;', // Fishing // Generic cargo/container ship - pointed bow, rectangular hull
31: '&#128674;', // Towing cargo: 'M12 2L8 6V18L10 20H14L16 18V6L12 2ZM10 8H14V16H10V8Z',
32: '&#128674;', // Towing // Tanker - rounded bow, long hull
36: '&#9973;', // Sailing tanker: 'M12 2C10 2 8 4 8 6V18C8 19 9 20 10 20H14C15 20 16 19 16 18V6C16 4 14 2 12 2ZM10 8H14V16H10V8Z',
37: '&#9973;', // Pleasure craft // Passenger/cruise - multiple decks indicated
60: '&#128674;', // Passenger passenger: 'M12 2L8 5V18L10 20H14L16 18V5L12 2ZM9 7H15V10H9V7ZM9 11H15V14H9V11ZM9 15H15V18H9V15Z',
61: '&#128674;', // Passenger // Tug - small, compact, powerful
62: '&#128674;', // Passenger tug: 'M12 4L9 7V16L10 18H14L15 16V7L12 4ZM10 9H14V14H10V9Z',
63: '&#128674;', // Passenger // Fishing vessel - with mast/outriggers
64: '&#128674;', // Passenger fishing: 'M12 2L12 5L8 8V17L10 19H14L16 17V8L12 5ZM6 10L8 12V15L6 13V10ZM18 10V13L16 15V12L18 10ZM10 10H14V15H10V10Z',
65: '&#128674;', // Passenger // Sailing vessel - sail shape
66: '&#128674;', // Passenger sailing: 'M12 2L12 6L8 10V18L10 20H14L16 18V10L12 6ZM12 3L16 8H12V3ZM10 11H14V17H10V11Z',
67: '&#128674;', // Passenger // Military - angular, aggressive bow
68: '&#128674;', // Passenger military: 'M12 1L7 6V8L8 9V18L10 20H14L16 18V9L17 8V6L12 1ZM10 10H14V16H10V10Z',
69: '&#128674;', // Passenger // High speed craft - sleek, pointed
70: '&#128674;', // Cargo hsc: 'M12 1L9 5V18L10 20H14L15 18V5L12 1ZM10 7H14V17H10V7Z',
71: '&#128674;', // Cargo - hazardous A // Search & rescue - distinctive cross marking
72: '&#128674;', // Cargo - hazardous B sar: 'M12 2L8 6V18L10 20H14L16 18V6L12 2ZM11 8H13V11H16V13H13V16H11V13H8V11H11V8Z',
73: '&#128674;', // Cargo - hazardous C // Pilot vessel
74: '&#128674;', // Cargo - hazardous D pilot: 'M12 3L9 6V17L10 19H14L15 17V6L12 3ZM10 8H14V15H10V8ZM11 9V10H13V9H11Z',
80: '&#128674;', // Tanker // Law enforcement
81: '&#128674;', // Tanker - hazardous A law: 'M12 2L8 6V18L10 20H14L16 18V6L12 2ZM10 8H14V10H10V8ZM11 11H13V16H11V11Z',
82: '&#128674;', // Tanker - hazardous B // Generic vessel (default)
83: '&#128674;', // Tanker - hazardous C default: 'M12 2L8 6V18L10 20H14L16 18V6L12 2Z'
84: '&#128674;', // Tanker - hazardous D };
default: '&#128674;' // Generic ship
// Vessel type colors
const VESSEL_COLORS = {
cargo: '#00d4ff', // Cyan
tanker: '#ff6b35', // Orange
passenger: '#a855f7', // Purple
tug: '#fbbf24', // Yellow
fishing: '#22c55e', // Green
sailing: '#60a5fa', // Light blue
military: '#ef4444', // Red
hsc: '#f472b6', // Pink
sar: '#ff0000', // Bright red
pilot: '#ffffff', // White
law: '#3b82f6', // Blue
default: '#00d4ff' // Cyan
}; };
// Ship type categories // Ship type categories
@@ -255,8 +273,50 @@
return 'Other'; return 'Other';
} }
function getShipIcon(type) { // Get vessel icon type from AIS ship type code
return SHIP_ICONS[type] || SHIP_ICONS.default; function getVesselIconType(type) {
if (!type) return 'default';
if (type === 30) return 'fishing';
if (type >= 31 && type <= 32) return 'tug';
if (type === 35) return 'military';
if (type >= 36 && type <= 37) return 'sailing';
if (type >= 40 && type < 50) return 'hsc';
if (type === 50) return 'pilot';
if (type === 51) return 'sar';
if (type === 52) return 'tug';
if (type === 55) return 'law';
if (type >= 60 && type < 70) return 'passenger';
if (type >= 70 && type < 80) return 'cargo';
if (type >= 80 && type < 90) return 'tanker';
return 'default';
}
// Create SVG vessel marker icon
function createVesselMarkerIcon(rotation, vesselType, isSelected = false) {
const path = VESSEL_ICONS[vesselType] || VESSEL_ICONS.default;
const color = VESSEL_COLORS[vesselType] || VESSEL_COLORS.default;
const size = 24;
const glowColor = isSelected ? 'rgba(255,255,255,0.8)' : color;
const glowSize = isSelected ? '8px' : '4px';
return L.divIcon({
className: 'vessel-marker' + (isSelected ? ' selected' : ''),
html: `<svg width="${size}" height="${size}" viewBox="0 0 24 24" style="transform: rotate(${rotation}deg); filter: drop-shadow(0 0 ${glowSize} ${glowColor});">
<path fill="${color}" d="${path}"/>
</svg>`,
iconSize: [size, size],
iconAnchor: [size/2, size/2]
});
}
// Legacy function for vessel list icons (returns SVG string)
function getShipIconSvg(type, size = 18) {
const vesselType = getVesselIconType(type);
const path = VESSEL_ICONS[vesselType] || VESSEL_ICONS.default;
const color = VESSEL_COLORS[vesselType] || VESSEL_COLORS.default;
return `<svg width="${size}" height="${size}" viewBox="0 0 24 24" style="vertical-align: middle;">
<path fill="${color}" d="${path}"/>
</svg>`;
} }
// Navigation status text // Navigation status text
@@ -544,20 +604,9 @@
if (!vessel.lat || !vessel.lon) return; if (!vessel.lat || !vessel.lon) return;
const heading = vessel.heading || vessel.course || 0; const heading = vessel.heading || vessel.course || 0;
const icon = getShipIcon(vessel.ship_type); const vesselType = getVesselIconType(vessel.ship_type);
const isSelected = mmsi === selectedMmsi;
const markerHtml = ` const divIcon = createVesselMarkerIcon(heading, vesselType, isSelected);
<div class="vessel-marker-inner" style="transform: rotate(${heading}deg);">
${icon}
</div>
`;
const divIcon = L.divIcon({
className: 'vessel-marker' + (mmsi === selectedMmsi ? ' selected' : ''),
html: markerHtml,
iconSize: [24, 24],
iconAnchor: [12, 12]
});
if (markers[mmsi]) { if (markers[mmsi]) {
markers[mmsi].setLatLng([vessel.lat, vessel.lon]); markers[mmsi].setLatLng([vessel.lat, vessel.lon]);
@@ -573,13 +622,17 @@
} }
function selectVessel(mmsi) { function selectVessel(mmsi) {
const prevSelected = selectedMmsi;
selectedMmsi = mmsi; selectedMmsi = mmsi;
// Update marker styles // Update marker icons for previous and new selection
Object.keys(markers).forEach(m => { [prevSelected, mmsi].forEach(m => {
const el = markers[m].getElement(); if (m && vessels[m] && markers[m]) {
if (el) { const vessel = vessels[m];
el.querySelector('.vessel-marker-inner')?.parentElement?.classList.toggle('selected', m === mmsi); const heading = vessel.heading || vessel.course || 0;
const vesselType = getVesselIconType(vessel.ship_type);
const isSelected = m === mmsi;
markers[m].setIcon(createVesselMarkerIcon(heading, vesselType, isSelected));
} }
}); });
@@ -595,13 +648,13 @@
function showVesselDetails(vessel) { function showVesselDetails(vessel) {
const container = document.getElementById('selectedInfo'); const container = document.getElementById('selectedInfo');
const icon = getShipIcon(vessel.ship_type); const iconSvg = getShipIconSvg(vessel.ship_type, 28);
const category = getShipCategory(vessel.ship_type); const category = getShipCategory(vessel.ship_type);
const navStatus = NAV_STATUS[vessel.nav_status] || vessel.nav_status_text || 'Unknown'; const navStatus = NAV_STATUS[vessel.nav_status] || vessel.nav_status_text || 'Unknown';
container.innerHTML = ` container.innerHTML = `
<div class="vessel-header"> <div class="vessel-header">
<div class="vessel-icon">${icon}</div> <div class="vessel-icon">${iconSvg}</div>
<div> <div>
<div class="vessel-name">${vessel.name || 'Unknown Vessel'}</div> <div class="vessel-name">${vessel.name || 'Unknown Vessel'}</div>
<div class="vessel-mmsi">MMSI: ${vessel.mmsi}</div> <div class="vessel-mmsi">MMSI: ${vessel.mmsi}</div>
@@ -676,12 +729,12 @@
} }
container.innerHTML = vesselArray.map(v => { container.innerHTML = vesselArray.map(v => {
const icon = getShipIcon(v.ship_type); const iconSvg = getShipIconSvg(v.ship_type, 20);
const category = getShipCategory(v.ship_type); const category = getShipCategory(v.ship_type);
return ` return `
<div class="vessel-item ${v.mmsi === selectedMmsi ? 'selected' : ''}" <div class="vessel-item ${v.mmsi === selectedMmsi ? 'selected' : ''}"
data-mmsi="${v.mmsi}" onclick="selectVessel('${v.mmsi}')"> data-mmsi="${v.mmsi}" onclick="selectVessel('${v.mmsi}')">
<div class="vessel-item-icon">${icon}</div> <div class="vessel-item-icon">${iconSvg}</div>
<div class="vessel-item-info"> <div class="vessel-item-info">
<div class="vessel-item-name">${v.name || 'Unknown'}</div> <div class="vessel-item-name">${v.name || 'Unknown'}</div>
<div class="vessel-item-type">${category} | ${v.mmsi}</div> <div class="vessel-item-type">${category} | ${v.mmsi}</div>
utils/sdr/rtlsdr.py
+1 -1
View File
@@ -179,7 +179,7 @@ class RTLSDRCommandBuilder(CommandBuilder):
cmd = [ cmd = [
'AIS-catcher', 'AIS-catcher',
f'-d:{device.index}', # Device index (colon format required) f'-d:{device.index}', # Device index (colon format required)
'-S', str(tcp_port), 'JSON', # TCP server with JSON output '-S', str(tcp_port), 'JSON_FULL', 'on', # TCP server with full JSON output
'-q', # Quiet mode (less console output) '-q', # Quiet mode (less console output)
] ]