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

Add a loading progress bar, as it can be slow with internal webserver (100ms/request)

Browse source 
plus large history (120 requests).

(cherry picked from commit e1b0b7a5b6759bb7a59536efcc4d6652d92dda16)
This commit is contained in:
Oliver Jowett 2015-01-15 22:23:15 +00:00
parent 870233977c
commit dd734debc3
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public_html/gmap.html
View file

@ -17,6 +17,7 @@
<body onload="initialize()"> <body onload="initialize()">
<div id="loader" class="hidden"> <div id="loader" class="hidden">
<img src="spinny.gif" id="spinny"> <img src="spinny.gif" id="spinny">
<progress id="loader_progress"></progress>
</div> </div>
<div id="map_container"> <div id="map_container">

7
public_html/script.js
View file

@ -166,6 +166,8 @@ function initialize() {
ReceiverClock.tick = (function(){}) ReceiverClock.tick = (function(){})
} }
$("#loader").removeClass("hidden");
// Get receiver metadata, reconfigure using it, then continue // Get receiver metadata, reconfigure using it, then continue
// with initialization // with initialization
$.getJSON('data/receiver.json') $.getJSON('data/receiver.json')
@ -192,8 +194,8 @@ var CurrentHistoryFetch = null;
var PositionHistoryBuffer = [] var PositionHistoryBuffer = []
function start_load_history() { function start_load_history() {
if (PositionHistorySize > 0) { if (PositionHistorySize > 0) {
console.log("Starting to load history"); $("#loader_progress").attr('max',PositionHistorySize);
$("#loader").removeClass("hidden"); console.log("Starting to load history (" + PositionHistorySize + " items)");
load_history_item(0); load_history_item(0);
} else { } else {
endLoadHistory(); endLoadHistory();
@ -207,6 +209,7 @@ function load_history_item(i) {
} }
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,

1
public_html/style.css
View file

@ -17,6 +17,7 @@ div#update_error { position: absolute; bottom: 25px; left: 25px; border: 2px sol
div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right: 0; background: #000; opacity: 0.8; filter: alpha(opacity=80); } div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right: 0; background: #000; opacity: 0.8; filter: alpha(opacity=80); }
#spinny { width: 128px; height: 128px; position: absolute; top: 50%; left: 50%; margin: -64px 0 0 -64px; } #spinny { width: 128px; height: 128px; position: absolute; top: 50%; left: 50%; margin: -64px 0 0 -64px; }
#loader_progress { width: 250px; height: 20px; position: absolute; top: 50%; left: 50%; margin: 128px 0 0 -125px; }
#tableinfo, #sudo_buttons { font-size: x-small; font-family: monospace; } #tableinfo, #sudo_buttons { font-size: x-small; font-family: monospace; }