Skip to content

Commit 9a400a6

Browse files
authored
make the FindTile utility function part of public API [#46] (#230)
1 parent 771432f commit 9a400a6

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

pmtiles/directory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func DeserializeEntries(data *bytes.Buffer, compression Compression) []EntryV3 {
360360
return entries
361361
}
362362

363-
func findTile(entries []EntryV3, tileID uint64) (EntryV3, bool) {
363+
func FindTile(entries []EntryV3, tileID uint64) (EntryV3, bool) {
364364
m := 0
365365
n := len(entries) - 1
366366
for m <= n {

pmtiles/directory_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@ func TestOptimizeDirectories(t *testing.T) {
156156

157157
func TestFindTileMissing(t *testing.T) {
158158
entries := make([]EntryV3, 0)
159-
_, ok := findTile(entries, 0)
159+
_, ok := FindTile(entries, 0)
160160
assert.False(t, ok)
161161
}
162162

163163
func TestFindTileFirstEntry(t *testing.T) {
164164
entries := []EntryV3{{TileID: 100, Offset: 1, Length: 1, RunLength: 1}}
165-
entry, ok := findTile(entries, 100)
165+
entry, ok := FindTile(entries, 100)
166166
assert.Equal(t, true, ok)
167167
assert.Equal(t, uint64(1), entry.Offset)
168168
assert.Equal(t, uint32(1), entry.Length)
169-
_, ok = findTile(entries, 101)
169+
_, ok = FindTile(entries, 101)
170170
assert.Equal(t, false, ok)
171171
}
172172

173173
func TestFindTileMultipleEntries(t *testing.T) {
174174
entries := []EntryV3{
175175
{TileID: 100, Offset: 1, Length: 1, RunLength: 2},
176176
}
177-
entry, ok := findTile(entries, 101)
177+
entry, ok := FindTile(entries, 101)
178178
assert.Equal(t, true, ok)
179179
assert.Equal(t, uint64(1), entry.Offset)
180180
assert.Equal(t, uint32(1), entry.Length)
@@ -183,7 +183,7 @@ func TestFindTileMultipleEntries(t *testing.T) {
183183
{TileID: 100, Offset: 1, Length: 1, RunLength: 1},
184184
{TileID: 150, Offset: 2, Length: 2, RunLength: 2},
185185
}
186-
entry, ok = findTile(entries, 151)
186+
entry, ok = FindTile(entries, 151)
187187
assert.Equal(t, true, ok)
188188
assert.Equal(t, uint64(2), entry.Offset)
189189
assert.Equal(t, uint32(2), entry.Length)
@@ -193,7 +193,7 @@ func TestFindTileMultipleEntries(t *testing.T) {
193193
{TileID: 100, Offset: 2, Length: 2, RunLength: 1},
194194
{TileID: 150, Offset: 3, Length: 3, RunLength: 1},
195195
}
196-
entry, ok = findTile(entries, 51)
196+
entry, ok = FindTile(entries, 51)
197197
assert.Equal(t, true, ok)
198198
assert.Equal(t, uint64(1), entry.Offset)
199199
assert.Equal(t, uint32(1), entry.Length)
@@ -203,7 +203,7 @@ func TestFindTileLeafSearch(t *testing.T) {
203203
entries := []EntryV3{
204204
{TileID: 100, Offset: 1, Length: 1, RunLength: 0},
205205
}
206-
entry, ok := findTile(entries, 150)
206+
entry, ok := FindTile(entries, 150)
207207
assert.Equal(t, true, ok)
208208
assert.Equal(t, uint64(1), entry.Offset)
209209
assert.Equal(t, uint32(1), entry.Length)

pmtiles/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ func (server *Server) getTileAttempt(ctx context.Context, httpHeaders map[string
377377
return 500, httpHeaders, []byte("I/O Error"), rootValue.etag
378378
}
379379
directory := dirValue.directory
380-
entry, ok := findTile(directory, tileID)
380+
entry, ok := FindTile(directory, tileID)
381381
if !ok {
382382
break
383383
}

pmtiles/show.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func Show(_ *log.Logger, output io.Writer, bucketURL string, key string, showHea
135135
return fmt.Errorf("I/O Error")
136136
}
137137
directory := DeserializeEntries(bytes.NewBuffer(b), header.InternalCompression)
138-
entry, ok := findTile(directory, tileID)
138+
entry, ok := FindTile(directory, tileID)
139139
if ok {
140140
if entry.RunLength > 0 {
141141
tileReader, err := bucket.NewRangeReader(ctx, key, int64(header.TileDataOffset+entry.Offset), int64(entry.Length))

0 commit comments

Comments
 (0)