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

Custom Maps: geo map and color backgrounds (#16020)

Browse Source 
* Custom Maps: geo map and color background
tabs blade component
geo-map blade component and related script enhancements

* Update css/js

* style fixes

* update db_schema.yaml

* fix db_schema hand edit

* ignore phpstan being wrong

* Handle null

* another possible null spot

* Use standard file cache for custom map background images

* Create map->image as jpeg so we can compress it

* whitespace fix

* Fix background cancel button when other type is selected than the saved type

* Save and restore layer

* Map must exist before creating static image

* Don't show set as image button for Google and Bing.
Bing gives an odd error, but Google won't work.
This commit is contained in:
Tony Murray
2024-05-13 08:12:59 -05:00
committed by GitHub
parent 1e3e60d59b
commit 0d246a6ffc
29 changed files with 2082 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Maps/CustomMapController.php
View File

@@ -59,7 +59,7 @@ class CustomMapController extends Controller
'hide_overspeed' => 0,
'font_size' => 14,
],
'background' => null,
'background_type' => null,
'map_conf' => [
'height' => '800px',
'width' => '1800px',
@@ -98,15 +98,16 @@ class CustomMapController extends Controller
$map_conf = $map->options;
$map_conf['width'] = $map->width;
$map_conf['height'] = $map->height;
$data = [
return view('map.custom-view', [
'edit' => false,
'map_id' => $map->custom_map_id,
'name' => $map->name,
'menu_group' => $map->menu_group,
'reverse_arrows' => $map->reverse_arrows,
'legend' => $this->legendConfig($map),
'background' => (bool) $map->background_suffix,
'bgversion' => $map->background_version,
'background_type' => $map->background_type,
'background_config' => $map->getBackgroundConfig(),
'page_refresh' => Config::get('page_refresh', 300),
'map_conf' => $map_conf,
'base_url' => Config::get('base_url'),
@@ -115,9 +116,7 @@ class CustomMapController extends Controller
'vmargin' => 20,
'hmargin' => 20,
'screenshot' => $screenshot,
];
return view('map.custom-view', $data);
]);
}
public function edit(CustomMap $map): View
@@ -133,8 +132,8 @@ class CustomMapController extends Controller
'newedge_conf' => $map->newedgeconfig,
'newnode_conf' => $map->newnodeconfig,
'map_conf' => $map->options,
'background' => (bool) $map->background_suffix,
'bgversion' => $map->background_version,
'background_type' => $map->background_type,
'background_config' => $map->getBackgroundConfig(),
'edit' => true,
'vmargin' => 20,
'hmargin' => 20,