Compare commits

...

2 Commits

Author SHA1 Message Date
f6f8a252dc Merge branch 'master' of git.zakscode.com:ztimson/weather-station
# Conflicts:
#	server/src/ais.mjs
2026-06-25 20:52:51 -04:00
a73c5ff95b AIS fix 2026-06-25 20:52:12 -04:00

View File

@@ -1,8 +1,11 @@
import {cfg} from './config.mjs';
const CHANNEL_MAP = {0: 'A, B', 1: 'A', 2: 'B'};
const SENDER_TYPE = {
0: 'Unknown', 1: 'Base Station', 2: 'Class A',
3: 'Class B', 4: 'SAR Aircraft', 5: 'Aid to Navigation',
6: 'Class B CS', 7: 'Sart/Epirb/MOB'
0: 'Other', 1: 'Unknown', 2: 'Cargo', 3: 'Class B',
4: 'Passenger', 5: 'Special', 6: 'Tanker', 7: 'High Speed',
8: 'Fishing', 9: 'Aircraft', 10: 'Helicopter', 11: 'Base Station',
12: 'AtoN', 13: 'SART/EPIRB'
};
function decodeMsgTypes(raw) {
@@ -44,7 +47,7 @@ export async function getAIS() {
return dynamic.map(row => {
const [mmsi, lat, lon, distance, bearing, heading,
cog, speed, status, level, ppm, count, msg_type,
cog, speed, status, rrsi, ppm, count, msg_type,
last_signal, last_group, group_mask, flags, altitude,
received_stations, mmsi_type, shipclass, country] = row;
const s = staticMap.get(mmsi) ?? [];
@@ -56,12 +59,12 @@ export async function getAIS() {
return {
mmsi,
type: SENDER_TYPE[mmsi_type],
type: SENDER_TYPE[shipclass],
lat, lon, altitude,
heading, cog, speed,
distance, bearing,
destination,
level, ppm, count,
rrsi, ppm, count,
msg_type: decodeMsgTypes(msg_type),
channels: CHANNEL_MAP[f.channels] ?? f.channels,
...f,