max depth <= 3; fix defer in loop

pmtiles/convert.go

@@ -343,7 +343,7 @@ func finalize(logger *log.Logger, resolver *Resolver, header HeaderV3, tmpfile *
 		logger.Println("Num leaf dirs: ", num_leaves)
 		logger.Println("Total dir bytes: ", len(root_bytes)+len(leaves_bytes))
 		logger.Println("Average leaf dir bytes: ", len(leaves_bytes)/num_leaves)
-		logger.Printf("Average bytes per entry: %.2f\n", float64(len(root_bytes)+len(leaves_bytes))/float64(resolver.AddressedTiles))
+		logger.Printf("Average bytes per addressed tile: %.2f\n", float64(len(root_bytes)+len(leaves_bytes))/float64(resolver.AddressedTiles))
 	} else {
 		logger.Println("Total dir bytes: ", len(root_bytes))
 		logger.Printf("Average bytes per addressed tile: %.2f\n", float64(len(root_bytes))/float64(resolver.AddressedTiles))

pmtiles/loop.go

@@ -256,7 +256,7 @@ func (loop *Loop) get_tile(ctx context.Context, http_headers map[string]string,
 	tile_id := ZxyToId(z, x, y)
 	dir_offset, dir_len := header.RootOffset, header.RootLength
 
-	for depth := 0; depth <= 2; depth++ {
+	for depth := 0; depth <= 3; depth++ {
 		dir_req := Request{key: CacheKey{name: name, offset: dir_offset, length: dir_len}, value: make(chan CachedValue, 1)}
 		loop.reqs <- dir_req
 		dir_value := <-dir_req.value
@@ -265,10 +265,10 @@ func (loop *Loop) get_tile(ctx context.Context, http_headers map[string]string,
 		if ok {
 			if entry.RunLength > 0 {
 				r, err := loop.bucket.NewRangeReader(ctx, name+".pmtiles", int64(header.TileDataOffset+entry.Offset), int64(entry.Length), nil)
-				defer r.Close()
 				if err != nil {
 					return 500, http_headers, []byte("Network error")
 				}
+				defer r.Close()
 				b, err := io.ReadAll(r)
 				if err != nil {
 					return 500, http_headers, []byte("I/O error")