Skip to content

Clean up burst icons for float predictions #52

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 3 commits into from
Sep 11, 2022
Merged

Clean up burst icons for float predictions #52

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08a38e1
Clean up burst icons for float predictions, show prediction type in b…
Sep 11, 2022
de5de31
Remove unnecessary log
Sep 11, 2022
472863a
Generate grafana url
Sep 11, 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
24 changes: 22 additions & 2 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var position_id = 0;
var newdata_url = "https://api.v2.sondehub.org/amateur/telemetry";
var receivers_url = "https://api.v2.sondehub.org/amateur/listeners/telemetry";
var predictions_url = "https://api.v2.sondehub.org/amateur/predictions?vehicles=";
var grafana_url = "https://grafana.v2.sondehub.org/d/HJgOZLq7k/basic?";

var livedata = "wss://ws-reader.v2.sondehub.org/";
var clientID = "SondeHub-Tracker-" + Math.floor(Math.random() * 10000000000);
Expand Down Expand Up @@ -1460,6 +1461,9 @@ function updateVehicleInfo(vcallsign, newPosition) {
timeChosen = timeSent;
}

// Generate Grafana Link
var grafana_dashboard_url = grafana_url + "var-Payload=" + vcallsign + "&from=" + vehicle.positions_ts[0] + "&to=" + vehicle.positions_ts[vehicle.positions_ts.length-1] + "&orgId=1";

//desktop
var a = '<div class="header">' +
'<span>' + sonde_type + vcallsign + ' <i class="icon-target"></i></span>' +
Expand Down Expand Up @@ -1816,7 +1820,7 @@ function redrawPrediction(vcallsign) {
vehicle.prediction_polyline.path_length = path_length;

var image_src;
if(vcallsign != "wb8elk2") { // WhiteStar
if(vcallsign != "wb8elk2") { // WhiteStar - Not sure the reasons behind a check for this? Seems odd. May be from when WB8ELK was first doing floater flights?
var html = "";
if(vehicle.prediction_target) {
vehicle.prediction_target.setLatLng(latlng);
Expand All @@ -1836,7 +1840,13 @@ function redrawPrediction(vcallsign) {
});
}
vehicle.prediction_target.pdata = data[data.length-1];
if(vehicle.prediction.descent_rate == null){
vehicle.prediction_target.pred_type = "Float Prediction";
} else {
vehicle.prediction_target.pred_type = "Standard, " + vehicle.prediction.descent_rate.toFixed(1) + " m/s descent rate.";
}
} else {
// Suspect this will never be called?
if(vehicle.prediction_target) vehicle.prediction_target = null;
}

Expand All @@ -1859,8 +1869,17 @@ function redrawPrediction(vcallsign) {
});
}
vehicle.prediction_burst.pdata = data[burst_index];
if(vehicle.prediction.descent_rate == null){
vehicle.prediction_burst.pred_type = "Float Prediction";
} else {
vehicle.prediction_burst.pred_type = "Standard, " + vehicle.prediction.descent_rate.toFixed(1) + " m/s descent rate.";
}
} else {
if(vehicle.prediction_burst) vehicle.prediction_burst = null;
if(vehicle.prediction_burst){
// Remove burst icon from the map if no burst data in prediction.
map.removeLayer(vehicle.prediction_burst);
vehicle.prediction_burst = null;
}
}
}

Expand Down Expand Up @@ -2165,6 +2184,7 @@ function mapInfoBox_handle_prediction(event) {
"<b>Altitude:</b> " + altitude + "\n" +
"<b>Latitude:</b> " + data.lat + "\n" +
"<b>Longitude:</b> " + data.lon + "\n" +
"<b>Prediction Type:</b> " + event.target.pred_type + "\n" +
"</pre>"
);
mapInfoBox.setLatLng(event.latlng);
Expand Down