Skip to content

Add data panel to map view #72

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

Open
snooky234 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add data panel to map view #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1aba135
Add data to map
snooky234 Aug 23, 2023
4b90963
Add fuel right %
snooky234 Aug 24, 2023
4d8d57b
Update from origin, revert changes to master
snooky234 Aug 25, 2023
b31b73a
Add data panel to map
snooky234 Aug 25, 2023
3adba16
Add missing close tag
snooky234 Aug 25, 2023
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 glass_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,9 @@ async def ui_dictionary(ui_friendly_dictionary, previous_alt, landing_t1, landin
ui_friendly_dictionary["AUTOPILOT_AUTOTHROTTLE"] = await aq.get("AUTOTHROTTLE_ACTIVE")
ui_friendly_dictionary["AUTOPILOT_YAW_DAMPER"] = await aq.get("AUTOPILOT_YAW_DAMPER")
ui_friendly_dictionary["AIRSPEED_INDICATED"] = round(await aq.get("AIRSPEED_INDICATED"))
ui_friendly_dictionary["AIRSPEED_TRUE"] = round(await aq.get("AIRSPEED_TRUE"))
ui_friendly_dictionary["AUTOPILOT_AIRSPEED_HOLD"] = await aq.get("AUTOPILOT_AIRSPEED_HOLD")
ui_friendly_dictionary["VERTICAL_SPEED"] = round(await aq.get("VERTICAL_SPEED"))
# ui_friendly_dictionary["AUTOPILOT_MACH_HOLD_VAR"] = round(await aq.get("AUTOPILOT_MACH_HOLD_VAR"),2)
ui_friendly_dictionary["PLANE_HEADING_DEGREES"] = round(round(await aq.get("PLANE_HEADING_DEGREES_MAGNETIC"), 2) * 180/3.1416, 0)
# Placeholders - Not Actively Used for stress testing
Expand Down Expand Up @@ -488,10 +490,14 @@ async def ui_dictionary(ui_friendly_dictionary, previous_alt, landing_t1, landin
# GPS Next Waypoint
ui_friendly_dictionary["NEXT_WP_LAT"] = await aq.get("GPS_WP_NEXT_LAT")
ui_friendly_dictionary["NEXT_WP_LON"] = await aq.get("GPS_WP_NEXT_LON")
ui_friendly_dictionary["GPS_WP_DISTANCE"] = round(await aq.get("GPS_WP_DISTANCE")/1000*0.539957, ndigits=2)
ui_friendly_dictionary["GPS_ETE"] = round(await aq.get("GPS_ETE")/60)
# Other
ui_friendly_dictionary["GEAR_POSITION"] = await aq.get("GEAR_POSITION:1")
ui_friendly_dictionary["FLAPS_HANDLE_PERCENT"] = round(await aq.get("FLAPS_HANDLE_PERCENT")*100)
ui_friendly_dictionary["SPOILERS_ARMED"] = await aq.get("SPOILERS_HANDLE_POSITION")
ui_friendly_dictionary["FUEL_TANK_LEFT_MAIN_LEVEL"] = round(await aq.get("FUEL_TANK_LEFT_MAIN_LEVEL")*100)
ui_friendly_dictionary["FUEL_TANK_RIGHT_MAIN_LEVEL"] = round(await aq.get("FUEL_TANK_RIGHT_MAIN_LEVEL")*100)

# Current altitude
current_alt = await aq.get("INDICATED_ALTITUDE")
Expand Down
52 changes: 48 additions & 4 deletions static/js/custom/getSimData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ let autopilot_flight_director_active;
let autopilot_airspeed_hold;
let autopilot_airspeed_hold_var;
let airspeed_indicated;
let airspeed_true;
let autopilot_loc_mode;
let autopilot_appr_mode;
let autopilot_yaw_damper;
Expand Down Expand Up @@ -113,18 +114,25 @@ let fltpln_arr;
let gps_next_lat;
let gps_next_lon;
let gps_next_wp_arr = [[],[]];
let gps_wp_distance;
let gps_ete;
let loadfltpln_switch;
loadfltpln_switch = 0;

let gear;
let flaps_position;
let spoilers;
let fuel_left_percent;
let fuel_right_percent;

// Maps Size Fix Function
let map_size_fix;
let map_size_fix_mod;
map_size_fix = 0;

// Maps Data
let map_data = true;

//Press and Hold
let btnhold;

Expand Down Expand Up @@ -1046,10 +1054,15 @@ function getSimulatorData() {
autopilot_airspeed_hold = data.AUTOPILOT_FLIGHT_LEVEL_CHANGE;
autopilot_airspeed_hold_var = data.AUTOPILOT_AIRSPEED_HOLD_VAR;
airspeed_indicated = data.AIRSPEED_INDICATED;
airspeed_true = data.AIRSPEED_TRUE;
airspeed_true = data.AIRSPEED_TRUE;
vertical_speed = data.VERTICAL_SPEED;
autopilot_loc_mode = data.AUTOPILOT_LOC_MODE;
autopilot_appr_mode = data.AUTOPILOT_APPR_MODE;
autopilot_yaw_damper = data.AUTOPILOT_YAW_DAMPER;
plane_heading_degrees = data.PLANE_HEADING_DEGREES;
fuel_left_percent = data.FUEL_TANK_LEFT_MAIN_LEVEL;
fuel_right_percent = data.FUEL_TANK_RIGHT_MAIN_LEVEL;

//NAV
nav1_obs_deg = Number(data.NAV1_OBS_DEG);
Expand Down Expand Up @@ -1101,6 +1114,8 @@ function getSimulatorData() {
gps_next_lat = data.NEXT_WP_LAT;
gps_next_lon = data.NEXT_WP_LON;
gps_next_wp_arr = [[latitude, longitude],[gps_next_lat, gps_next_lon]];
gps_wp_distance = data.GPS_WP_DISTANCE;
gps_ete = data.GPS_ETE;

//Flight Controls
gear = data.GEAR_POSITION;
Expand Down Expand Up @@ -1306,7 +1321,11 @@ function displayData() {

//Other/Data
$("#cur_ias").text(airspeed_indicated);
$("#cur_ias2").text(airspeed_indicated);
$("#cur_tas").text(airspeed_true);
$("#cur_tas2").text(airspeed_true);
$("#cur_alt").text(altitude);
$("#cur_alt2").text(altitude);
$("#cur_hdg").text(plane_heading_degrees);
$("#flaps-position").text(flaps_position + "%");
$("#landing-vs1").text(landing_vs1);
Expand All @@ -1319,7 +1338,20 @@ function displayData() {
$("#landing-t3").text(landing_t3);
$("#landing-g3").text(landing_g3);
$("#sim-rate").text(sim_rate);
$("#sim-rate2").text(sim_rate);
$("#wp_distance").text(gps_wp_distance);
$("#ete").text(gps_ete);
$("#ete_true").text(Math.round(gps_ete/sim_rate));
$("#fuel_left_percent").text(fuel_left_percent);
$("#fuel_right_percent").text(fuel_right_percent);

$("#vertical_speed").text(vertical_speed);
if (vertical_speed > 0) {
$("#vertical_speed_positive").show();
} else {
$("#vertical_speed_positive").hide();
}

//JF PA-28R
if (selected_plane.substring(0, 6) == "PA-28R") {
checkAndUpdateButton("#jf_pa28_bcn_light", JF_PA_28R_LIGHT_BCN);
Expand Down Expand Up @@ -1560,7 +1592,7 @@ function toggleFollowPlane() {
followPlane = 1
}
if (followPlane === 1) {
$("#followMode").text("Unfollow Plane")
$("#followMode").text("Unfollow")
$("#followModeButton").removeClass("btn-danger").addClass("btn-primary")
marker.addTo(map);
}
Expand All @@ -1569,11 +1601,23 @@ function toggleFollowPlane() {
$("#followModeButton").removeClass("btn-primary").addClass("btn-danger")
}
if (followPlane === 3) {
$("#followMode").text("Follow Plane")
$("#followMode").text("Follow")
marker.remove();
}
}

function toggleMapData() {
if (map_data === true) {
$('#map_data').hide();
$('#mapDataText').text("Show Data");
map_data = false;
} else {
$('#map_data').show();
$('#mapDataText').text("Hide Data");
map_data = true;
}
}

function toggleGPStrack() {
trackGPS = !trackGPS;
if (trackGPS === true) {
Expand Down Expand Up @@ -1726,14 +1770,14 @@ function loadFltPln() {

if (loadfltpln_switch === 1) {
temporaryAlert('', "Loading flight plan.", "success", 2500);
$("#FltPlnText").text("Hide Flight Plan");
$("#FltPlnText").text("Hide FPL");
$("#FltPlnButton").removeClass("btn-danger").addClass("btn-primary");
url_to_call = "/fltpln";
$.post (url_to_call);
setTimeout(updatePolylineFltPln, 2500);
gpswp.setStyle({opacity: 1.0});
} else {
$("#FltPlnText").text("Load Flight Plan");
$("#FltPlnText").text("Load FPL");
$("#FltPlnButton").removeClass("btn-primary").addClass("btn-danger");
fltpln.setLatLngs([]);
gpswp.setStyle({opacity: 0});
Expand Down
10 changes: 9 additions & 1 deletion templates/glass.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,15 @@
<!-- Map -->
<div class="collapse show" id="collapseMap" data-parent="#myGroup" style="margin-bottom:-30px">
<div class="row" id="map_row" style="height:calc(100vh - 90px);height:calc((var(--vh, 1vh) * 100) - 90px);margin-top:10px;margin-bottom:-30px;">
<div class="col" id="map_column" style="position:relative; height=100%;z-index:1;">
<div class="col" id="map_column" style="position:relative;height:100%;z-index:1;">
<div id="map_data" style="font-size: 100%;color:#fff;margin-top:-10px;text-align:center;">
<span style="margin-right:6px;white-space:nowrap;">Spd: <span style="font-weight:800;"><span id="cur_ias2">N/A</span>/<span id="cur_tas2">N/A</span></span> kt</span>
<span style="margin-right:6px;white-space:nowrap;">Alt: <span style="font-weight:800;"><span id="cur_alt2" style="font-weight:800;">N/A</span> (<span id="vertical_speed_positive">+</span><span id="vertical_speed">N/A</span>)</span> ft</span>
<span style="margin-right:6px;white-space:nowrap;">Dist: <span id="wp_distance" style="font-weight:800;">N/A</span> nm</span>
<span style="margin-right:6px;white-space:nowrap;">Fuel(L/R): <span style="font-weight:800;"><span id="fuel_left_percent">N/A</span>/<span id="fuel_right_percent">N/A</span></span> %</span>
<span style="margin-right:6px;white-space:nowrap;">SimR: <span id="sim-rate2" style="font-weight:800;">N/A</span>x</span>
<span style="margin-right:6px;white-space:nowrap;">ETE: <span style="font-weight:800;"><span id="ete" style="font-weight:800;">N/A</span>/<span id="ete_true">N/A</span></span> min</span>
</div>
<div id = "map" style = "height: 100%; width: 100%;"></div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions templates/menu_data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<div class="col" style="margin-top:20px">
<div class="lead" style="margin-bottom:10px">Current Flight Data</div>
<p style="margin-bottom:0px">Indicated airspeed: <span id="cur_ias">N/A</span> kts</p>
<p style="margin-bottom:0px">True airspeed: <span id="cur_tas">N/A</span> fts</p>
<p style="margin-bottom:0px">Indicated altitude: <span id="cur_alt">N/A</span> fts</p>
<p>Magnetic heading: <span id="cur_hdg">N/A</span> deg</p>
</div>
Expand Down
5 changes: 3 additions & 2 deletions templates/menu_map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="btn-group" role="group" aria-label="Map controls" style="position:relative;z-index:2;top:-3px;">
<button id="followModeButton" type="button" class="btn btn-primary btn-sm" onclick="toggleFollowPlane();$(this).blur();"><span id="followMode">Unfollow Plane</span></button>
<button id="DataButton" type="button" class="btn btn-primary btn-sm" onclick="toggleMapData();$(this).blur();"><span id="mapDataText">Hide Data</span></button>
<button id="followModeButton" type="button" class="btn btn-primary btn-sm" onclick="toggleFollowPlane();$(this).blur();"><span id="followMode">Unfollow</span></button>
<button id="GPStrackButton" type="button" class="btn btn-primary btn-sm" onclick="toggleGPStrack();$(this).blur();">GPS Track</button>
<button id="FltPlnButton" type="button" class="btn btn-danger btn-sm" onclick="loadFltPln();$(this).blur();"><span id="FltPlnText">Load Flight Plan</button>
<button id="FltPlnButton" type="button" class="btn btn-danger btn-sm" onclick="loadFltPln();$(this).blur();"><span id="FltPlnText">Load FPL</button>
</div>