Skip to content

Commit 582953b

Browse files
committed
Handle callsigns provided as a string.
1 parent 3788a28 commit 582953b

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

js/tracker.js

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,27 +1058,32 @@ function updateVehicleInfo(vcallsign, newPosition) {
10581058
}
10591059

10601060
var callsign_list = [];
1061-
1062-
for(var rxcall in newPosition.callsign){
1063-
if(newPosition.callsign.hasOwnProperty(rxcall)) {
1064-
_new_call = rxcall;
1065-
if(newPosition.callsign[rxcall].hasOwnProperty('snr')){
1066-
if(newPosition.callsign[rxcall].snr){
1067-
_new_call += " (" + newPosition.callsign[rxcall].snr.toFixed(0) + " dB)";
1068-
callsign_list.push(_new_call)
1069-
continue;
1061+
if($.type(newPosition.callsign) === "string"){
1062+
// Single callsign entry, as a string (chase cars)
1063+
callsign_list = newPosition.callsign;
1064+
} else {
1065+
// Multiple callsigns, as an object
1066+
for(var rxcall in newPosition.callsign){
1067+
if(newPosition.callsign.hasOwnProperty(rxcall)) {
1068+
_new_call = rxcall;
1069+
if(newPosition.callsign[rxcall].hasOwnProperty('snr')){
1070+
if(newPosition.callsign[rxcall].snr){
1071+
_new_call += " (" + newPosition.callsign[rxcall].snr.toFixed(0) + " dB)";
1072+
callsign_list.push(_new_call)
1073+
continue;
1074+
}
10701075
}
1071-
}
1072-
if(newPosition.callsign[rxcall].hasOwnProperty('rssi')){
1073-
if(newPosition.callsign[rxcall].rssi){
1074-
_new_call += " (" + newPosition.callsign[rxcall].snr.toFixed(0) + " dBm)";
1075-
callsign_list.push(_new_call)
1076-
continue;
1076+
if(newPosition.callsign[rxcall].hasOwnProperty('rssi')){
1077+
if(newPosition.callsign[rxcall].rssi){
1078+
_new_call += " (" + newPosition.callsign[rxcall].snr.toFixed(0) + " dBm)";
1079+
callsign_list.push(_new_call)
1080+
continue;
1081+
}
10771082
}
10781083
}
1079-
}
1084+
}
1085+
callsign_list = callsign_list.join(", ");
10801086
}
1081-
callsign_list = callsign_list.join(", ");
10821087

10831088
var a = '<div class="header">' +
10841089
'<span>' + sonde_type + vcallsign + ' <i class="icon-target"></i></span>' +

0 commit comments

Comments
 (0)