Skip to content

Merge Testing #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukePrior merged 2 commits into from
Jul 30, 2021
Merged

Merge Testing #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bdd554
websocket msg/s
LukePrior Jul 30, 2021
907ee3c
Merge pull request #75 from LukePrior/testing
LukePrior Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ var client = new Paho.Client(livedata, clientID);
var clientConnected = false;
var clientActive = false;
var clientTopic;
var messageRate = 0;
var messageRateAverage = 10;

var host_url = "";
var markers_url = "img/markers/";
Expand Down Expand Up @@ -345,6 +347,10 @@ function clean_refresh(text, force, history_step) {

if (clientActive) {
clientActive = false;
if (!document.getElementById("stTimer").classList.contains('friendly-dtime') ) {
document.getElementById("stTimer").classList.add('friendly-dtime');
$("#updatedText").text(" Updated: ");
}
$("#stText").text("");
}

Expand Down Expand Up @@ -426,7 +432,7 @@ function load() {
onAdd: function(map) {
var div = L.DomUtil.create('div');

div.innerHTML = "<span id='stText'></span><span> Updated: </span><i class='friendly-dtime' id='stTimer'>never</i>";
div.innerHTML = "<span id='stText'></span><span id='updatedText'> Updated: </span><i class='friendly-dtime' id='stTimer'>never</i>";
div.style = "opacity: 0.7; background-color: rgb(245, 245, 245); padding-right: 6px; padding-left: 6px; font-family: Roboto, Arial, sans-serif; color: rgb(68, 68, 68);";

return div;
Expand Down Expand Up @@ -2978,18 +2984,36 @@ function liveData() {
$("#stText").text("error |");
clientConnected = false;
clientActive = false;
if (!document.getElementById("stTimer").classList.contains('friendly-dtime') ) {
document.getElementById("stTimer").classList.add('friendly-dtime');
$("#updatedText").text(" Updated: ");
}
refresh();
};

function onConnectionLost(responseObject) {
if (responseObject.errorCode !== 0) {
clientConnected = false;
clientActive = false;
if (!document.getElementById("stTimer").classList.contains('friendly-dtime') ) {
document.getElementById("stTimer").classList.add('friendly-dtime');
$("#updatedText").text(" Updated: ");
}
refresh();
}
};

function onMessageArrived(message) {
messageRate += 1;
setTimeout(function(){
messageRate -= 1;
}, (1000 * messageRateAverage));
var messageCalculatedRate = Math.round(messageRate / messageRateAverage / 10) * 10;
if ( document.getElementById("stTimer").classList.contains('friendly-dtime') ) {
document.getElementById("stTimer").classList.remove('friendly-dtime');
}
$("#stTimer").text(messageCalculatedRate + " msg/s");
$("#updatedText").text(" ");
var dateNow = new Date().getTime();
try {
if (clientActive) {
Expand Down