mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better map link scaling algorithm (#11329)

Browse Source
This commit is contained in:
Mathieu Poussin
2020-03-23 11:42:18 +01:00
committed by GitHub
parent fb7c578fdf
commit e320fdf1cc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/html/common/worldmap.inc.php
View File

@@ -164,6 +164,9 @@ marker.bindPopup(title);
AND ld.ignore = 0 AND ld.ignore = 0
AND rd.disabled = 0 AND rd.disabled = 0
AND rd.ignore = 0 AND rd.ignore = 0
AND lp.ifOutOctets_rate != 0
AND lp.ifInOctets_rate != 0
AND lp.ifOperStatus = 'up'
AND ld.status IN " . dbGenPlaceholders(count($show_status)) . " AND ld.status IN " . dbGenPlaceholders(count($show_status)) . "
AND rd.status IN " . dbGenPlaceholders(count($show_status)) . " AND rd.status IN " . dbGenPlaceholders(count($show_status)) . "
GROUP BY GROUP BY
@@ -203,6 +206,9 @@ marker.bindPopup(title);
AND ld.ignore = 0 AND ld.ignore = 0
AND rd.disabled = 0 AND rd.disabled = 0
AND rd.ignore = 0 AND rd.ignore = 0
AND lp.ifOutOctets_rate != 0
AND lp.ifInOctets_rate != 0
AND lp.ifOperStatus = 'up'
AND ld.status IN " . dbGenPlaceholders(count($show_status)) . " AND ld.status IN " . dbGenPlaceholders(count($show_status)) . "
AND rd.status IN " . dbGenPlaceholders(count($show_status)) . " AND rd.status IN " . dbGenPlaceholders(count($show_status)) . "
AND ld.device_id IN " . dbGenPlaceholders(count($device_ids)) . " AND ld.device_id IN " . dbGenPlaceholders(count($device_ids)) . "
@@ -224,7 +230,7 @@ marker.bindPopup(title);
$width = round(0.77 * pow($speed, 0.25)); $width = round(0.77 * pow($speed, 0.25));
} }
$link_used = ($link["link_out_usage_pct"] + $link["link_in_usage_pct"]) / 2; $link_used = max($link["link_out_usage_pct"], $link["link_in_usage_pct"]);
$link_used = round(2 * $link_used, -1) / 2; $link_used = round(2 * $link_used, -1) / 2;
if ($link_used > 100) { if ($link_used > 100) {
$link_used = 100; $link_used = 100;