diff --git a/mapblockrenderer/renderer.go b/mapblockrenderer/renderer.go index 67a9389..0cca14b 100644 --- a/mapblockrenderer/renderer.go +++ b/mapblockrenderer/renderer.go @@ -210,8 +210,8 @@ func (r *MapBlockRenderer) Render(pos1, pos2 *coords.MapBlockCoords) (*image.NRG r32, g32, b32, a32 := c.RGBA() r8, g8, b8, a8 := uint8(r32), uint8(g32), uint8(b32), uint8(a32) - for Y := imgY; Y < imgY + IMG_SCALE; Y++ { - ix := (Y * IMG_SIZE + imgX) << 2 + for Y := imgY; Y < imgY+IMG_SCALE; Y++ { + ix := (Y*IMG_SIZE + imgX) << 2 for X := 0; X < IMG_SCALE; X++ { img.Pix[ix] = r8 ix++ diff --git a/tilerenderer/renderer.go b/tilerenderer/renderer.go index 254c887..9fea37e 100644 --- a/tilerenderer/renderer.go +++ b/tilerenderer/renderer.go @@ -3,6 +3,8 @@ package tilerenderer import ( "bytes" "errors" + "github.com/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" "image" "image/draw" "image/png" @@ -14,8 +16,6 @@ import ( "mapserver/tiledb" "strconv" "time" - "github.com/sirupsen/logrus" - "github.com/prometheus/client_golang/prometheus" ) type TileRenderer struct { @@ -37,7 +37,7 @@ func resizeImage(src *image.NRGBA, tgt *image.NRGBA, xoffset int, yoffset int) { for y := 0; y < h; y++ { six := y * sinc * 2 - tix := 4 * xoffset + (yoffset + y) * tinc + tix := 4*xoffset + (yoffset+y)*tinc for x := 0; x < w; x++ { r := (uint16(src.Pix[six]) + uint16(src.Pix[six+4]) + uint16(src.Pix[six+sinc]) + uint16(src.Pix[six+sinc+4])) >> 2 g := (uint16(src.Pix[six+1]) + uint16(src.Pix[six+5]) + uint16(src.Pix[six+sinc+1]) + uint16(src.Pix[six+sinc+5])) >> 2 @@ -47,8 +47,8 @@ func resizeImage(src *image.NRGBA, tgt *image.NRGBA, xoffset int, yoffset int) { tgt.Pix[tix+1] = uint8(g) tgt.Pix[tix+2] = uint8(b) tgt.Pix[tix+3] = uint8(a) - tix+=4 - six+=8 + tix += 4 + six += 8 } } } @@ -68,11 +68,11 @@ func NewTileRenderer(mapblockrenderer *mapblockrenderer.MapBlockRenderer, } const ( - IMG_SIZE = 256 + IMG_SIZE = 256 SUB_IMG_SIZE = IMG_SIZE >> 1 ) -func (tr *TileRenderer) Render(tc *coords.TileCoords) (error) { +func (tr *TileRenderer) Render(tc *coords.TileCoords) error { //No tile in db _, err := tr.renderImage(tc, 2)