Skip to content

Commit f77bfc8

Browse files
Mark JessopMark Jessop
authored andcommitted
Sort callsign list alphabetically
1 parent ef0d819 commit f77bfc8

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

js/tracker.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,14 +1414,14 @@ function updateVehicleInfo(vcallsign, newPosition) {
14141414

14151415
var current_time = convert_time(newPosition.server_time)
14161416

1417-
for(var i = 0; i < vehicle.receiver_info.length; i++){
1417+
for(i in vehicle.receiver_info){
14181418
if (vehicle.receiver_info[i]["time"] < current_time - 15000) {
14191419
vehicle.receiver_info.splice(i,1);
14201420
}
14211421
}
14221422

14231423
function addReceiver(callsign) {
1424-
for(var i = 0; i < vehicle.receiver_info.length; i++){
1424+
for(i in vehicle.receiver_info){
14251425
if (vehicle.receiver_info[i]["callsign"] === callsign) {
14261426
vehicle.receiver_info[i]["time"] = current_time
14271427
if(newPosition.callsign[callsign].hasOwnProperty('snr')){
@@ -1458,7 +1458,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
14581458
temp_receiver.frequency = newPosition.callsign[rxcall].frequency.toFixed(4)
14591459
}
14601460
}
1461-
vehicle.receiver_info.push(temp_receiver)
1461+
vehicle.receiver_info[callsign] = temp_receiver;
14621462
}
14631463

14641464
if($.type(newPosition.callsign) === "string"){
@@ -1471,7 +1471,11 @@ function updateVehicleInfo(vcallsign, newPosition) {
14711471
addReceiver(rxcall)
14721472
}
14731473

1474-
for(var receiver in vehicle.receiver_info){
1474+
var receiver_list_sorted = Object.keys(vehicle.receiver_info).sort();
1475+
console.log(receiver_list_sorted);
1476+
1477+
for(var receiver_idx in receiver_list_sorted){
1478+
var receiver = receiver_list_sorted[receiver_idx];
14751479
_new_call = "- " + vehicle.receiver_info[receiver].callsign;
14761480
tempFields = [];
14771481
if(vehicle.receiver_info[receiver].hasOwnProperty('snr')){

0 commit comments

Comments
 (0)