Skip to content

Further fixes for payload-sourced landing predictions #57

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
darksidelemm merged 1 commit into from
Sep 21, 2022
Merged

Further fixes for payload-sourced landing predictions #57

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
13 changes: 10 additions & 3 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,13 +1269,15 @@ function updateVehicleInfo(vcallsign, newPosition) {
// Balloon is still in flight, so update the marker.
vehicle.landing_marker.setLatLng(new L.LatLng(newPosition.data.pred_lat, newPosition.data.pred_lon));
// Re-add to map if it's been removed previously.
if (vehicle.landing_marker.getMap() == null){
map.addLayer(vehicle.landing_marker);
if (vehicle.landing_marker_enabled == false){
vehicle.landing_marker.addTo(map);
vehicle.landing_marker_enabled = true;
}
}else{
// Balloon has landed, so hide the marker.
// Should we do this? Can we re-add it safely?
map.removeLayer(vehicle.landing_marker);
vehicle.landing_marker.remove();
vehicle.landing_marker_enabled = false;
}
} else{
// Landing marker has not been initialised yet.
Expand All @@ -1301,6 +1303,7 @@ function updateVehicleInfo(vcallsign, newPosition) {

// Add the marker to the vehicle object.
vehicle.landing_marker = landing_marker;
vehicle.landing_marker_enabled = true;
}

}
Expand Down Expand Up @@ -2496,11 +2499,14 @@ function addPosition(position) {
title: vcallsign + " Onboard Landing Prediction",
zIndexOffset: Z_CAR,
}).addTo(map);
landing_marker_enabled = true;
} else {
landing_marker = null;
landing_marker_enabled = false;
}
} else {
landing_marker = null;
landing_marker_enabled = false;
}

horizon_circle = new L.Circle(point, {
Expand Down Expand Up @@ -2595,6 +2601,7 @@ function addPosition(position) {
title: title,
marker_shadow: marker_shadow,
landing_marker: landing_marker,
landing_marker_enabled: landing_marker_enabled,
image_src: image_src,
image_src_size: image_src_size,
image_src_offset: image_src_offset,
Expand Down