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

BlockAccessor -> MapBlockAccessor

Browse Source
This commit is contained in:
NatureFreshMilk 2019-07-31 13:41:35 +02:00
parent 2f2e1d0d58
commit 2b02558ba0
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/app.go
View File

@ -1,6 +1,7 @@
package app package app
import ( import (
"mapserver/blockaccessor"
"mapserver/colormapping" "mapserver/colormapping"
"mapserver/db" "mapserver/db"
"mapserver/eventbus" "mapserver/eventbus"
@ -23,7 +24,8 @@ type App struct {
TileDB *tiledb.TileDB TileDB *tiledb.TileDB
Settings settings.Settings Settings settings.Settings
BlockAccessor *mapblockaccessor.MapBlockAccessor MapBlockAccessor *mapblockaccessor.MapBlockAccessor
BlockAccessor *blockaccessor.BlockAccessor
Colormapping *colormapping.ColorMapping Colormapping *colormapping.ColorMapping
Mapblockrenderer *mapblockrenderer.MapBlockRenderer Mapblockrenderer *mapblockrenderer.MapBlockRenderer
Tilerenderer *tilerenderer.TileRenderer Tilerenderer *tilerenderer.TileRenderer

4
app/setup.go
View File

@ -71,7 +71,7 @@ func Setup(p params.ParamsType, cfg *Config) *App {
panic(err) panic(err)
} }
a.BlockAccessor = mapblockaccessor.NewMapBlockAccessor( a.MapBlockAccessor = mapblockaccessor.NewMapBlockAccessor(
a.Blockdb, a.Blockdb,
expireDuration, purgeDuration, expireDuration, purgeDuration,
cfg.MapBlockAccessorCfg.MaxItems) cfg.MapBlockAccessorCfg.MaxItems)
@ -114,7 +114,7 @@ func Setup(p params.ParamsType, cfg *Config) *App {
} }
//mapblock renderer //mapblock renderer
a.Mapblockrenderer = mapblockrenderer.NewMapBlockRenderer(a.BlockAccessor, a.Colormapping) a.Mapblockrenderer = mapblockrenderer.NewMapBlockRenderer(a.MapBlockAccessor, a.Colormapping)
//mapserver database //mapserver database
if a.Worldconfig[worldconfig.CONFIG_PSQL_MAPSERVER] != "" { if a.Worldconfig[worldconfig.CONFIG_PSQL_MAPSERVER] != "" {

2
mapobject/setup.go
View File

@ -162,5 +162,5 @@ func Setup(ctx *app.App) {
l.AddMapObject("locator:beacon_3", loc) l.AddMapObject("locator:beacon_3", loc)
} }
ctx.BlockAccessor.Eventbus.AddListener(&l) ctx.MapBlockAccessor.Eventbus.AddListener(&l)
} }

2
tilerendererjob/incremental.go
View File

@ -24,7 +24,7 @@ func incrementalRender(ctx *app.App) {
for true { for true {
start := time.Now() start := time.Now()
result, err := ctx.BlockAccessor.FindMapBlocksByMtime(lastMtime, ctx.Config.RenderingFetchLimit, ctx.Config.Layers) result, err := ctx.MapBlockAccessor.FindMapBlocksByMtime(lastMtime, ctx.Config.RenderingFetchLimit, ctx.Config.Layers)
if err != nil { if err != nil {
panic(err) panic(err)

2
tilerendererjob/initial.go
View File

@ -18,7 +18,7 @@ func initialRender(ctx *app.App) {
for true { for true {
start := time.Now() start := time.Now()
result, err := ctx.BlockAccessor.FindNextLegacyBlocks(ctx.Settings, ctx.Config.Layers, ctx.Config.RenderingFetchLimit) result, err := ctx.MapBlockAccessor.FindNextLegacyBlocks(ctx.Settings, ctx.Config.Layers, ctx.Config.RenderingFetchLimit)
if err != nil { if err != nil {
panic(err) panic(err)

2
web/mapblock.go
View File

@ -27,7 +27,7 @@ func (h *MapblockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request)
z, _ := strconv.Atoi(parts[2]) z, _ := strconv.Atoi(parts[2])
c := coords.NewMapBlockCoords(x, y, z) c := coords.NewMapBlockCoords(x, y, z)
mb, err := h.ctx.BlockAccessor.GetMapBlock(c) mb, err := h.ctx.MapBlockAccessor.GetMapBlock(c)
if err != nil { if err != nil {
resp.WriteHeader(500) resp.WriteHeader(500)