mirrors/PMTiles
1
0
Fork 0
mirror of https://github.com/protomaps/PMTiles.git synced 2026-02-04 10:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename Response to RangeResponse; fix lastUsed increment in header cache

Browse Source
This commit is contained in:
Brandon Liu
2022-10-04 10:57:32 +08:00
parent 2a805b0f40
commit 93ff392e6f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/v3.ts
View File

@@ -213,7 +213,7 @@ export function findTile(entries: Entry[], tileId: number): Entry | null {
return null;
}
export interface SourceData {
export interface RangeResponse {
data: ArrayBuffer;
etag?: string;
expires?: string;
@@ -227,7 +227,7 @@ export interface Source {
offset: number,
length: number,
signal?: AbortSignal
) => Promise<SourceData>;
) => Promise<RangeResponse>;
getKey: () => string;
}
@@ -243,7 +243,7 @@ export class FileAPISource implements Source {
return this.file.name;
}
async getBytes(offset: number, length: number): Promise<SourceData> {
async getBytes(offset: number, length: number): Promise<RangeResponse> {
const blob = this.file.slice(offset, offset + length);
const a = await blob.arrayBuffer();
return { data: a };
@@ -265,7 +265,7 @@ export class FetchSource implements Source {
offset: number,
length: number,
signal?: AbortSignal
): Promise<SourceData> {
): Promise<RangeResponse> {
let controller;
if (!signal) {
// TODO check this works or assert 206
@@ -392,6 +392,7 @@ export class Cache {
async getHeader(source: Source): Promise<Header> {
const cacheKey = source.getKey();
if (this.cache.has(cacheKey)) {
this.cache.get(cacheKey)!.lastUsed = this.counter++;
const data = await this.cache.get(cacheKey)!.data;
return data as Header;
}
@@ -545,7 +546,7 @@ export class PMTiles {
x: number,
y: number,
signal?: AbortSignal
): Promise<SourceData | undefined> {
): Promise<RangeResponse | undefined> {
const tile_id = zxyToTileId(z, x, y);
const header = await this.cache.getHeader(this.source);
@@ -594,7 +595,7 @@ export class PMTiles {
x: number,
y: number,
signal?: AbortSignal
): Promise<SourceData | undefined> {
): Promise<RangeResponse | undefined> {
try {
return await this.getZxyAttempt(z, x, y, signal);
} catch (e) {