Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: lint

Browse source 
Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-08 14:47:54 -04:00
parent 371e757e5b
commit 08b3a943a6
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.js
View file

@ -143,10 +143,7 @@ const startWithInputFile = async (inputfile) => {
console.log( console.log(
`WARN: PMTiles not in "openmaptiles" format. Serving raw data only...`, `WARN: PMTiles not in "openmaptiles" format. Serving raw data only...`,
); );
config['data'][ config['data'][(metadata.id || 'mbtiles').replace(/[?/:]/g, '_')] = {
(metadata.id || 'mbtiles')
.replace(/[?/:]/g, '_')
] = {
mbtiles: path.basename(inputfile), mbtiles: path.basename(inputfile),
}; };
} }
@ -201,10 +198,7 @@ const startWithInputFile = async (inputfile) => {
console.log( console.log(
`WARN: MBTiles not in "openmaptiles" format. Serving raw data only...`, `WARN: MBTiles not in "openmaptiles" format. Serving raw data only...`,
); );
config['data'][ config['data'][(info.id || 'mbtiles').replace(/[?/:]/g, '_')] = {
(info.id || 'mbtiles')
.replace(/[?/:]/g, '_')
] = {
mbtiles: path.basename(inputfile), mbtiles: path.basename(inputfile),
}; };
} }

17
src/serve_rendered.js
View file

@ -1221,7 +1221,7 @@ export const serve_rendered = {
ratio: ratio, ratio: ratio,
request: async (req, callback) => { request: async (req, callback) => {
const protocol = req.url.split(':')[0]; const protocol = req.url.split(':')[0];
console.log('Handling request:', req); console.log('Handling request:', req);
if (protocol === 'sprites') { if (protocol === 'sprites') {
const dir = options.paths[protocol]; const dir = options.paths[protocol];
const file = unescape(req.url).substring(protocol.length + 3); const file = unescape(req.url).substring(protocol.length + 3);
@ -1257,13 +1257,22 @@ export const serve_rendered = {
const y = parts[5].split('.')[0] | 0; const y = parts[5].split('.')[0] | 0;
const format = parts[5].split('.')[1]; const format = parts[5].split('.')[1];
if (typeof map.sources[sourceId] === 'string' && map.sources[sourceId].split('.').pop().toLowerCase() === 'pmtiles') { if (
let tileinfo = await GetPMtilesTile(map.sources[sourceId], z, x, y); typeof map.sources[sourceId] === 'string' &&
map.sources[sourceId].split('.').pop().toLowerCase() ===
'pmtiles'
) {
let tileinfo = await GetPMtilesTile(
map.sources[sourceId],
z,
x,
y,
);
let data = tileinfo.data; let data = tileinfo.data;
let headers = tileinfo.header; let headers = tileinfo.header;
if (data == undefined) { if (data == undefined) {
if (options.verbose) if (options.verbose)
console.log('MBTiles error, serving empty', err); console.log('MBTiles error, serving empty', err);
createEmptyResponse( createEmptyResponse(
sourceInfo.format, sourceInfo.format,
sourceInfo.color, sourceInfo.color,