@@ -1657,20 +1634,6 @@
}
}
- function getConfigNodesDisconnectedAgeInSeconds() {
- // default to showing nodes as recently uplinked if heard in the last 30 minutes
- const value = localStorage.getItem("config_nodes_disconnected_age_in_seconds");
- return value != null ? parseInt(value) : 1800;
- }
-
- function setConfigNodesDisconnectedAgeInSeconds(value) {
- if(value != null){
- return localStorage.setItem("config_nodes_disconnected_age_in_seconds", value);
- } else {
- return localStorage.removeItem("config_nodes_disconnected_age_in_seconds");
- }
- }
-
function getConfigNodesOfflineAgeInSeconds() {
const value = localStorage.getItem("config_nodes_offline_age_in_seconds");
return value != null ? parseInt(value) : null;
@@ -1754,7 +1717,6 @@
isShowingAnnouncement: this.shouldShowAnnouncement(),
configNodesMaxAgeInSeconds: window.getConfigNodesMaxAgeInSeconds(),
- configNodesDisconnectedAgeInSeconds: window.getConfigNodesDisconnectedAgeInSeconds(),
configNodesOfflineAgeInSeconds: window.getConfigNodesOfflineAgeInSeconds(),
configWaypointsMaxAgeInSeconds: window.getConfigWaypointsMaxAgeInSeconds(),
configConnectionsMaxDistanceInMeters: window.getConfigConnectionsMaxDistanceInMeters(),
@@ -2654,9 +2616,6 @@
configNodesMaxAgeInSeconds() {
window.setConfigNodesMaxAgeInSeconds(this.configNodesMaxAgeInSeconds);
},
- configNodesDisconnectedAgeInSeconds() {
- window.setConfigNodesDisconnectedAgeInSeconds(this.configNodesDisconnectedAgeInSeconds);
- },
configNodesOfflineAgeInSeconds() {
window.setConfigNodesOfflineAgeInSeconds(this.configNodesOfflineAgeInSeconds);
},
@@ -3340,13 +3299,6 @@
return string.replace(//g, ">");
}
- // determine if node was recently heard uplinking packets to mqtt
- function hasNodeUplinkedToMqttRecently(node) {
- const now = moment();
- const configNodesDisconnectedAgeInSeconds = getConfigNodesDisconnectedAgeInSeconds();
- const millisecondsSinceNodeLastUplinkedToMqtt = now.diff(moment(node.mqtt_connection_state_updated_at));
- return millisecondsSinceNodeLastUplinkedToMqtt < configNodesDisconnectedAgeInSeconds * 1000;
- }
function onNodesUpdated(updatedNodes) {
@@ -3416,12 +3368,6 @@
zIndexOffset = -1000;
}
- // determine if node was recently heard uplinking packets to mqtt
- //const nodeHasUplinkedToMqttRecently = hasNodeUplinkedToMqttRecently(node);
- //if(nodeHasUplinkedToMqttRecently){
- // icon = iconMqttConnected;
- //}
-
// To not have overlapping nodes.
var latJitter = 0;
var lonJitter = 0;
@@ -3967,24 +3913,11 @@
function getTooltipContentForNode(node) {
- // determine if node was recently heard uplinking packets to mqtt
- const nodeHasUplinkedToMqttRecently = hasNodeUplinkedToMqttRecently(node);
- var mqttStatus = `
Disconnected`;
- if(node.mqtt_connection_state_updated_at){
- var mqttStatusUpdatedAt = moment(new Date(node.mqtt_connection_state_updated_at)).fromNow();
- if(nodeHasUplinkedToMqttRecently){
- mqttStatus = `
Connected (${mqttStatusUpdatedAt})`;
- } else {
- mqttStatus = `
Disconnected (${mqttStatusUpdatedAt})`;
- }
- }
-
var loraFrequencyRange = getRegionFrequencyRange(node.region_name);
var tooltip = `
` +
`
${escapeString(node.long_name)}` +
`
Short Name: ${escapeString(node.short_name)}` +
- `
MQTT: ${mqttStatus}` +
(node.num_online_local_nodes != null ? `
Local Nodes Online: ${node.num_online_local_nodes}` : '') +
(node.position_precision != null && node.position_precision !== 32 ? `
Position Precision: ${formatPositionPrecision(node.position_precision)}` : '') +
`
Role: ${node.role_name}` +
@@ -4021,6 +3954,7 @@
tooltip += `
ID: ${node.node_id}`;
tooltip += `
Hex ID: ${node.node_id_hex}`;
tooltip += `
Updated: ${moment(new Date(node.updated_at)).fromNow()}`;
+ tooltip += (node.mqtt_connection_state_updated_at ? `
MQTT Updated: ${moment(new Date(node.mqtt_connection_state_updated_at)).fromNow()}` : '');
tooltip += (node.neighbours_updated_at ? `
Neighbours Updated: ${moment(new Date(node.neighbours_updated_at)).fromNow()}` : '');
tooltip += (node.position_updated_at ? `
Position Updated: ${moment(new Date(node.position_updated_at)).fromNow()}` : '');