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

make fetching more robust when low on resources

Browse Source
This commit is contained in:
Matthias Wirth
2019-10-14 21:23:06 +02:00
parent 019843d4e8
commit dfc3e36d9e
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
html/script.js
View File

@@ -233,11 +233,11 @@ function fetchData() {
var center = ol.proj.toLonLat(OLMap.getView().getCenter(), OLMap.getView().getProjection());
localStorage['CenterLon'] = CenterLon = center[0];
localStorage['CenterLat'] = CenterLat = center[1];
if (FetchPending != null && FetchPending.state() == 'pending') {
if (FetchPending != null) {
// don't double up on fetches, let the last one resolve
return;
}
if (FetchPendingUAT != null && FetchPendingUAT.state() == 'pending') {
if (FetchPendingUAT != null) {
// don't double up on fetches, let the last one resolve
return;
}
@@ -272,8 +272,12 @@ function fetchData() {
cache: false,
dataType: 'json' });
$.when(FetchPendingUAT).done(function(data) {
FetchPendingUAT.done(function(data) {
uat_data = data;
FetchPendingUAT = null;
});
FetchPendingUAT.fail(function(jqxhr, status, error) {
FetchPendingUAT = null;
});
}
FetchPending = $.ajax({ url: 'data/aircraft.json',
@@ -281,9 +285,10 @@ function fetchData() {
cache: false,
dataType: 'json' });
FetchPending.done(function(data) {
if (data == null)
if (data == null) {
FetchPending = null;
return;
}
// experimental stuff
/*
@@ -337,6 +342,7 @@ function fetchData() {
$("#update_error").css('display','none');
}
FetchPending = null;
});
FetchPending.fail(function(jqxhr, status, error) {
@@ -344,6 +350,7 @@ function fetchData() {
$("#update_error").css('display','block');
StaleReceiverCount++;
fetchData();
FetchPending = null;
});
}