Skip to content

More efficient rate calculation #40

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

More efficient rate calculation #40

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebe984e
Merge pull request #1 from projecthorus/main
LukePrior Jun 26, 2022
72dcf4b
fix crash
LukePrior Jun 26, 2022
970eaa9
fix
LukePrior Jun 26, 2022
b25f69a
update parameters
LukePrior Jun 26, 2022
4cc2aef
more efficient
LukePrior Jun 26, 2022
743f0d6
Merge branch 'main' into main
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
19 changes: 12 additions & 7 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2585,24 +2585,29 @@ function addPosition(position) {
if(vehicle.num_positions > 0 && dt > 0) {
var search_ts = new_ts - 10000

function searchPositions(time) {
return time <= search_ts
function searchPositions(times) {
for (i = times.length; i >= 0; i--) {
if (times[i] <= search_ts) {
return times[i]
}
}
return null
}

var search_matches = vehicle.positions_ts.filter(searchPositions)
var search_match = searchPositions(vehicle.positions_ts)
var search_index = vehicle.positions_ts.indexOf(search_match)

if (search_matches.length > 0 && search_matches[search_matches.length-1] >= search_ts - 5000) {
var search_match = search_matches[search_matches.length-1]
if (search_match != null && search_match >= search_ts - 5000) {
var dtt = (curr_ts - search_match) / 1000;

// calculate vertical rate
var rate = (position.gps_alt - vehicle.positions_alts[search_matches.length-1]) / dtt;
var rate = (position.gps_alt - vehicle.positions_alts[search_index]) / dtt;
if (!isNaN(rate) && isFinite(rate)) {
vehicle.ascent_rate = 0.2 * rate + 0.8 * vehicle.ascent_rate;
}

// calculate horizontal rate
horizontal_rate_temp = new_latlng.distanceTo(vehicle.positions[search_matches.length-1]) / dtt;
horizontal_rate_temp = new_latlng.distanceTo(vehicle.positions[search_index]) / dtt;
if (!isNaN(horizontal_rate_temp) && isFinite(horizontal_rate_temp)) {
vehicle.horizontal_rate = horizontal_rate_temp;
}
Expand Down