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

Allow user to influence when devices are grouped on world map from widget settings

Browse Source
This commit is contained in:
Mike Rostermund
2015-10-17 11:31:57 +02:00
parent f341183003
commit fcf3a80655
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ if ($config['map']['engine'] == 'leaflet') {
<div class="col-sm-4"> <div class="col-sm-4">
<label for="init_zoom" class="control-label">Initial Zoom: </label> <label for="init_zoom" class="control-label">Initial Zoom: </label>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-6">
<select class="form-control" name="init_zoom" id="select_zoom'.$unique_id.'"> <select class="form-control" name="init_zoom" id="select_zoom'.$unique_id.'">
'; ';
for ($i=0; $i<19; $i++) { for ($i=0; $i<19; $i++) {
@@ -61,6 +61,14 @@ if ($config['map']['engine'] == 'leaflet') {
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<div class="col-sm-4">
<label for="group_radius" class="control-label">Grouping radius: </label>
</div>
<div class="col-sm-4">
<input class="form-control" name="group_radius" id="input_radius_'.$unique_id.'" value="'.$widget_settings['group_radius'].'" placeholder="default 80">
</div>
</div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-2"> <div class="col-sm-2">
<button type="submit" class="btn btn-default">Set</button> <button type="submit" class="btn btn-default">Set</button>
@@ -87,13 +95,21 @@ if ($config['map']['engine'] == 'leaflet') {
$init_lng = $config['leaflet']['default_lng']; $init_lng = $config['leaflet']['default_lng'];
$init_zoom = $config['leaflet']['default_zoom']; $init_zoom = $config['leaflet']['default_zoom'];
} }
if (!empty($widget_settings['group_radius'])) {
$group_radius = $widget_settings['group_radius'];
}
else {
$group_radius = 80;
}
$map_init = "[" . $init_lat . ", " . $init_lng . "], " . sprintf("%01.0f", $init_zoom); $map_init = "[" . $init_lat . ", " . $init_lng . "], " . sprintf("%01.0f", $init_zoom);
$temp_output .= 'var map = L.map(\'leaflet-map\').setView('.$map_init.'); $temp_output .= 'var map = L.map(\'leaflet-map\').setView('.$map_init.');
L.tileLayer(\'//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png\', { L.tileLayer(\'//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png\', {
attribution: \'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors\' attribution: \'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors\'
}).addTo(map); }).addTo(map);
var markers = L.markerClusterGroup(); var markers = L.markerClusterGroup({
maxClusterRadius: ' . $group_radius . ',
});
var redMarker = L.AwesomeMarkers.icon({ var redMarker = L.AwesomeMarkers.icon({
icon: \'server\', icon: \'server\',
markerColor: \'red\', prefix: \'fa\', iconColor: \'white\' markerColor: \'red\', prefix: \'fa\', iconColor: \'white\'