Miko/tar1090
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert last commit and improve the regloaded logic

Browse Source
This commit is contained in:
Matthias Wirth
2021-05-12 18:17:55 +02:00
parent 37241a9051
commit b84acd6d2e
2 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
html/planeObject.js
View File

@@ -39,8 +39,7 @@ function PlaneObject(icao) {
this.typeLong = null;
this.wtc = null;
this.regLoaded = this.registration != null;
this.dbinfoLoaded = false;
// request metadata
this.checkForDB();
@@ -2032,11 +2031,8 @@ PlaneObject.prototype.getAircraftData = function() {
let req = dbLoad(this.icao);
req.done(function(data) {
if (this.regLoaded) {
return;
}
//console.log('fromDB');
this.regLoaded = true;
this.dbinfoLoaded = true;
if (data == null) {
//console.log(this.icao + ': Not found in database!');
return;
@@ -2078,10 +2074,12 @@ PlaneObject.prototype.getAircraftData = function() {
}.bind(this));
req.fail(function(jqXHR,textStatus,errorThrown) {
if (textStatus == 'timeout')
if (textStatus == 'timeout') {
this.getAircraftData();
else
} else {
console.log(this.icao + ': Database load error: ' + textStatus + ' at URL: ' + jqXHR.url);
this.dbinfoLoaded = true;
}
}.bind(this));
};
@@ -2403,36 +2401,35 @@ PlaneObject.prototype.setTypeData = function() {
};
PlaneObject.prototype.checkForDB = function(t) {
if (!(t && (t.r || t.t)) && !this.regLoaded && (!dbServer || showTrace || (!globeIndex && this.selected) || replay)) {
if (t) {
if (t.desc) this.typeLong = `${t.desc}`;
if (t.r) this.registration = `${t.r}`;
if (t.ownOp) this.ownOp = `${t.ownOp}`;
if (t.year) this.year = `${t.year}`;
if (t.t) {
this.icaoType = `${t.t}`;
this.setTypeData();
}
if (t.dbFlags) {
this.military = t.dbFlags & 1;
this.interesting = t.dbFlags & 2;
this.pia = t.dbFlags & 4;
this.ladd = t.dbFlags & 8;
if (this.pia)
this.registration = null;
}
if (t.r || t.t) {
//console.log('fromTrace');
this.dbinfoLoaded = true;
}
}
if (!this.dbinfoLoaded && (!dbServer || showTrace || (dbServer && !globeIndex && this.selected) || replay)) {
this.getAircraftData();
return;
}
if (!t) {
return;
}
if (t.desc) this.typeLong = `${t.desc}`;
if (t.r) this.registration = `${t.r}`;
if (t.ownOp) this.ownOp = `${t.ownOp}`;
if (t.year) this.year = `${t.year}`;
if (t.t) {
this.icaoType = `${t.t}`;
this.setTypeData();
}
if (t.dbFlags) {
this.military = t.dbFlags & 1;
this.interesting = t.dbFlags & 2;
this.pia = t.dbFlags & 4;
this.ladd = t.dbFlags & 8;
if (this.pia)
this.registration = null;
}
if (t.r || t.t) {
//console.log('fromTrace');
this.regLoaded = true;
}
this.dataChanged();
};
PlaneObject.prototype.updateAlt = function(t) {