Skip to content

hysplit fixes #5

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 1 commit into from
Apr 5, 2022
Merged

hysplit fixes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,12 @@ header .search form input[type='submit'] {
text-align: center;
}

#main .row .data .sbutton.active {
background-color: #33b5e5;
border: 1px solid #33b5e5;
color: #fff;
}

#main .row .data .vbutton.active {
background-color: #33b5e5;
border: 1px solid #33b5e5;
Expand Down
16 changes: 16 additions & 0 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,22 @@ $(window).ready(function() {
}
});

$("#main").on('click','.row .data .sbutton.hysplit', function(event) {
event.stopPropagation();

var elm = $(this);
var name = elm.attr('data-vcallsign');

if(elm.hasClass("active")) {
elm.removeClass('active');
processHysplit(name, false);
}
else {
elm.addClass('active');
processHysplit(name, true);
}
});

// reset nite-overlay and timebox when mouse goes out of the graph box
$("#telemetry_graph").on('mouseout','.holder', function() {
if(plot_crosshair_locked) return;
Expand Down
51 changes: 46 additions & 5 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,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" onclick="generateHysplit(\'' + vcallsign + '\')" style="top:'+(vehicle.image_src_size[1]+115)+'px">Hysplit</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">Hysplit</span>' : '') +
'<div class="left">' +
'<dl>';
//mobile
Expand All @@ -1385,7 +1385,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" onclick="generateHysplit(\'' + vcallsign + '\')" style="top:115px">Hysplit</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">Hysplit</span>' : '') +
'<div class="left">' +
'<dl>';
var b = '</dl>' +
Expand Down Expand Up @@ -1439,8 +1439,39 @@ function updateVehicleInfo(vcallsign, newPosition) {
return true;
}

function processHysplit(callsign, show) {
var vehicle = vehicles[callsign];
if (show) {
if (Object.keys(vehicle["prediction_hysplit"]).length > 0 && vehicle["prediction_hysplit_age"] == vehicle.curr_position.gps_time) {
showHysplit(callsign);
} else {
generateHysplit(callsign);
}
} else {
hideHysplit(callsign);
}
}

function showHysplit(callsign) {
var vehicle = vehicles[callsign];
vehicle.prediction_hysplit_visible = true;
for(var prediction in vehicle["prediction_hysplit"]) {
map.addLayer(vehicle["prediction_hysplit"][prediction]);
}
}

function hideHysplit(callsign) {
var vehicle = vehicles[callsign];
vehicle.prediction_hysplit_visible = false;
for(var prediction in vehicle["prediction_hysplit"]) {
map.removeLayer(vehicle["prediction_hysplit"][prediction]);
}
}

function generateHysplit(callsign) {
hideHysplit(callsign)
var vehicle = vehicles[callsign];
vehicle.prediction_hysplit_visible = true;
for (var alt = -1000; alt <= 1000; alt+=100) {
createHysplit(callsign, alt);
}
Expand Down Expand Up @@ -1469,12 +1500,17 @@ function createHysplit(callsign, adjustment) {
url: url,
dataType: "json",
success: function(data) {
var path = [[vehicle.curr_position.gps_lat, vehicle.curr_position.gps_lon]];
var start = new L.LatLng(vehicle.curr_position.gps_lat, vehicle.curr_position.gps_lon);
var path = [start];
for (let point in data.prediction[1].trajectory) {
path.push([data.prediction[1].trajectory[point].latitude, data.prediction[1].trajectory[point].longitude]);
var position = new L.LatLng(data.prediction[1].trajectory[point].latitude, data.prediction[1].trajectory[point].longitude)
path.push(position);
}
vehicle.prediction_hysplit[adjustment] = new L.Wrapped.Polyline(path);
vehicle.prediction_hysplit[adjustment].addTo(map)
vehicle.prediction_hysplit_age = vehicle.curr_position.gps_time;
if (vehicle.prediction_hysplit_visible) {
vehicle.prediction_hysplit[adjustment].addTo(map);
}
}
});
}
Expand Down Expand Up @@ -2389,6 +2425,8 @@ function addPosition(position) {
prediction_launch: null,
prediction_launch_polyline: null,
prediction_hysplit: {},
prediction_hysplit_visible: false,
prediction_hysplit_age: 0,
ascent_rate: 0.0,
horizontal_rate: 0.0,
max_alt: parseFloat(position.gps_alt),
Expand Down Expand Up @@ -2456,6 +2494,9 @@ function addPosition(position) {
if (map.hasLayer(vehicle_info["prediction_burst"])) {
map.removeLayer(vehicle_info["prediction_burst"]);
}
for(var prediction in vehicle_info["prediction_hysplit"]) {
map.removeLayer(vehicle_info["prediction_hysplit"][prediction]);
}
try {
for(var p in vehicle_info.polyline) {
map.removeLayer(vehicle_info.polyline[p]);
Expand Down