ztimson/weather-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ztimson:14d9a43c32cdb505b2f5fa0cde5f84903b2a1baf
Branches Tags
ztimson:master
...
compare: ztimson:f6f8a252dc822dde356fc1217b3b1185f444e68d
Branches Tags
ztimson:master

2 Commits
14d9a43c32 ... f6f8a252dc

Author SHA1 Message Date
ztimson
f6f8a252dc Merge branch 'master' of git.zakscode.com:ztimson/weather-station 
# Conflicts:
#	server/src/ais.mjs
 2026-06-25 20:52:51 -04:00
ztimson
a73c5ff95b AIS fix 2026-06-25 20:52:12 -04:00
1 changed files with 9 additions and 6 deletions
Expand all files Collapse all files

15
server/src/ais.mjs
View File

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