From 295d7ffa80fca73018e2380ad0aecf7c7a47b319 Mon Sep 17 00:00:00 2001 From: joe fleming Date: Fri, 2 Nov 2018 14:54:47 -0700 Subject: [PATCH] feat: use ads-b exchange data --- bin/index.js | 7 +++++-- src/index.mjs | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/index.js b/bin/index.js index 0bdb231..0fd0a81 100644 --- a/bin/index.js +++ b/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() { diff --git a/src/index.mjs b/src/index.mjs index 0e116d7..4149031 100644 --- a/src/index.mjs +++ b/src/index.mjs @@ -1,8 +1,7 @@ import elasticsearch from 'elasticsearch'; import logger from './lib/logger.mjs'; import { createIndex, bulkInsert } from './lib/data-source.mjs'; -import { getOpenskyData } from './lib/get-data.mjs'; - +import { getAdbsExchangeData } from './lib/get-data.mjs'; export default async function(indexName, opts = {}) { const client = new elasticsearch.Client({ @@ -17,7 +16,7 @@ export default async function(indexName, opts = {}) { // create the target index const index = await createIndex(client, indexName); - const records = await getOpenskyData(); + const records = await getAdbsExchangeData(opts.filter); logger.debug(`Record count:, ${records.length}`); await bulkInsert(client, index, records);