From a6e1eff1d056afb5b7203824c5ebdf55c15c0f17 Mon Sep 17 00:00:00 2001
From: NatureFreshMilk <naturefreshmilk@github.com>
Date: Tue, 22 Jan 2019 13:46:58 +0100
Subject: [PATCH] working (fast) initial rendering

---
 coords/tilecoords.go     |  2 +-
 initialrenderer/job.go   | 29 +++--------------------------
 tilerenderer/renderer.go |  2 +-
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/coords/tilecoords.go b/coords/tilecoords.go
index 82d2ab7..47e9832 100644
--- a/coords/tilecoords.go
+++ b/coords/tilecoords.go
@@ -20,7 +20,7 @@ func NewTileCoords(x, y, zoom int, layerId int) *TileCoords {
 
 func (tc *TileCoords) ZoomOut(n int) *TileCoords {
 	var nc *TileCoords = tc
-	for i := 1; i<n; i++ {
+	for i := 1; i < n; i++ {
 		nc = nc.GetZoomedOutTile()
 	}
 
diff --git a/initialrenderer/job.go b/initialrenderer/job.go
index 8292347..c297186 100644
--- a/initialrenderer/job.go
+++ b/initialrenderer/job.go
@@ -3,8 +3,8 @@ package initialrenderer
 import (
 	"mapserver/app"
 	"mapserver/coords"
-	"time"
 	"strconv"
+	"time"
 
 	"github.com/sirupsen/logrus"
 )
@@ -41,37 +41,14 @@ func Job(ctx *app.App) {
 
 		lastcoords = *newlastcoords
 
-		//Render zoom 12
-		for _, mb := range mblist {
-			//zoom 13
-			tc := coords.GetTileCoordsFromMapBlock(mb.Pos, ctx.Config.Layers)
-
-			//zoom 12
-			tc = tc.GetZoomedOutTile()
-
-			fields = logrus.Fields{
-				"X":       tc.X,
-				"Y":       tc.Y,
-				"Zoom":    tc.Zoom,
-				"LayerId": tc.LayerId,
-			}
-			logrus.WithFields(fields).Debug("Dispatching tile rendering (z12)")
-
-			ctx.Objectdb.RemoveTile(tc)
-			_, err = ctx.Tilerenderer.Render(tc, 2)
-			if err != nil {
-				panic(err)
-			}
-		}
-
 		tileRenderedMap := make(map[string]bool)
 
-		for i := 11; i<=1; i-- {
+		for i := 12; i >= 1; i-- {
 			for _, mb := range mblist {
 				//13
 				tc := coords.GetTileCoordsFromMapBlock(mb.Pos, ctx.Config.Layers)
 
-				//11-1
+				//12-1
 				tc = tc.ZoomOut(13 - i)
 
 				key := getTileKey(tc)
diff --git a/tilerenderer/renderer.go b/tilerenderer/renderer.go
index 9353b74..6e31630 100644
--- a/tilerenderer/renderer.go
+++ b/tilerenderer/renderer.go
@@ -235,7 +235,7 @@ func (tr *TileRenderer) RenderImage(tc *coords.TileCoords, recursionDepth int) (
 		"Y":          tc.Y,
 		"Zoom":       tc.Zoom,
 		"LayerId":    tc.LayerId,
-		"size": len(tile.Data),
+		"size":       len(tile.Data),
 		"quadrender": quadrender,
 		"quadresize": quadresize,
 		"encode":     encode,