Skip to content

Fix rate calculations #37

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 10 commits into from
Jun 26, 2022
Merged

Fix rate calculations #37

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b65680b
Fix float
LukePrior May 11, 2022
ba74132
Merge branch 'projecthorus:main' into main
LukePrior May 11, 2022
595216f
support unique data fields
LukePrior May 11, 2022
0c42076
partial working max alt aprs filter
LukePrior May 11, 2022
efb86c5
Merge branch 'projecthorus:main' into main
LukePrior May 11, 2022
7cb77c7
Merge branch 'projecthorus:main' into main
LukePrior Jun 4, 2022
e932f8d
fix search bug
LukePrior Jun 4, 2022
5f90fd2
show radio for stations
LukePrior Jun 4, 2022
0e5d691
Merge branch 'projecthorus:main' into main
LukePrior Jun 4, 2022
7f19043
attempt average fix
LukePrior Jun 26, 2022
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
39 changes: 8 additions & 31 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2582,42 +2582,19 @@ function addPosition(position) {
}

if(dt >= 0) {
if(vehicle.num_positions > 0) {

//average over 5s if available
var old_ts = vehicle.positions_ts[vehicle.positions_ts.length - 5];
var dtt = (new_ts - old_ts) / 1000; // convert to seconds

if (vehicle.positions_ts.length < 5) {
dtt = 1000;
}

if(vehicle.num_positions > 0 && dt > 0) {
// calculate vertical rate
if (dtt > 10) {
var rate = (position.gps_alt - vehicle.curr_position.gps_alt) / dt;
if (!isNaN(rate) && isFinite(rate) && dt != 0) {
vehicle.ascent_rate = 0.7 * rate + 0.3 * vehicle.ascent_rate;
}
} else {
var rate = (position.gps_alt - vehicle.positions_alts[vehicle.positions_alts.length - 5]) / dtt;
if (!isNaN(rate) && isFinite(rate)) {
vehicle.ascent_rate = 0.7 * rate + 0.3 * vehicle.ascent_rate;
}
var rate = (position.gps_alt - vehicle.curr_position.gps_alt) / dt;
if (!isNaN(rate) && isFinite(rate)) {
vehicle.ascent_rate = 0.7 * rate + 0.3 * vehicle.ascent_rate;
}

// calculate horizontal rate
if (dtt > 10) {
horizontal_rate_temp = new_latlng.distanceTo(new L.LatLng(vehicle.curr_position.gps_lat, vehicle.curr_position.gps_lon)) / dt;
if (!isNaN(horizontal_rate_temp) && isFinite(horizontal_rate_temp) && dt != 0) {
vehicle.horizontal_rate = horizontal_rate_temp;
}
} else {
horizontal_rate_temp = new_latlng.distanceTo(vehicle.positions[vehicle.positions.length - 5]) / dtt;
if (!isNaN(horizontal_rate_temp)) {
vehicle.horizontal_rate = horizontal_rate_temp;
}
horizontal_rate_temp = new_latlng.distanceTo(new L.LatLng(vehicle.curr_position.gps_lat, vehicle.curr_position.gps_lon)) / dt;
if (!isNaN(horizontal_rate_temp) && isFinite(horizontal_rate_temp)) {
vehicle.horizontal_rate = horizontal_rate_temp;
}
}
}

// add the new position
if(wvar.mode == "Position") {
Expand Down