From 40c666b7328a6e333a5ac897290abdab926f18b1 Mon Sep 17 00:00:00 2001 From: terribl Date: Sat, 25 May 2013 23:44:40 +0300 Subject: [PATCH] Changed table and selected planes info display Changed table and selected planes info to show 'n/a' when data is not present. modified: public_html/script.js --- public_html/script.js | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/public_html/script.js b/public_html/script.js index 1838629..3d0851b 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -199,13 +199,31 @@ function refreshSelected() { html += 'Squawking: Emergancy' } html += 'Altitude: ' + selected.altitude + ''; + if (selected.squawk != '0000') { html += 'Squawk: ' + selected.squawk + ''; } else { html += 'Squawk: n/a'; } - html += 'Track: ' + selected.track + ' (' + normalizeTrack(selected.track, selected.vTrack)[1] +')ICAO (hex): ' + selected.icao + ''; - html += 'Lat/Long: ' + selected.latitude + ', ' + selected.longitude + ''; + + html += 'Track: ' + if (selected.vTrack) { + html += selected.track; + html += ' (' + normalizeTrack(selected.track, selected.vTrack)[1] +')'; + } else { + html += 'n/a'; + } + + html += 'ICAO (hex): ' + selected.icao + ''; + + html += 'Lat/Long: '; + if (selected.vPosition) { + html += selected.latitude + ', ' + selected.longitude; + } else { + html += 'n/a'; + } + + html += ''; html += ''; } else { var html = ''; @@ -305,7 +323,14 @@ function refreshTableInfo() { } html += '' + tableplane.altitude + ''; html += '' + tableplane.speed + ''; - html += '' + normalizeTrack(tableplane.track, tableplane.vTrack)[2] + ' (' + normalizeTrack(tableplane.track, tableplane.vTrack)[1] + ')'; + html += ''; + if (tableplane.vTrack) { + html += normalizeTrack(tableplane.track, tableplane.vTrack)[2]; + html += ' (' + normalizeTrack(tableplane.track, tableplane.vTrack)[1] + ')'; + } else { + html += ' '; + } + html += ''; html += '' + tableplane.messages + ''; html += '' + tableplane.seen + ''; html += ''; @@ -320,8 +345,8 @@ function refreshTableInfo() { var hex = $(this).find('td:first').text(); if (hex != "ICAO") { selectPlaneByHex(hex); - refreshTableInfo() - refreshSelected() + refreshTableInfo(); + refreshSelected(); } });