diff --git a/html/planeObject.js b/html/planeObject.js index 0fb974b..b785206 100644 --- a/html/planeObject.js +++ b/html/planeObject.js @@ -697,10 +697,14 @@ PlaneObject.prototype.updateData = function(receiver_timestamp, data, init) { // Update all of our data this.messages = data.messages; + /* + var rssi = parseFloat(data.rssi); if (!this.rssa) - this.rssa = [data.rssi,data.rssi,data.rssi,data.rssi]; - this.rssa[this.rindex++%4] = data.rssi; - this.rssi = (this.rssa[0] + this.rssa[1] + this.rssa[2] + this.rssa[3])/4; + this.rssa = [rssi,rssi,rssi,rssi]; + this.rssa[this.rindex++%4] = rssi; + this.rssi = (this.rssa[0] + this.rssa[1] + this.rssa[2] + this.rssa[3])/4; + */ + this.rssi = data.rssi; if ("gs" in data) this.gs = data.gs; diff --git a/html/script.js b/html/script.js index f9a8b35..aa30223 100644 --- a/html/script.js +++ b/html/script.js @@ -1609,9 +1609,9 @@ function sortByTrack() { sortBy('track', compareNumeric, function(x) { retu function sortByMsgs() { sortBy('msgs', compareNumeric, function(x) { return x.messages; }); } function sortBySeen() { sortBy('seen', compareNumeric, function(x) { return x.seen; }); } function sortByCountry() { sortBy('country', compareAlpha, function(x) { return x.icaorange.country; }); } -function sortByRssi() { sortBy('rssi', compareNumeric, function(x) { return x.rssi }); } -function sortByLatitude() { sortBy('lat', compareNumeric, function(x) { return (x.position !== null ? x.position[1] : null) }); } -function sortByLongitude() { sortBy('lon', compareNumeric, function(x) { return (x.position !== null ? x.position[0] : null) }); } +function sortByRssi() { sortBy('rssi', compareNumeric, function(x) { return x.rssi; }); } +function sortByLatitude() { sortBy('lat', compareNumeric, function(x) { return (x.position !== null ? x.position[1] : null); }); } +function sortByLongitude() { sortBy('lon', compareNumeric, function(x) { return (x.position !== null ? x.position[0] : null); }); } function sortByDataSource() { sortBy('data_source', compareNumeric, function(x) { return x.getDataSourceNumber() } ); } function sortByBaseMarkerKey() { sortBy('base_marker_key', compareAlpha, function(x) { return x.baseMarkerKey; }); } @@ -2429,9 +2429,9 @@ function updateCell(plane, cell, newValue, html) { if (columnVis[cell] && newValue != plane.trCache[cell]) { plane.trCache[cell] = newValue; if (html) { - plane.tr.cells[cell].innerHTML = newValue + plane.tr.cells[cell].innerHTML = newValue; } else { - plane.tr.cells[cell].textContent = newValue + plane.tr.cells[cell].textContent = newValue; } } }