mirror
/
chasemapper
kopia lustrzana https://github.com/projecthorus/chasemapper
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add functions to hide/show balloons.

pull/7/head
Mark Jessop 2019-08-21 22:04:36 +09:30
rodzic 0939ab30a5
commit 1900e76864
3 zmienionych plików z 77 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
log_playback.py
Wyświetl plik

@ -5,6 +5,12 @@
# Copyright (C) 2019 Mark Jessop <vk5qi@rfhead.net>
# Released under GNU GPL v3 or later
#
#
# TODO:
# [x] Playback of basic log entries (car position, balloon telemetry, bearings)
# [ ] Playback and display of balloon prediction data
# [ ] Skip forward / back through file
#
import json
import socket
import sys
@ -182,6 +188,7 @@ def playback_json(filename, udp_port=55672, speed=1.0):
print("%02d:%.2f - Bearing Data" % (_time_min, _time_sec))
elif _log_data['log_type'] == 'BALLOON TELEMETRY':
send_balloon_telemetry(_log_data, udp_port)
print("%02d:%.2f - Balloon Telemetry (%s)" % (_time_min, _time_sec, _log_data['callsign']))
elif _log_data['log_type'] == 'PREDICTION':

63
static/js/balloon.js
Wyświetl plik

@ -80,7 +80,7 @@ function add_new_balloon(data){
// Abort path
balloon_positions[callsign].abort_path = L.polyline(data.abort_path,{title:callsign + " Abort Prediction", color:'red', opacity:prediction_opacity});
if (chase_config.show_abort == true){
if ((chase_config.show_abort == true) && (balloon_positions[callsign].visible == true)){
balloon_positions[callsign].abort_path.addTo(map);
}
@ -88,7 +88,7 @@ function add_new_balloon(data){
if (data.abort_landing.length == 3){
balloon_positions[callsign].abort_marker = L.marker(data.abort_landing,{title:callsign + " Abort", icon: abortIcon})
.bindTooltip(callsign + " Abort Landing",{permanent:false,direction:'right'});
if(chase_config.show_abort == true){
if( (chase_config.show_abort == true) && (balloon_positions[_callsign].visible == true)){
balloon_positions[callsign].abort_marker.addTo(map);
}
}else{
@ -233,6 +233,7 @@ function handleTelemetry(data){
if (data.position[2] < parachute_min_alt){
balloon_positions[data.callsign].marker.setIcon(balloonPayloadIcons[balloon_positions[data.callsign].colour]);
}
}
// Update the telemetry table display
@ -247,14 +248,13 @@ function handleTelemetry(data){
// Update the Summary and time-to-landing displays
if (balloon_currently_following === data.callsign){
$('#time_to_landing').text(data.time_to_landing);
payload_data_age = 0.0;
}
}
// Auto Pan selection between balloon or car.
var _current_follow = $('input[name=autoFollow]:checked').val();
if (_current_follow == 'payload' && data.callsign == balloon_currently_following){
if ((_current_follow == 'payload') && (data.callsign == balloon_currently_following)){
map.panTo(data.position);
} else if (_current_follow == 'car' && data.callsign == 'CAR'){
map.panTo(data.position);
@ -262,6 +262,59 @@ function handleTelemetry(data){
// Don't pan to anything.
}
// Updat the summary display.
// Update the summary display.
updateSummaryDisplay();
}
function hideBalloon(callsign){
if (balloon_positions.hasOwnProperty(callsign) == true){
balloon_positions[callsign].visible = false;
// Remove the layers for this balloon from the map.
if(map.hasLayer(balloon_positions[callsign].marker) == true){
// Balloon is currently on the map, so remove it.
// These two will always be on the map together.
balloon_positions[callsign].marker.remove();
balloon_positions[callsign].path.remove();
}
if(map.hasLayer(balloon_positions[callsign].burst_marker) == true){
// Burst marker might not always be visible, i.e. after burst.
balloon_positions[callsign].burst_marker.remove();
}
if(map.hasLayer(balloon_positions[callsign].pred_marker) == true){
// Prediction marker and path will always be shown together.
balloon_positions[callsign].pred_marker.remove();
balloon_positions[callsign].pred_path.remove();
}
if(map.hasLayer(balloon_positions[callsign].abort_marker) == true){
// The same is true for the abort marker and path.
balloon_positions[callsign].abort_marker.remove();
balloon_positions[callsign].abort_path.remove();
}
}
}
function showBalloon(callsign){
if (balloon_positions.hasOwnProperty(callsign) == true){
balloon_positions[callsign].visible = true;
// We can safely just add the balloon marker and path back onto the map.
balloon_positions[callsign].marker.addTo(map);
balloon_positions[callsign].path.addTo(map);
if(balloon_positions[callsign].burst_marker != null){
// The burst marker might not always be present.
balloon_positions[callsign].burst_marker.addTo(map);
}
if(balloon_positions[callsign].pred_marker != null){
balloon_positions[callsign].pred_marker.addTo(map);
balloon_positions[callsign].pred_path.addTo(map);
}
if(balloon_positions[callsign].abort_marker != null){
balloon_positions[callsign].abort_marker.addTo(map);
balloon_positions[callsign].abort_path.addTo(map);
}
}
}

17
static/js/predictions.js
Wyświetl plik

@ -20,8 +20,10 @@ function handlePrediction(data){
// Add the landing marker if it doesnt exist.
if (balloon_positions[_callsign].pred_marker == null){
balloon_positions[_callsign].pred_marker = L.marker(data.pred_landing,{title:_callsign + " Landing", icon: balloonLandingIcons[balloon_positions[_callsign].colour]})
.bindTooltip(_callsign + " Landing",{permanent:false,direction:'right'})
.addTo(map);
.bindTooltip(_callsign + " Landing",{permanent:false,direction:'right'});
if (balloon_positions[_callsign].visible == true){
balloon_positions[_callsign].pred_marker.addTo(map);
}
}else{
balloon_positions[_callsign].pred_marker.setLatLng(data.pred_landing);
}
@ -30,8 +32,11 @@ function handlePrediction(data){
var _burst_txt = _callsign + " Burst (" + data.burst[2].toFixed(0) + "m)";
if (balloon_positions[_callsign].burst_marker == null){
balloon_positions[_callsign].burst_marker = L.marker(data.burst,{title:_burst_txt, icon: burstIcon})
.bindTooltip(_burst_txt,{permanent:false,direction:'right'})
.addTo(map);
.bindTooltip(_burst_txt,{permanent:false,direction:'right'});
if (balloon_positions[_callsign].visible == true){
balloon_positions[_callsign].burst_marker.addTo(map);
}
}else{
balloon_positions[_callsign].burst_marker.setLatLng(data.burst);
balloon_positions[_callsign].burst_marker.setTooltipContent(_burst_txt);
@ -41,6 +46,7 @@ function handlePrediction(data){
if (balloon_positions[_callsign].burst_marker != null){
// Remove the burst icon from the map.
balloon_positions[_callsign].burst_marker.remove();
balloon_positions[_callsign].burst_marker = null;
}
}
// Update the predicted path.
@ -51,7 +57,7 @@ function handlePrediction(data){
if (balloon_positions[_callsign].abort_marker == null){
balloon_positions[_callsign].abort_marker = L.marker(data.abort_landing,{title:_callsign + " Abort", icon: abortIcon})
.bindTooltip(_callsign + " Abort Landing",{permanent:false,direction:'right'});
if(chase_config.show_abort == true){
if((chase_config.show_abort == true) && (balloon_positions[_callsign].visible == true)){
balloon_positions[_callsign].abort_marker.addTo(map);
}
}else{
@ -65,6 +71,7 @@ function handlePrediction(data){
if (balloon_positions[_callsign].abort_marker != null){
balloon_positions[_callsign].abort_marker.remove();
balloon_positions[_callsign].abort_marker = null;
}
}
// Reset the prediction data age counter.