From a5cc66729d62031ccdd10523c2e9eeb01ade629c Mon Sep 17 00:00:00 2001 From: Andrew Calcutt Date: Thu, 12 Oct 2023 00:26:39 -0400 Subject: [PATCH] refactor: only pass back metadata Signed-off-by: Andrew Calcutt --- src/main.js | 3 +-- src/pmtiles_adapter.js | 2 +- src/serve_data.js | 3 +-- src/serve_rendered.js | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main.js b/src/main.js index eb60606..25e869b 100644 --- a/src/main.js +++ b/src/main.js @@ -128,8 +128,7 @@ const startWithinputFile = async (inputFile) => { const extension = inputFile.split('.').pop().toLowerCase(); if (extension === 'pmtiles') { let FileOpenInfo = PMtilesOpen(inputFile); - const info = await GetPMtilesInfo(FileOpenInfo.pmtiles); - const metadata = info.metadata; + const metadata = await GetPMtilesInfo(FileOpenInfo.pmtiles); if (FileOpenInfo.fd !== undefined) { PMtilesClose(FileOpenInfo.fd); } diff --git a/src/pmtiles_adapter.js b/src/pmtiles_adapter.js index 6c7a387..f41ea9a 100644 --- a/src/pmtiles_adapter.js +++ b/src/pmtiles_adapter.js @@ -60,7 +60,7 @@ export const GetPMtilesInfo = async (pmtiles) => { metadata['maxzoom'] = header.maxZoom; metadata['format'] = GetPmtilesTileType(header.tileType).type; - return { header: header, metadata: metadata }; + return metadata; }; export const GetPMtilesTile = async (pmtiles, z, x, y) => { diff --git a/src/serve_data.js b/src/serve_data.js index d330257..f4e5b97 100644 --- a/src/serve_data.js +++ b/src/serve_data.js @@ -226,8 +226,7 @@ export const serve_data = { let source_type; if (inputType === 'pmtiles') { let FileOpenInfo = PMtilesOpen(inputFile); - const info = await GetPMtilesInfo(FileOpenInfo.pmtiles); - const metadata = info.metadata; + const metadata = await GetPMtilesInfo(FileOpenInfo.pmtiles); source = FileOpenInfo.pmtiles; source_type = 'pmtiles'; diff --git a/src/serve_rendered.js b/src/serve_rendered.js index dc957f9..9727118 100644 --- a/src/serve_rendered.js +++ b/src/serve_rendered.js @@ -1503,8 +1503,7 @@ export const serve_rendered = { if (source_type === 'pmtiles') { let FileOpenInfo = PMtilesOpen(inputFile); - const info = await GetPMtilesInfo(FileOpenInfo.pmtiles); - const metadata = info.metadata; + const metadata = await GetPMtilesInfo(FileOpenInfo.pmtiles); map.sources[name] = FileOpenInfo.pmtiles; map.source_types[name] = 'pmtiles';