ADSB updates

This commit is contained in:
2026-06-25 09:13:16 -04:00
parent e91876b7b7
commit 19d2dd2d9d
3 changed files with 53 additions and 59 deletions

View File

@@ -1,37 +1,46 @@
import { cfg } from './config.mjs'
import { readFile } from 'fs/promises'
import { resolve, dirname } from 'path'
import { fileURLToPath } from 'url'
import {cfg} from './config.mjs';
import {readFile} from 'fs/promises';
import {resolve, dirname} from 'path';
import {fileURLToPath} from 'url';
const DIR = dirname(fileURLToPath(import.meta.url))
const SHAPES_PATH = resolve(DIR, '../public/aircraft.json')
const DIR = dirname(fileURLToPath(import.meta.url));
const SHAPES_PATH = resolve(DIR, '../public/aircraft.json');
const history = new Map() // icao -> [{lat, lon, alt, ts}]
const MAX_HISTORY = 500
const history = new Map(); // icao -> [{lat, lon, alt, ts}]
const MAX_HISTORY = 500;
export async function getShapes() {
return JSON.parse(await readFile(SHAPES_PATH, 'utf8'))
return JSON.parse(await readFile(SHAPES_PATH, 'utf8'));
}
export async function getAirTraffic() {
const { ADSB_URL } = cfg()
if (!ADSB_URL) return { data: [] }
const r = await fetch(`${ADSB_URL}/data/aircraft.json`)
const j = await r.json()
const aircraft = j.aircraft || []
export async function getADSB() {
const {ADSB_URL} = cfg();
if(!ADSB_URL) return {data: []};
const r = await fetch(`${ADSB_URL}/data/aircraft.json`);
const j = await r.json();
const aircraft = j.aircraft || [];
for (const a of aircraft) {
if (!a.hex || !a.lat || !a.lon) continue
const key = a.hex.toLowerCase()
if (!history.has(key)) history.set(key, [])
const trail = history.get(key)
trail.unshift({ latitude: a.lat, longitude: a.lon, altitude: a.alt_baro || 0, ts: Date.now() })
if(trail.length > MAX_HISTORY) trail.shift()
for(const a of aircraft) {
if(!a.hex || !a.lat || !a.lon) continue;
const key = a.hex.toLowerCase();
if(!history.has(key)) history.set(key, []);
const trail = history.get(key);
trail.push({latitude: a.lat, longitude: a.lon, altitude: a.alt_baro || 0, ts: Date.now()});
if(trail.length > MAX_HISTORY) trail.shift();
}
return { data: aircraft }
return {data: aircraft};
}
export async function getAIS() {
const {ADSB_URL} = cfg();
if(!ADSB_URL) return {data: []};
const r = await fetch(`${ADSB_URL}:9990/api/ships_array.json`);
const j = await r.json();
console.log('todo');
// TODO
}
export async function getAirTrafficHistory(icao) {
return { history: history.get(icao?.toLowerCase()) || [] }
return {history: history.get(icao?.toLowerCase()) || []};
}

View File

@@ -1,18 +1,18 @@
import express from 'express';
import {resolve, dirname} from 'path';
import {fileURLToPath} from 'url';
import {cfg, localDateStr, tzOffsetMinutes} from './config.mjs';
import {cfg, localDateStr} from './config.mjs';
import {queryCurrent, queryHourly, queryDaily, getCoords} from './influx.mjs';
import {getCelestialCurrent, getCelestialForecast} from './celestial.mjs';
import {getSpaceWeather} from './space.mjs';
import {apiReference} from '@scalar/express-api-reference';
import {spec} from './spec.mjs';
import {existsSync} from 'fs';
import {getAirTraffic, getAirTrafficHistory, getShapes} from './airtraffic.mjs';
import {getADSB, getAirTrafficHistory, getAIS, getShapes} from './airtraffic.mjs';
import {getWeatherCondition} from './openweather.mjs';
import {lastForecast, getForecast, forecastTTL} from './forecast.mjs';
import {dailyWeather, hourlyWeather} from './openmeteo.mjs';
import {Aurora} from './aurora.mjs';
// import {Aurora} from './aurora.mjs';
// ── Uncaught error handlers ───────────────────────────────────────────────────
@@ -146,7 +146,7 @@ app.get('/api/position', async (req, res) => {
// ── Space ─────────────────────────────────────────────────────────────────────
app.get('/api/aurora', async (req, res) => res.json(await Aurora.get()));
// app.get('/api/aurora', async (req, res) => res.json(await Aurora.get()));
app.get('/api/space', async (req, res) => {
const {fields} = req.query;
res.json(filterFields(await getSpaceWeather(), fields));
@@ -154,9 +154,10 @@ app.get('/api/space', async (req, res) => {
// ── ADSB Proxy ────────────────────────────────────────────────────────────────
app.get('/api/air-traffic', async (req, res) => res.json(await getAirTraffic()));
app.get('/api/air-traffic/:icao', async (req, res) => res.json(await getAirTrafficHistory(req.params.icao)));
app.get('/api/air-traffic-shapes', async (req, res) => res.json(await getShapes()));
app.get('/api/adsb', async (req, res) => res.json(await getADSB()));
app.get('/api/adsb/:icao', async (req, res) => res.json(await getAirTrafficHistory(req.params.icao)));
app.get('/api/ais', async (req, res) => res.json(await getAIS()));
app.get('/api/vehicles', async (req, res) => res.json(await getShapes()));
// ── DOCS ──────────────────────────────────────────────────────────────────────