eliott/worldmonitor
1
0
Fork 0
mirror of https://github.com/koala73/worldmonitor.git synced 2026-04-25 17:14:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(aviation): route callsign search through Wingbits relay, suppress simulated fallback (#2019)

Browse Source 
- Extend /wingbits/track relay endpoint to accept ?callsign=EK36 without bbox,
  using global bounding box (-80/-180/80/180) for worldwide aircraft lookup
- Filter by callsign in relay response loop to return only matching flights
- Server: try Wingbits for callsign-only searches (previously only tried for bbox)
- Server: return empty positions (not simulated) for explicit callsign/icao24 lookups
- Client: filter out simulated-source positions before displaying search results
This commit is contained in:
Elie Habib
2026-03-21 22:57:03 +04:00
committed by GitHub
parent d7a21ddd40
commit 7008cd5959
3 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/ais-relay.cjs
View File

@@ -3085,20 +3085,25 @@ async function handleWingbitsTrackRequest(req, res) {
const url = new URL(req.url, 'http://localhost');
const params = url.searchParams;
const callsignFilter = (params.get('callsign') || '').trim().toUpperCase();
const laminStr = params.get('lamin');
const lominStr = params.get('lomin');
const lamaxStr = params.get('lamax');
const lomaxStr = params.get('lomax');
if (!laminStr || !lominStr || !lamaxStr || !lomaxStr) {
// For callsign-only searches (no bbox), use a global area so Wingbits can find the aircraft
// regardless of where it currently is.
const isGlobalSearch = callsignFilter && (!laminStr || !lominStr || !lamaxStr || !lomaxStr);
if (!isGlobalSearch && (!laminStr || !lominStr || !lamaxStr || !lomaxStr)) {
return safeEnd(res, 400, { 'Content-Type': 'application/json' },
JSON.stringify({ error: 'Missing bbox params: lamin, lomin, lamax, lomax', positions: [] }));
}
const lamin = Number(laminStr);
const lomin = Number(lominStr);
const lamax = Number(lamaxStr);
const lomax = Number(lomaxStr);
const lamin = isGlobalSearch ? -80 : Number(laminStr);
const lomin = isGlobalSearch ? -180 : Number(lominStr);
const lamax = isGlobalSearch ? 80 : Number(lamaxStr);
const lomax = isGlobalSearch ? 180 : Number(lomaxStr);
if (!Number.isFinite(lamin) || !Number.isFinite(lomin) || !Number.isFinite(lamax) || !Number.isFinite(lomax)) {
return safeEnd(res, 400, { 'Content-Type': 'application/json' },
@@ -3109,7 +3114,8 @@ async function handleWingbitsTrackRequest(req, res) {
const centerLon = (lomin + lomax) / 2;
const widthNm = Math.abs(lomax - lomin) * 60 * Math.cos(centerLat * Math.PI / 180);
const heightNm = Math.abs(lamax - lamin) * 60;
const areas = [{ alias: 'viewport', by: 'box', la: centerLat, lo: centerLon, w: widthNm, h: heightNm, unit: 'nm' }];
const alias = isGlobalSearch ? `callsign-search-${callsignFilter}` : 'viewport';
const areas = [{ alias, by: 'box', la: centerLat, lo: centerLon, w: widthNm, h: heightNm, unit: 'nm' }];
try {
const resp = await fetch('https://customer-api.wingbits.com/v1/flights', {
@@ -3142,6 +3148,11 @@ async function handleWingbitsTrackRequest(req, res) {
for (const f of flightList) {
const icao24 = f.h || f.icao24 || f.id || '';
if (!icao24 || seenIds.has(icao24)) continue;
// For callsign searches, skip non-matching flights early to keep response small.
if (callsignFilter) {
const cs = (f.f || f.callsign || f.flight || '').trim().toUpperCase();
if (!cs.includes(callsignFilter)) continue;
}
seenIds.add(icao24);
const lat = f.la ?? f.latitude ?? f.lat ?? 0;
const lon = f.lo ?? f.longitude ?? f.lon ?? f.lng ?? 0;