add padding around expired tiles

expire/tilelist.go

@@ -2,14 +2,14 @@ package expire
 
 import (
 	"fmt"
-	"github.com/omniscale/imposm3/element"
-	"github.com/omniscale/imposm3/proj"
 	"io"
-	"math"
 	"os"
 	"path/filepath"
 	"sync"
 	"time"
+
+	"github.com/omniscale/imposm3/element"
+	"github.com/omniscale/imposm3/proj"
 )
 
 var mercBbox = [4]float64{
@@ -30,15 +30,24 @@ func init() {
 	}
 }
 
-func TileCoord(long, lat float64, zoom uint32) (uint32, uint32) {
+// fraction of a tile that is added as a padding around an expired tile
+const tilePadding = 0.1
+
+func TileCoords(long, lat float64, zoom uint32) []tileKey {
 	x, y := proj.WgsToMerc(long, lat)
 	res := mercRes[zoom]
 	x = x - mercBbox[0]
 	y = mercBbox[3] - y
-	tileX := uint32(math.Floor(x / (res * 256)))
+	tileX := float32(x / (res * 256))
-	tileY := uint32(math.Floor(y / (res * 256)))
+	tileY := float32(y / (res * 256))
 
-	return tileX, tileY
+	tiles := make([]tileKey, 0, 4)
+	for x := uint32(tileX - tilePadding); x <= uint32(tileX+tilePadding); x++ {
+		for y := uint32(tileY - tilePadding); y <= uint32(tileY+tilePadding); y++ {
+			tiles = append(tiles, tileKey{x, y})
+		}
+	}
+	return tiles
 }
 
 type TileList struct {
@@ -50,8 +59,8 @@ type TileList struct {
 }
 
 type tileKey struct {
-	x uint32
+	X uint32
-	y uint32
+	Y uint32
 }
 
 type tile struct {
@@ -70,9 +79,10 @@ func NewTileList(zoom int, out string) *TileList {
 }
 
 func (tl *TileList) addCoord(long, lat float64) {
-	tileX, tileY := TileCoord(long, lat, tl.zoom)
 	tl.mu.Lock()
-	tl.tiles[tileKey{tileX, tileY}] = struct{}{}
+	for _, t := range TileCoords(long, lat, tl.zoom) {
+		tl.tiles[t] = struct{}{}
+	}
 	tl.mu.Unlock()
 }
 
@@ -88,7 +98,7 @@ func (tl *TileList) ExpireNodes(nodes []element.Node, closed bool) {
 
 func (tl *TileList) writeTiles(w io.Writer) error {
 	for tileKey, _ := range tl.tiles {
-		_, err := fmt.Fprintf(w, "%d/%d/%d\n", tl.zoom, tileKey.x, tileKey.y)
+		_, err := fmt.Fprintf(w, "%d/%d/%d\n", tl.zoom, tileKey.X, tileKey.Y)
 		if err != nil {
 			return err
 		}

expire/tilelist_test.go

@@ -0,0 +1,33 @@
+package expire
+
+import (
+	"testing"
+)
+
+func TestTileCoords(t *testing.T) {
+	tests := []struct {
+		long  float64
+		lat   float64
+		zoom  uint32
+		tiles []tileKey
+	}{
+		{0, 0, 14, []tileKey{{8191, 8191}, {8191, 8192}, {8192, 8191}, {8192, 8192}}},
+		{0.01, 0, 14, []tileKey{{8192, 8191}, {8192, 8192}}},
+		{0, 0.01, 14, []tileKey{{8191, 8191}, {8192, 8191}}},
+		{0.01, 0.01, 14, []tileKey{{8192, 8191}}},
+		{0.02, 0.01, 14, []tileKey{{8192, 8191}, {8193, 8191}}},
+	}
+
+	for _, test := range tests {
+		actual := TileCoords(test.long, test.lat, test.zoom)
+		if len(actual) != len(test.tiles) {
+			t.Errorf("%v != %v", actual, test.tiles)
+			continue
+		}
+		for i := range actual {
+			if actual[i] != test.tiles[i] {
+				t.Errorf("%v != %v", actual, test.tiles)
+			}
+		}
+	}
+}

test/expire_tiles_test.go

@@ -108,16 +108,18 @@ func TestExpireTiles_CheckExpireFile(t *testing.T) {
 		{"modify relation from nodes (old)", 4.0001, 3, true},
 		{"modify relation from nodes (new)", 4.0001, -3, true},
 	} {
-		x, y := expire.TileCoord(test.long, test.lat, 14)
+		for _, coord := range expire.TileCoords(test.long, test.lat, 14) {
-		if test.expire {
+			x, y := coord.X, coord.Y
-			if _, ok := tiles[tile{x: int(x), y: int(y), z: 14}]; !ok {
+			if test.expire {
-				t.Errorf("missing expire tile for %s 14/%d/%d for %f %f", test.reason, x, y, test.long, test.lat)
+				if _, ok := tiles[tile{x: int(x), y: int(y), z: 14}]; !ok {
+					t.Errorf("missing expire tile for %s 14/%d/%d for %f %f", test.reason, x, y, test.long, test.lat)
+				} else {
+					delete(tiles, tile{x: int(x), y: int(y), z: 14})
+				}
 			} else {
-				delete(tiles, tile{x: int(x), y: int(y), z: 14})
+				if _, ok := tiles[tile{x: int(x), y: int(y), z: 14}]; ok {
-			}
+					t.Errorf("found expire tile for %s 14/%d/%d for %f %f", test.reason, x, y, test.long, test.lat)
-		} else {
+				}
-			if _, ok := tiles[tile{x: int(x), y: int(y), z: 14}]; ok {
-				t.Errorf("found expire tile for %s 14/%d/%d for %f %f", test.reason, x, y, test.long, test.lat)
 			}
 		}
 	}