Koldun/mapserver
1
0
Fork 0
forked from MTSR/mapserver
Code Pull Requests Activity

mapobject config type

Browse Source
This commit is contained in:
NatureFreshMilk 2019-02-12 13:40:33 +01:00
parent 0b3d7c46ab
commit 35e34ad74e
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/app/config.go
View File

@ -19,6 +19,11 @@ type Config struct {
RenderingFetchLimit int `json:"renderingfetchlimit"` RenderingFetchLimit int `json:"renderingfetchlimit"`
RenderingJobs int `json:"renderingjobs"` RenderingJobs int `json:"renderingjobs"`
RenderingQueue int `json:"renderingqueue"` RenderingQueue int `json:"renderingqueue"`
MapObjects *MapObjectConfig `json:"mapobjects"`
}
type MapObjectConfig struct {
Bones bool `json:"bones"`
} }
type WebApiConfig struct { type WebApiConfig struct {
@ -73,6 +78,10 @@ func ParseConfig(filename string) (*Config, error) {
}, },
} }
mapobjs := MapObjectConfig{
Bones: true,
}
cfg := Config{ cfg := Config{
Port: 8080, Port: 8080,
EnableRendering: true, EnableRendering: true,
@ -83,6 +92,7 @@ func ParseConfig(filename string) (*Config, error) {
RenderingFetchLimit: 1000, RenderingFetchLimit: 1000,
RenderingJobs: runtime.NumCPU(), RenderingJobs: runtime.NumCPU(),
RenderingQueue: 100, RenderingQueue: 100,
MapObjects: &mapobjs,
} }
info, err := os.Stat(filename) info, err := os.Stat(filename)

4
server/static/js/main.js
View File

@ -33,7 +33,11 @@ api.getConfig().then(function(cfg){
overlays["POI"] = new PoiOverlay(wsChannel, layerMgr); overlays["POI"] = new PoiOverlay(wsChannel, layerMgr);
overlays["Labels"] = new LabelOverlay(wsChannel, layerMgr); overlays["Labels"] = new LabelOverlay(wsChannel, layerMgr);
overlays["Travelnet"] = new TravelnetOverlay(wsChannel, layerMgr); overlays["Travelnet"] = new TravelnetOverlay(wsChannel, layerMgr);
if (cfg.mapobjects.bones) {
overlays["Bones"] = new BonesOverlay(wsChannel, layerMgr); overlays["Bones"] = new BonesOverlay(wsChannel, layerMgr);
}
overlays["Digilines LCD"] = new LcdOverlay(wsChannel, layerMgr); overlays["Digilines LCD"] = new LcdOverlay(wsChannel, layerMgr);
overlays["Digiterms"] = new DigitermOverlay(wsChannel, layerMgr); overlays["Digiterms"] = new DigitermOverlay(wsChannel, layerMgr);
overlays["Lua Controller"] = new LuacontrollerOverlay(wsChannel, layerMgr); overlays["Lua Controller"] = new LuacontrollerOverlay(wsChannel, layerMgr);

2
server/web/config.go
View File

@ -10,6 +10,7 @@ import (
//Public facing config //Public facing config
type PublicConfig struct { type PublicConfig struct {
Layers []layer.Layer `json:"layers"` Layers []layer.Layer `json:"layers"`
MapObjects *app.MapObjectConfig `json:"mapobjects"`
} }
type ConfigHandler struct { type ConfigHandler struct {
@ -21,6 +22,7 @@ func (h *ConfigHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
webcfg := PublicConfig{} webcfg := PublicConfig{}
webcfg.Layers = h.ctx.Config.Layers webcfg.Layers = h.ctx.Config.Layers
webcfg.MapObjects = h.ctx.Config.MapObjects
json.NewEncoder(resp).Encode(webcfg) json.NewEncoder(resp).Encode(webcfg)
} }