From 15be9a6c072bf287c879763a3e573207b06b73ed Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Wed, 5 Oct 2022 17:23:11 +0800 Subject: [PATCH] JS: Fix v2 defaults for Compression/TileType --- js/index.ts | 2 +- js/v2.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/index.ts b/js/index.ts index d44de89..bb3963d 100644 --- a/js/index.ts +++ b/js/index.ts @@ -142,7 +142,7 @@ export enum Compression { } function tryDecompress(buf: ArrayBuffer, compression: Compression) { - if (compression === Compression.None) { + if (compression === Compression.None || compression === Compression.Unknown) { return buf; } else if (compression === Compression.Gzip) { return decompressSync(new Uint8Array(buf)); diff --git a/js/v2.ts b/js/v2.ts index d40afb6..c4e20fa 100644 --- a/js/v2.ts +++ b/js/v2.ts @@ -1,4 +1,4 @@ -import { Source, Header, Cache, RangeResponse, Compression } from "./index"; +import { Source, Header, Cache, RangeResponse, Compression, TileType } from "./index"; import { decompressSync } from "fflate"; export const shift = (n: number, shift: number) => { @@ -213,12 +213,12 @@ async function getHeaderAndRoot( `Archive is missing 'bounds' in metadata, required in v2 and above.` ); } - if (!json_metadata.minzoom) { + if (!('minzoom' in json_metadata)) { console.warn( `Archive is missing 'minzoom' in metadata, required in v2 and above.` ); } - if (!json_metadata.maxzoom) { + if (!('maxzoom' in json_metadata)) { console.warn( `Archive is missing 'maxzoom' in metadata, required in v2 and above.` ); @@ -239,8 +239,8 @@ async function getHeaderAndRoot( numTileContents: 0, clustered: false, internalCompression: Compression.Unknown, - tileCompression: 0, - tileType: 0, + tileCompression: Compression.Unknown, + tileType: TileType.Mvt, minZoom: +json_metadata.minzoom, maxZoom: +json_metadata.maxzoom, minLon: 0,