MTSR/mapserver
3
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases 1 Wiki Activity

initial rendering disable option

Browse Source
This commit is contained in:
Thomas Rudin 2019-03-29 21:05:53 +01:00
parent ce4ac4dfc9
commit a48e2c2678
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
server/app/config.go
View File

@ -10,18 +10,19 @@ import (
)
type Config struct {
Port int `json:"port"`
EnablePrometheus bool `json:"enableprometheus"`
EnableRendering bool `json:"enablerendering"`
EnableTransparency bool `json:"enabletransparency"`
Webdev bool `json:"webdev"`
WebApi *WebApiConfig `json:"webapi"`
Layers []*layer.Layer `json:"layers"`
RenderingFetchLimit int `json:"renderingfetchlimit"`
RenderingJobs int `json:"renderingjobs"`
RenderingQueue int `json:"renderingqueue"`
MapObjects *MapObjectConfig `json:"mapobjects"`
MapBlockAccessorCfg *MapBlockAccessorConfig `json:"mapblockaccessor"`
Port int `json:"port"`
EnablePrometheus bool `json:"enableprometheus"`
EnableRendering bool `json:"enablerendering"`
EnableInitialRendering bool `json:"enableinitialrendering"`
EnableTransparency bool `json:"enabletransparency"`
Webdev bool `json:"webdev"`
WebApi *WebApiConfig `json:"webapi"`
Layers []*layer.Layer `json:"layers"`
RenderingFetchLimit int `json:"renderingfetchlimit"`
RenderingJobs int `json:"renderingjobs"`
RenderingQueue int `json:"renderingqueue"`
MapObjects *MapObjectConfig `json:"mapobjects"`
MapBlockAccessorCfg *MapBlockAccessorConfig `json:"mapblockaccessor"`
}
type MapBlockAccessorConfig struct {
@ -137,18 +138,19 @@ func ParseConfig(filename string) (*Config, error) {
}
cfg := Config{
Port: 8080,
EnableRendering: true,
EnablePrometheus: true,
EnableTransparency: true,
Webdev: false,
WebApi: &webapi,
Layers: layers,
RenderingFetchLimit: 10000,
RenderingJobs: runtime.NumCPU(),
RenderingQueue: 100,
MapObjects: &mapobjs,
MapBlockAccessorCfg: &mapblockaccessor,
Port: 8080,
EnableRendering: true,
EnablePrometheus: true,
EnableInitialRendering: true,
EnableTransparency: true,
Webdev: false,
WebApi: &webapi,
Layers: layers,
RenderingFetchLimit: 10000,
RenderingJobs: runtime.NumCPU(),
RenderingQueue: 100,
MapObjects: &mapobjs,
MapBlockAccessorCfg: &mapblockaccessor,
}
info, err := os.Stat(filename)

6
server/tilerendererjob/job.go
View File

@ -13,8 +13,10 @@ func Job(ctx *app.App) {
ctx.Settings.SetInt64(settings.SETTING_LAST_MTIME, time.Now().Unix())
}
if ctx.Settings.GetBool(settings.SETTING_INITIAL_RUN, true) {
initialRender(ctx)
if ctx.Config.EnableInitialRendering {
if ctx.Settings.GetBool(settings.SETTING_INITIAL_RUN, true) {
initialRender(ctx)
}
}
incrementalRender(ctx)