IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Geomap: default basemap config cleanup (#37069)

Browse Source
This commit is contained in:
Ryan McKinley
2021-07-21 13:48:20 -07:00
committed by GitHub
parent f26f76df5a
commit e604e69d93
13 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/frontendsettings.go
View File

@@ -259,8 +259,13 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
"caching": map[string]bool{
"enabled": hs.Cfg.SectionWithEnvOverrides("caching").Key("enabled").MustBool(true),
},
"geomapDefaultBaseLayer": hs.Cfg.DefaultBaseLayer,
"geomapDisableCustomBaseLayer": hs.Cfg.DisableCustomBaseLayers,
}
if hs.Cfg.GeomapDefaultBaseLayerConfig != nil {
jsonObj["geomapDefaultBaseLayerConfig"] = hs.Cfg.GeomapDefaultBaseLayerConfig
}
if !hs.Cfg.GeomapEnableCustomBaseLayers {
jsonObj["geomapDisableCustomBaseLayer"] = true
}
return jsonObj, nil