Skip to content

Display X-Mark on a per-vehicle basis, if pred_lat and pred_lon are provided in vehicle.data #99

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
rossengeorgiev merged 3 commits into from
Sep 15, 2019
Merged

Display X-Mark on a per-vehicle basis, if pred_lat and pred_lon are provided in vehicle.data #99

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e74897
Initial stab at per-payload onboard landing prediction markers.
darksidelemm Sep 14, 2019
1ab637d
Handle pred_lat/lon being zero during ascent.
darksidelemm Sep 15, 2019
9c70704
Add pred_lat/lon to known keys list.
darksidelemm Sep 15, 2019
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
80 changes: 79 additions & 1 deletion js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,9 @@ function habitat_data(jsondata, alternative) {
"radiation": "Radiation (CPM)",
"temperature_radio": "Temperature, Radio",
"uplink_rssi": "Uplink RSSI",
"light_intensity": "Light Intensity"
"light_intensity": "Light Intensity",
"pred_lat": "Onboard Prediction (Lat)",
"pred_lon": "Onboard Prediction (Lon)"
};

var hide_keys = {
Expand Down Expand Up @@ -919,6 +921,53 @@ function updateVehicleInfo(vcallsign, newPosition) {
} else {
vehicle.marker.setMode("parachute");
}

// Update landing marker if data is available
if (newPosition.data.hasOwnProperty("pred_lat") && newPosition.data.hasOwnProperty("pred_lon")){
// Landing prediction data exists..
if (vehicle.landing_marker !== null){
// We already have a marker initialized.
if(newPosition.gps_alt > 350){
// Balloon is still in flight, so update the marker.
vehicle.landing_marker.setPosition(new google.maps.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){
vehicle.landing_marker.setMap(map);
}
}else{
// Balloon has landed, so hide the marker.
// Should we do this? Can we re-add it safely?
vehicle.landing_marker.setMap(null);
}
} else{
// Landing marker has not been initialised yet.
if((newPosition.data.pred_lat !== 0.0) && (newPosition.data.pred_lon !== 0.0)){

landing_image_src = host_url + markers_url + "balloon-xmark.png";
landing_image_src_size = new google.maps.Size(48,38);
landing_image_src_offset = new google.maps.Point(0,-38);

landing_marker = new google.maps.Marker({
icon: {
url: landing_image_src,
size: landing_image_src_size,
scaledSize: landing_image_src_size,
anchor: new google.maps.Point(24,18)
},
zIndex: Z_CAR,
position: new google.maps.LatLng(position.data.pred_lat, position.data.pred_lon),
map: map,
optimized: false,
title: vcallsign + " Onboard Landing Prediction"
});

// Add the marker to the map, and to the vehicle object.
landing_marker.setMap(map);
vehicle.landing_marker = landing_marker;
}

}
}
}

var image = vehicle.image_src;
Expand Down Expand Up @@ -1657,6 +1706,34 @@ function addPosition(position) {
this.setPosition(overlay.getProjection().fromDivPixelToLatLng(pos));
};

// Add landing marker if the payload provides a predicted landing position.
// TODO: Only create this if the lat/lon are not zero.
if (position.data.hasOwnProperty('pred_lat') && position.data.hasOwnProperty('pred_lon')){
// Only create the marker if the pred lat/lon are not zero (as will be the case during ascent).
if ((position.data.pred_lat !== 0.0) && (position.data.pred_lon !== 0.0)){
landing_image_src = host_url + markers_url + "balloon-xmark.png";
landing_image_src_size = new google.maps.Size(48,38);
landing_image_src_offset = new google.maps.Point(0,-38);

landing_marker = new google.maps.Marker({
icon: {
url: landing_image_src,
size: landing_image_src_size,
scaledSize: landing_image_src_size,
anchor: new google.maps.Point(24,18)
},
zIndex: Z_CAR,
position: new google.maps.LatLng(position.data.pred_lat, position.data.pred_lon),
map: map,
optimized: false,
title: vcallsign + " Onboard Landing Prediction"
});
gmaps_elements.push(landing_marker);
}
} else {
landing_marker = null;
}

horizon_circle = new google.maps.Circle({
map: map,
zIndex: Z_RANGE,
Expand Down Expand Up @@ -1790,6 +1867,7 @@ function addPosition(position) {
vehicle_type: vehicle_type,
marker: marker,
marker_shadow: marker_shadow,
landing_marker: landing_marker,
image_src: image_src,
image_src_size: image_src_size,
image_src_offset: image_src_offset,
Expand Down