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

Traffic Javascript logic improvements and cleanup. 

Fixes case where aircraft is first placed into “invalid position” table
and is never removed (even when position becomes valid).
pull/490/head
Christopher Young 2016-09-05 14:50:56 -04:00
rodzic 16c68b737d
commit f477a8366e
1 zmienionych plików z 30 dodań i 42 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

72
web/plates/js/traffic.js
Wyświetl plik

@ -7,9 +7,6 @@ function TrafficCtrl($rootScope, $scope, $state, $http, $interval) {
$scope.$parent.helppage = 'plates/traffic-help.html'; $scope.$parent.helppage = 'plates/traffic-help.html';
$scope.data_list = []; $scope.data_list = [];
$scope.data_list_invalid = []; $scope.data_list_invalid = [];
function utcTimeString(epoc) { function utcTimeString(epoc) {
var time = ""; var time = "";
@ -130,12 +127,12 @@ function TrafficCtrl($rootScope, $scope, $state, $http, $interval) {
// we need to use an array so AngularJS can perform sorting; it also means we need to loop to find an aircraft in the traffic set // we need to use an array so AngularJS can perform sorting; it also means we need to loop to find an aircraft in the traffic set
var found = false; var validIdx = -1;
var foundInvalid = false; var invalidIdx = -1;
for (var i = 0, len = $scope.data_list.length; i < len; i++) { for (var i = 0, len = $scope.data_list.length; i < len; i++) {
if ($scope.data_list[i].icao_int === message.Icao_addr) { if ($scope.data_list[i].icao_int === message.Icao_addr) {
setAircraft(message, $scope.data_list[i]); setAircraft(message, $scope.data_list[i]);
found = true; validIdx = i;
break; break;
} }
} }
@ -143,34 +140,35 @@ function TrafficCtrl($rootScope, $scope, $state, $http, $interval) {
for (var i = 0, len = $scope.data_list_invalid.length; i < len; i++) { for (var i = 0, len = $scope.data_list_invalid.length; i < len; i++) {
if ($scope.data_list_invalid[i].icao_int === message.Icao_addr) { if ($scope.data_list_invalid[i].icao_int === message.Icao_addr) {
setAircraft(message, $scope.data_list_invalid[i]); setAircraft(message, $scope.data_list_invalid[i]);
foundInvalid = true; invalidIdx = i;
break; break;
} }
} }
if ((!found) && (message.Position_valid)) { if ((validIdx < 0) && (message.Position_valid)) {
var new_traffic = {}; var new_traffic = {};
setAircraft(message, new_traffic); setAircraft(message, new_traffic);
$scope.data_list.unshift(new_traffic); // add to start of main array if position is valid and removed from the invalid array $scope.data_list.unshift(new_traffic); // add to start of valid array.
for (var i = 0, len = $scope.data_list_invalid.length; i < len; i++) {
if ($scope.data_list_invalid[i].icao_int === message.Icao_addr) {
$scope.data_list_invalid.splice(i, 1);
}
}
} else if ((!foundInvalid) && (!message.Position_valid)) {
var new_traffic = {};
setAircraft(message, new_traffic);
$scope.data_list_invalid.unshift(new_traffic); // otherwise add to start of invalid array
} }
if ((invalidIdx < 0) && (!message.Position_valid)) {
var new_traffic = {};
setAircraft(message, new_traffic);
$scope.data_list_invalid.unshift(new_traffic); // add to start of invalid array.
}
// Handle the negative cases of those above - where an aircraft moves from "valid" to "invalid" or vice-versa.
if ((validIdx >= 0) && !message.Position_valid) {
// Position is not valid any more. Remove from "valid" table.
$scope.data_list.splice(validIdx, 1);
}
if ((invalidIdx >= 0) && message.Position_valid) {
// Position is now valid. Remove from "invalid" table.
$scope.data_list_invalid.splice(invalidIdx, 1);
}
$scope.$apply(); $scope.$apply();
}; };
} }
@ -206,31 +204,21 @@ function TrafficCtrl($rootScope, $scope, $state, $http, $interval) {
// perform cleanup every 10 seconds // perform cleanup every 10 seconds
var clearStaleTraffic = $interval(function () { var clearStaleTraffic = $interval(function () {
// remove stale aircraft = anything more than 59 seconds without a position update // remove stale aircraft = anything more than 59 seconds without a position update
var dirty = false; var cutoff = 59;
var dirtyInvalid = false;
var cutoff =59;
for (var i = len = $scope.data_list.length; i > 0; i--) { // Clean up "valid position" table.
for (var i = $scope.data_list.length; i > 0; i--) {
if ($scope.data_list[i - 1].age >= cutoff) { if ($scope.data_list[i - 1].age >= cutoff) {
$scope.data_list.splice(i - 1, 1); $scope.data_list.splice(i - 1, 1);
dirty = true;
} }
} }
if (dirty) {
$scope.raw_data = ""; // Clean up "invalid position" table.
$scope.$apply(); for (var i = $scope.data_list_invalid.length; i > 0; i--) {
}
for (var i = len = $scope.data_list_invalid.length; i > 0; i--) {
if (($scope.data_list_invalid[i - 1].age >= cutoff) || ($scope.data_list_invalid[i - 1].ageLastAlt >= cutoff)) { if (($scope.data_list_invalid[i - 1].age >= cutoff) || ($scope.data_list_invalid[i - 1].ageLastAlt >= cutoff)) {
$scope.data_list_invalid.splice(i - 1, 1); $scope.data_list_invalid.splice(i - 1, 1);
dirtyInvalid = true;
} }
} }
if (dirtyInvalid) {
$scope.raw_data = "";
$scope.$apply();
}
}, (1000 * 10), 0, false); }, (1000 * 10), 0, false);