AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #14 from daviessm/html_parallel_history_load

Browse source 
Parallelise the history JSON loads for faster initial load times.
This commit is contained in:
Oliver Jowett 2017-07-31 12:09:40 +01:00 committed by GitHub
parent 567600889f 14bbf09230
commit 51e3e1d677
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
public_html/script.js
View file

@ -328,24 +328,20 @@ function initialize() {
var CurrentHistoryFetch = null; var CurrentHistoryFetch = null;
var PositionHistoryBuffer = [] var PositionHistoryBuffer = []
var HistoryItemsReturned = 0;
function start_load_history() { function start_load_history() {
if (PositionHistorySize > 0 && window.location.hash != '#nohistory') { if (PositionHistorySize > 0 && window.location.hash != '#nohistory') {
$("#loader_progress").attr('max',PositionHistorySize); $("#loader_progress").attr('max',PositionHistorySize);
console.log("Starting to load history (" + PositionHistorySize + " items)"); console.log("Starting to load history (" + PositionHistorySize + " items)");
load_history_item(0); //Load history items in parallel
} else { for (var i = 0; i < PositionHistorySize; i++) {
end_load_history(); load_history_item(i);
}
} }
} }
function load_history_item(i) { function load_history_item(i) {
if (i >= PositionHistorySize) {
end_load_history();
return;
}
console.log("Loading history #" + i); console.log("Loading history #" + i);
$("#loader_progress").attr('value',i);
$.ajax({ url: 'data/history_' + i + '.json', $.ajax({ url: 'data/history_' + i + '.json',
timeout: 5000, timeout: 5000,
@ -354,12 +350,19 @@ function load_history_item(i) {
.done(function(data) { .done(function(data) {
PositionHistoryBuffer.push(data); PositionHistoryBuffer.push(data);
load_history_item(i+1); HistoryItemsReturned++;
$("#loader_progress").attr('value',HistoryItemsReturned);
if (HistoryItemsReturned == PositionHistorySize) {
end_load_history();
}
}) })
.fail(function(jqxhr, status, error) { .fail(function(jqxhr, status, error) {
// No more history //Doesn't matter if it failed, we'll just be missing a data point
HistoryItemsReturned++;
if (HistoryItemsReturned == PositionHistorySize) {
end_load_history(); end_load_history();
}
}); });
} }
@ -378,7 +381,7 @@ function end_load_history() {
// Process history // Process history
for (var h = 0; h < PositionHistoryBuffer.length; ++h) { for (var h = 0; h < PositionHistoryBuffer.length; ++h) {
now = PositionHistoryBuffer[h].now; now = PositionHistoryBuffer[h].now;
console.log("Applying history " + h + "/" + PositionHistoryBuffer.length + " at: " + now); console.log("Applying history " + (h + 1) + "/" + PositionHistoryBuffer.length + " at: " + now);
processReceiverUpdate(PositionHistoryBuffer[h]); processReceiverUpdate(PositionHistoryBuffer[h]);
// update track // update track