diff --git a/src/main.js b/src/main.js index 1260192..cbb8cc2 100644 --- a/src/main.js +++ b/src/main.js @@ -8,7 +8,11 @@ import { fileURLToPath } from 'url'; import request from 'request'; import { server } from './server.js'; import MBTiles from '@mapbox/mbtiles'; -import { PMtilesOpen, PMtilesClose, GetPMtilesInfo } from './pmtiles_adapter.js'; +import { + PMtilesOpen, + PMtilesClose, + GetPMtilesInfo, +} from './pmtiles_adapter.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -119,7 +123,9 @@ const startWithinputFile = async (inputFile) => { let FileOpenInfo = PMtilesOpen(inputFile); const info = await GetPMtilesInfo(FileOpenInfo.pmtiles); const metadata = info.metadata; - if (FileOpenInfo.fd !== undefined) {PMtilesClose(FileOpenInfo.fd);} + if (FileOpenInfo.fd !== undefined) { + PMtilesClose(FileOpenInfo.fd); + } FileOpenInfo = null; if ( diff --git a/src/pmtiles_adapter.js b/src/pmtiles_adapter.js index 4f7dd09..72891e4 100644 --- a/src/pmtiles_adapter.js +++ b/src/pmtiles_adapter.js @@ -30,8 +30,8 @@ export const PMtilesOpen = (FilePath) => { let pmtiles = undefined; let fd = undefined; - if(isValidHttpUrl(FilePath)) { - const source = new PMTiles.FetchSource(FilePath) + if (isValidHttpUrl(FilePath)) { + const source = new PMTiles.FetchSource(FilePath); pmtiles = new PMTiles.PMTiles(source); } else { fd = fs.openSync(FilePath, 'r'); @@ -123,14 +123,18 @@ const ArrayBufferToBuffer = (array_buffer) => { return buffer; }; +/** + * + * @param string + */ function isValidHttpUrl(string) { let url; - + try { url = new URL(string); } catch (_) { - return false; + return false; } - return url.protocol === "http:" || url.protocol === "https:"; -} \ No newline at end of file + return url.protocol === 'http:' || url.protocol === 'https:'; +} diff --git a/src/serve_data.js b/src/serve_data.js index 74918a8..915795d 100644 --- a/src/serve_data.js +++ b/src/serve_data.js @@ -11,7 +11,11 @@ import Pbf from 'pbf'; import { VectorTile } from '@mapbox/vector-tile'; import { getTileUrls, fixTileJSONCenter } from './utils.js'; -import { PMtilesOpen, GetPMtilesInfo, GetPMtilesTile } from './pmtiles_adapter.js'; +import { + PMtilesOpen, + GetPMtilesInfo, + GetPMtilesTile, +} from './pmtiles_adapter.js'; export const serve_data = { init: (options, repo) => { diff --git a/src/serve_rendered.js b/src/serve_rendered.js index 46111eb..a50d696 100644 --- a/src/serve_rendered.js +++ b/src/serve_rendered.js @@ -19,7 +19,11 @@ import polyline from '@mapbox/polyline'; import proj4 from 'proj4'; import request from 'request'; import { getFontsPbf, getTileUrls, fixTileJSONCenter } from './utils.js'; -import { PMtilesOpen, GetPMtilesInfo, GetPMtilesTile } from './pmtiles_adapter.js'; +import { + PMtilesOpen, + GetPMtilesInfo, + GetPMtilesTile, +} from './pmtiles_adapter.js'; const FLOAT_PATTERN = '[+-]?(?:\\d+|\\d+.?\\d+)'; const PATH_PATTERN =