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

filter out NULL lat/lng values from Geographical Map display queries (#12985)

Browse Source 
* filter out null lat/long values from map display queries

* removed space

* and the 2nd one

Co-authored-by: PipoCanaja <38363551+PipoCanaja@users.noreply.github.com>
This commit is contained in:
rhinoau
2021-06-25 07:33:20 +08:00
committed by GitHub
parent ce0ab24acd
commit 450463f7b1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ var greenMarker = L.AwesomeMarkers.icon({
$sql = "SELECT DISTINCT(`device_id`),`location`,`sysName`,`hostname`,`os`,`status`,`lat`,`lng` FROM `devices`
LEFT JOIN `locations` ON `devices`.`location_id`=`locations`.`id`
WHERE `disabled`=0 AND `ignore`=0 AND ((`lat` != '' AND `lng` != '') OR (`location` REGEXP '\[[0-9\.\, ]+\]'))
AND (`lat` IS NOT NULL AND `lng` IS NOT NULL)
AND `status` IN " . dbGenPlaceholders(count($show_status)) .
' ORDER BY `status` ASC, `hostname`';
$param = $show_status;
@@ -95,6 +96,7 @@ var greenMarker = L.AwesomeMarkers.icon({
FROM `devices`
LEFT JOIN `locations` ON `devices`.location_id=`locations`.`id`
WHERE `disabled`=0 AND `ignore`=0 AND ((`lat` != '' AND `lng` != '') OR (`location` REGEXP '\[[0-9\.\, ]+\]'))
AND (`lat` IS NOT NULL AND `lng` IS NOT NULL)
AND `devices`.`device_id` IN " . dbGenPlaceholders(count($device_ids)) .
' AND `status` IN ' . dbGenPlaceholders(count($show_status)) .
' ORDER BY `status` ASC, `hostname`';