github-mirrors/blah2
1
0
Fork 0
mirror of https://github.com/30hours/blah2.git synced 2024-11-18 12:33:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add adsb2dd config url for offline

Browse source
This commit is contained in:
30hours 2024-02-18 01:48:50 +00:00
parent 1863403714
commit 134bbaeda0
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/server.js
View file

@ -71,7 +71,7 @@ app.get('/api/config', (req, res) => {
}); });
app.get('/api/adsb2dd', (req, res) => { app.get('/api/adsb2dd', (req, res) => {
if (config.truth.adsb.enabled == true) { if (config.truth.adsb.enabled == true) {
const api_url = "https://adsb2dd.30hours.dev/api/dd"; const api_url = "http://" + config.truth.adsb.adsb2dd + "/api/dd";
const api_query = const api_query =
api_url + api_url +
"?rx=" + config.location.rx.latitude + "," + "?rx=" + config.location.rx.latitude + "," +
@ -81,7 +81,7 @@ app.get('/api/adsb2dd', (req, res) => {
config.location.tx.longitude + "," + config.location.tx.longitude + "," +
config.location.tx.altitude + config.location.tx.altitude +
"&fc=" + (config.capture.fc / 1000000) + "&fc=" + (config.capture.fc / 1000000) +
"&server=" + "http://" + config.truth.adsb.ip; "&server=" + "http://" + config.truth.adsb.tar1090;
const jsonResponse = { const jsonResponse = {
url: api_query url: api_query
}; };

6
config/config.yml
View file

@ -50,9 +50,9 @@ network:
truth: truth:
adsb: adsb:
enabled: false enabled: true
ip: 'adsb.30hours.dev' tar1090: 'adsb.30hours.dev'
port: 80 adsb2dd: 'adsb2dd.30hours.dev'
ais: ais:
enabled: false enabled: false
ip: 0.0.0.0 ip: 0.0.0.0

4
config/radar4-usrp.yml
View file

@ -55,8 +55,8 @@ network:
truth: truth:
adsb: adsb:
enabled: false enabled: false
ip: 'adsb.30hours.dev' tar1090: 'adsb.30hours.dev'
port: 80 adsb2dd: 'adsb2dd.30hours.dev'
ais: ais:
enabled: false enabled: false
ip: 0.0.0.0 ip: 0.0.0.0

4
config/radar4.yml
View file

@ -51,8 +51,8 @@ network:
truth: truth:
adsb: adsb:
enabled: false enabled: false
ip: 'adsb.30hours.dev' tar1090: 'adsb.30hours.dev'
port: 80 adsb2dd: 'adsb2dd.30hours.dev'
ais: ais:
enabled: false enabled: false
ip: 0.0.0.0 ip: 0.0.0.0

3
html/js/plot_map.js
View file

@ -49,6 +49,9 @@ var configData = $.getJSON(urlConfig, function () { })
var adsbLinkData = $.getJSON(urlAdsbLink, function () { }) var adsbLinkData = $.getJSON(urlAdsbLink, function () { })
.done(function (data) { .done(function (data) {
urlAdsb = data.url; urlAdsb = data.url;
if (window.location.protocol === 'https:') {
urlAdsb = urlAdsb.replace(/^http:/, 'https:');
}
}) })
} }
}); });