MS0NTR-Radio-Club
/
dump1090-fa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore messages heard on 1090 when we hear them on 978. We will support multiple datasource display in a later release

This commit is contained in:
eric1tran 2021-03-03 20:15:50 +00:00
parent 77ab9f04ba
commit 5db6efd62d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public_html/planeObject.js
View File

@ -88,6 +88,7 @@ function PlaneObject(icao) {
this.heard_on_1090 = false; this.heard_on_1090 = false;
this.heard_on_978 = false; this.heard_on_978 = false;
this.heard_on_tisb = false; this.heard_on_tisb = false;
this.heard_on_adsr = false;
// request metadata // request metadata
getAircraftData(this.icao).done(function(data) { getAircraftData(this.icao).done(function(data) {
@ -327,7 +328,7 @@ PlaneObject.prototype.getDataSource = function() {
} }
// Classify as UAT if we heard it on 978 Mhz until we hear it from another source // Classify as UAT if we heard it on 978 Mhz until we hear it from another source
if (this.heard_on_978 && !this.heard_on_1090 && !this.heard_on_tisb) { if (this.heard_on_978 && !this.heard_on_tisb) {
return 'uat'; return 'uat';
} }
@ -551,16 +552,19 @@ PlaneObject.prototype.updateIcon = function() {
// Update our data // Update our data
PlaneObject.prototype.updateData = function(receiver_timestamp, data, receiver_source) { PlaneObject.prototype.updateData = function(receiver_timestamp, data, receiver_source) {
if (receiver_source == "dump1090-fa") {
this.heard_on_1090 = true;
// Ignore messages on 1090 for now if we heard it on 978. We will show multiple data sources in a later release
if (this.heard_on_978)
return
} else if (receiver_source == "skyaware978") {
this.heard_on_978 = true;
}
// Update all of our data // Update all of our data
this.messages = data.messages; this.messages = data.messages;
this.rssi = data.rssi; this.rssi = data.rssi;
this.last_message_time = receiver_timestamp - data.seen; this.last_message_time = receiver_timestamp - data.seen;
if (receiver_source == "dump1090-fa") {
this.heard_on_1090 = true;
} else if (receiver_source == "skyaware978") {
this.heard_on_978 = true;
}
// simple fields // simple fields
var fields = ["alt_baro", "alt_geom", "gs", "ias", "tas", "track", var fields = ["alt_baro", "alt_geom", "gs", "ias", "tas", "track",
@ -589,6 +593,10 @@ PlaneObject.prototype.updateData = function(receiver_timestamp, data, receiver_s
this.heard_on_tisb = true; this.heard_on_tisb = true;
} }
if (this.addrtype == "adsr_icao") {
this.heard_on_adsr = true;
}
// don't expire callsigns // don't expire callsigns
if ('flight' in data) if ('flight' in data)
this.flight = data.flight; this.flight = data.flight;