fix: correctly formatted ads-b exchange data

export a function for the specific opensky data, re-org code

bin/index.js

@@ -5,7 +5,7 @@ const cron = require('node-cron');
 const mod = require('../src/index.mjs').default;
 const logger = require('../src/lib/logger.mjs').default;
 
-const { index, interval, ...elasticsearch } = getopts(process.argv.slice(2), {
+const { index, interval, lat, lon, radius, ...elasticsearch } = getopts(process.argv.slice(2), {
   string: ['host', 'auth', 'log', 'index'],
   alias: {
     h: 'host',
@@ -19,6 +19,9 @@ const { index, interval, ...elasticsearch } = getopts(process.argv.slice(2), {
     log: 'error',
     index: 'adsb-data',
     interval: 0,
+    lat: 33.433638,
+    lon: -112.008113,
+    radius: 1000,
   },
 });
 
@@ -28,7 +31,7 @@ function handleError(err) {
 }
 
 async function fetchAndIndex() {
-  return mod(index, { elasticsearch });
+  return mod(index, { elasticsearch, filter: { lat, lon, radius } });
 }
 
 async function run() {

src/index.mjs

@@ -1,9 +1,7 @@
 import elasticsearch from 'elasticsearch';
 import logger from './lib/logger.mjs';
 import { createIndex, bulkInsert } from './lib/data-source.mjs';
-import getData from './lib/get-data.mjs';
+import { getAdbsExchangeData } from './lib/get-data.mjs';
-
-const positionSourceMap = ['ADS-B', 'ASTERIX', 'MLAT'];
 
 export default async function(indexName, opts = {}) {
   const client = new elasticsearch.Client({
@@ -18,29 +16,9 @@ export default async function(indexName, opts = {}) {
   // create the target index
   const index = await createIndex(client, indexName);
 
-  const records = await getData();
+  const records = await getAdbsExchangeData(opts.filter);
-  logger.debug(`ADS-B records:, ${records.length}`);
+  logger.debug(`Record count:, ${records.length}`);
 
-  // index all the data
+  await bulkInsert(client, index, records);
-  const documents = records.map(rec => ({
-    transponder: `${rec[0]}`.toLowerCase(),
-    callsign: `${rec[1]}`.trim(),
-    origin_country: rec[2],
-    time_position: new Date(rec[3] * 1000),
-    last_contact: new Date(rec[4] * 1000),
-    location: rec[5] && rec[6] ? `${rec[6]},${rec[5]}` : null,
-    lat: rec[6],
-    lon: rec[5],
-    baro_altitude: rec[7],
-    geo_altitude: rec[13],
-    on_ground: rec[8],
-    velocity: rec[9],
-    vertical_rate: rec[11],
-    squawk: rec[14],
-    spi: rec[15],
-    position_source: positionSourceMap[rec[16]],
-  }));
-
-  await bulkInsert(client, index, documents);
   logger.debug(`Successfully indexed ${records.length} records to ${index}`);
 }

src/lib/data-source.mjs

@@ -26,6 +26,9 @@ export async function createIndex(client, index) {
         mappings: {
           [doctype]: {
             properties: {
+              operator: { type: 'keyword' },
+              aircraft: { type: 'text' },
+              aircraft_manufacturer: { type: 'keyword' },
               transponder: { type: 'keyword' },
               callsign: { type: 'keyword' },
               origin_country: { type: 'keyword' },
@@ -42,6 +45,8 @@ export async function createIndex(client, index) {
               squawk: { type: 'keyword' },
               spi: { type: 'boolean' },
               position_source: { type: 'keyword' },
+              from: { type: 'text' },
+              to: { type: 'text' },
             },
           },
         },

src/lib/fetch.mjs

@@ -1,13 +1,9 @@
 import axios from 'axios';
 
-const api = 'https://opensky-network.org/api';
-
 export default axios.create({
-  baseURL: api,
+  timeout: 5000,
-  timeout: 3000,
   responseType: 'json',
   headers: {
-    'X-Custom-Header': 'foobar',
     'Content-Type': 'application/json; charset=utf-8',
   },
 });

src/lib/get-data.mjs

@@ -1,6 +1,57 @@
 import fetch from './fetch.mjs';
 
-export default async function getData() {
+export async function getOpenskyData() {
-  const res = await fetch.get('/states/all');
+  const positionSourceMap = ['ADS-B', 'ASTERIX', 'MLAT'];
-  return res.data.states;
+  const res = await fetch.get(`https://opensky-network.org/api/states/all`);
+  return res.data.states.map(rec => ({
+    transponder: `${rec[0]}`.toLowerCase(),
+    callsign: `${rec[1]}`.trim(),
+    origin_country: rec[2],
+    time_position: new Date(rec[3] * 1000),
+    last_contact: new Date(rec[4] * 1000),
+    location: rec[5] && rec[6] ? `${rec[6]},${rec[5]}` : null,
+    lat: rec[6],
+    lon: rec[5],
+    baro_altitude: rec[7],
+    geo_altitude: rec[13],
+    on_ground: rec[8],
+    velocity: rec[9],
+    vertical_rate: rec[11],
+    squawk: rec[14],
+    spi: rec[15],
+    position_source: positionSourceMap[rec[16]],
+  }));
+}
+
+export async function getAdbsExchangeData({ lat, lon, radius }) {
+  const positionSourceMap = ['Unknown', 'Mode-S', 'ADS-B', 'ADS-B', 'ADS-B', 'ADS-B'];
+  const formatNumber = str => str && Number(`${str}`.replace(/[^0-9.-]/, ''));
+
+  const res = await fetch.get(
+    `http://public-api.adsbexchange.com/VirtualRadar/AircraftList.json?lat=${lat}&lng=${lon}&fDstL=0&fDstU=${radius}`
+  );
+
+  return res.data.acList.map(rec => ({
+    transponder: `${rec.Icao}`.toLowerCase(),
+    callsign: `${rec.Call}`.trim(),
+    origin_country: rec.Cou,
+    time_position: new Date(rec.PosTime),
+    last_contact: new Date(rec.PosTime),
+    location: rec.Lat && rec.Long ? `${rec.Lat},${rec.Long}` : null,
+    lat: rec.Lat,
+    lon: rec.Long,
+    baro_altitude: formatNumber(rec.Alt),
+    geo_altitude: formatNumber(rec.GAlt),
+    on_ground: rec.Gnd,
+    velocity: formatNumber(rec.Spd),
+    vertical_rate: formatNumber(rec.Vsi),
+    squawk: rec.Sqk,
+    spi: false,
+    position_source: positionSourceMap[rec.Trt],
+    operator: rec.Op,
+    aircraft: rec.Mdl,
+    aircraft_manufacturer: rec.Man,
+    from: rec.From,
+    to: rec.To,
+  }));
 }