archive-gh-me/go-staticmaps
1
0
Fork 0
mirror of https://github.com/flopp/go-staticmaps.git synced 2025-12-08 18:26:36 +00:00
Code Issues Projects Releases Wiki Activity

Handle the case that object margins are bigger than the target image size.

Browse Source
This commit is contained in:
Florian Pigorsch 2021-02-06 13:36:33 +01:00
parent 7fadbc4a0d
commit 1292f1734c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
context.go
View File

@ -261,8 +261,13 @@ func (m *Context) determineZoom(bounds s2.Rect, center s2.LatLng) int {
tileSize := m.tileProvider.TileSize
marginL, marginT, marginR, marginB := m.determineExtraMarginPixels()
w := (float64(m.width) - 2.0*math.Max(marginL, marginR)) / float64(tileSize)
h := (float64(m.height) - 2.0*math.Max(marginT, marginB)) / float64(tileSize)
w := (float64(m.width) - marginL - marginR) / float64(tileSize)
h := (float64(m.height) - marginT - marginB) / float64(tileSize)
if w <= 0 || h <= 0 {
log.Printf("Object margins are bigger than the target image size => ignoring object margins for calculation of the zoom level")
w = float64(m.width) / float64(tileSize)
h = float64(m.height) / float64(tileSize)
}
minX := (b.Lo().Lng.Degrees() + 180.0) / 360.0
maxX := (b.Hi().Lng.Degrees() + 180.0) / 360.0
minY := (1.0 - math.Log(math.Tan(b.Lo().Lat.Radians())+(1.0/math.Cos(b.Lo().Lat.Radians())))/math.Pi) / 2.0
@ -332,6 +337,11 @@ func (m *Context) adjustCenter(center s2.LatLng, zoom int) s2.LatLng {
}
}
if (maxX-minX) > float64(m.width) || (maxY-minY) > float64(m.height) {
log.Printf("Object margins are bigger than the target image size => ignoring object margins for adjusting the center")
return center
}
centerX := (maxX + minX) * 0.5
centerY := (maxY + minY) * 0.5
@ -606,6 +616,10 @@ func (m *Context) renderLayer(gc *gg.Context, zoom int, trans *Transformer, tile
} else if x >= tiles {
x = x - tiles
}
if x < 0 || x >= tiles {
log.Printf("Skipping out of bounds tile column %d/?", x)
continue
}
for yy := 0; yy < trans.tCountY; yy++ {
y := trans.tOriginY + yy
if y < 0 || y >= tiles {