Skip to content

Statistics #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukePrior merged 2 commits into from
Aug 13, 2021
Merged

Statistics #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf70906
statistics
LukePrior Aug 13, 2021
3d6e666
Merge branch 'testing' of https://github.com/LukePrior/sondehub-track…
LukePrior Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,18 @@
</header>

<div id="recoveriesbox" style="display: none" class="flatpage">
<div class="slimContainer">
<h2>Leaderboard</h2>
<hr/>
<p>This is a record of who has recovered the most sondes.</p>
<hr/>
<div id="leaderboard-list">No leaderboard data :-(</div>
</div>
<div class="slimContainer">
<h2>Recoveries</h2>
<hr/>
<p>Recovery reports can be added on the Chase-Car pane.</p>
<hr/>
<div id="recovery-list">No recent recoveries :-(</div>
</div>
<div class="slimContainer">
<h2>Statistics</h2>
<hr/>
<div id="leaderboard-list">No leaderboard data :-(</div>
</div>
</div>
<div id="aboutbox" style="display: none" class="flatpage">
<div class="slimContainer">
Expand Down
64 changes: 38 additions & 26 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3605,34 +3605,40 @@ function updateRecoveryMarker(recovery) {

if(!r) return;
ls_recoveries = true;

var dateNow = Date.now();


var i = 0, ii = r.length;
for(; i < ii; i++) {
var lat = parseFloat(r[i].lat);
var lon = parseFloat(r[i].lon);

if(lat < -90 || lat > 90 || lon < -180 || lon > 180) continue;

var r_index = $.inArray(r[i].serial, recovery_names);

if(r_index == -1) {
recovery_names.push(r[i].serial);
r_index = recovery_names.length - 1;
recoveries[r_index] = {marker: null, infobox: null};
}

var recovery = recoveries[r_index];
recovery.serial = r[i].serial;
recovery.lat = lat;
recovery.lon = lon;
recovery.recovered_by = r[i].recovered_by;
recovery.alt = parseFloat(r[i].alt);
recovery.recovered = r[i].recovered;
recovery.description = r[i].description;
recovery.datetime = r[i].datetime;
recovery.fresh = true;

updateRecoveryMarker(recovery);
var date = Date.parse(r[i].datetime);
if (((dateNow - date) / 86400000) < 3) {
var lat = parseFloat(r[i].lat);
var lon = parseFloat(r[i].lon);

if(lat < -90 || lat > 90 || lon < -180 || lon > 180) continue;

var r_index = $.inArray(r[i].serial, recovery_names);

if(r_index == -1) {
recovery_names.push(r[i].serial);
r_index = recovery_names.length - 1;
recoveries[r_index] = {marker: null, infobox: null};
}

var recovery = recoveries[r_index];
recovery.serial = r[i].serial;
recovery.lat = lat;
recovery.lon = lon;
recovery.recovered_by = r[i].recovered_by;
recovery.alt = parseFloat(r[i].alt);
recovery.recovered = r[i].recovered;
recovery.description = r[i].description;
recovery.datetime = r[i].datetime;
recovery.fresh = true;

updateRecoveryMarker(recovery);
}
}

// clear old recovery markers
Expand Down Expand Up @@ -3708,11 +3714,13 @@ function updateLeaderboardPane(r){
if(!r) return;

html = "";
var leaderboard = [];
var leaderboard = {};
var recovered = 0;

var i = 0, ii = r.length;
for(; i < ii; i++) {
if (r[i].recovered) {
recovered+=1;
if (leaderboard.hasOwnProperty(r[i].recovered_by)) {
leaderboard[r[i].recovered_by] = leaderboard[r[i].recovered_by] + 1;
} else {
Expand All @@ -3732,6 +3740,10 @@ function updateLeaderboardPane(r){

var list = sortable.slice(0,5);

html += "<div><b>Total sondes recovered: " + recovered + "/" + r.length + "</b></div>";
html += "<div><b>Total hunters: " + sortable.length + "</b></div><br>";
html += "<div><b>Leaderboard: </b></div>";

for (var i = 0; i < list.length; i++) {
html += "<div><b>" + (parseInt(i)+1) + ". </b>" + list[i][0] + " - " + list[i][1] + "</div>";
}
Expand Down