Skip to content

Fix Search Bug #35

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
merged 7 commits into from
Jun 4, 2022
Merged

Fix Search Bug #35

Changes from 1 commit
Commits
Show all changes
7 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
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
Next Next commit
Fix float
  • Loading branch information
@LukePrior
LukePrior committed May 11, 2022
commit b65680b1efd2caaf51c3039091a54da8677bdd63
18 changes: 14 additions & 4 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
'<img class="'+((vehicle.vehicle_type=="car")?'car':'')+'" src="'+image+'" />' +
'<span class="vbutton path '+((vehicle.polyline_visible) ? 'active' : '')+'" data-vcallsign="'+vcallsign+'"' + ' style="top:'+(vehicle.image_src_size[1]+55)+'px">Path</span>' +
((vehicle.vehicle_type!="car") ? '<span class="sbutton" onclick="shareVehicle(\'' + vcallsign + '\')" style="top:'+(vehicle.image_src_size[1]+85)+'px">Share</span>' : '') +
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 1000 && vehicle.ascent_rate < 1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:'+(vehicle.image_src_size[1]+115)+'px">Float</span>' : '') +
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 5000 && vehicle.ascent_rate < 1 && vehicle.ascent_rate > -1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:'+(vehicle.image_src_size[1]+115)+'px">Float</span>' : '') +
'<div class="left">' +
'<dl>';
//mobile
Expand All @@ -1401,7 +1401,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
'<img class="'+((vehicle.vehicle_type=="car")?'car':'')+'" src="'+image+'" />' +
'<span class="vbutton path '+((vehicle.polyline_visible) ? 'active' : '')+'" data-vcallsign="'+vcallsign+'"' + ' style="top:55px">Path</span>' +
((vehicle.vehicle_type!="car") ? '<span class="sbutton" onclick="shareVehicle(\'' + vcallsign + '\')" style="top:85px">Share</span>' : '') +
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 1000 && vehicle.ascent_rate < 1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:115px">Float</span>' : '') +
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 5000 && vehicle.ascent_rate < 1 && vehicle.ascent_rate > -1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:115px">Float</span>' : '') +
'<div class="left">' +
'<dl>';
var b = '</dl>' +
Expand Down Expand Up @@ -1498,7 +1498,17 @@ function createHysplit(callsign, adjustment) {

var altitude = Math.round(vehicle.curr_position.gps_alt) + adjustment;

var endTime = new Date(Date.parse(vehicle.curr_position.gps_time));
var startTime = new Date(Date.parse(vehicle.curr_position.gps_time.replace("Z","")));
//max is 8h back so need to catch is older
var nowTime = new Date();
var timeDifference = nowTime - startTime;
if (timeDifference > 28800000) {
nowTime.setHours(nowTime.getHours() - 8);
startTime = nowTime;
}
startTime = startTime.toISOString();

var endTime = new Date(Date.parse(vehicle.curr_position.gps_time.replace("Z","")));
endTime.setHours(endTime.getHours() + 84);
endTime = endTime.toISOString();

Expand All @@ -1508,7 +1518,7 @@ function createHysplit(callsign, adjustment) {
+ "&launch_latitude=" + vehicle.curr_position.gps_lat
+ "&launch_longitude=" + lon
+ "&launch_altitude=" + (altitude-1)
+ "&launch_datetime=" + vehicle.curr_position.gps_time
+ "&launch_datetime=" + startTime
+ "&ascent_rate=0.1"
+ "&float_altitude=" + altitude
+ "&stop_datetime=" + endTime;
Expand Down