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

fix: lint

Browse source 
Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2024-04-20 19:06:59 -04:00 committed by acalcutt
parent 92b528498d
commit 80953f49d7
2 changed files with 67 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/serve_rendered.js
View file

@ -1055,7 +1055,10 @@ export const serve_rendered = {
.replace('{style}', path.basename(styleFile, '.json')) .replace('{style}', path.basename(styleFile, '.json'))
.replace( .replace(
'{styleJsonFolder}', '{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleJSONPath)), path.relative(
options.paths.sprites,
path.dirname(styleJSONPath),
),
); );
} }
}); });
@ -1067,7 +1070,10 @@ export const serve_rendered = {
.replace('{style}', path.basename(styleFile, '.json')) .replace('{style}', path.basename(styleFile, '.json'))
.replace( .replace(
'{styleJsonFolder}', '{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleJSONPath)), path.relative(
options.paths.sprites,
path.dirname(styleJSONPath),
),
); );
} }
} }

30
src/serve_style.js
View file

@ -56,7 +56,9 @@ export const serve_style = {
return res.send(styleJSON_); return res.send(styleJSON_);
}); });
app.get('/:id/sprite(/:name)?:scale(@[23]x)?.:format([\\w]+)', (req, res, next) => { app.get(
'/:id/sprite(/:name)?:scale(@[23]x)?.:format([\\w]+)',
(req, res, next) => {
const item = repo[req.params.id]; const item = repo[req.params.id];
const spriteName = req.params.name || 'sprite'; const spriteName = req.params.name || 'sprite';
@ -64,7 +66,7 @@ export const serve_style = {
return res.sendStatus(404); return res.sendStatus(404);
} }
let spritePath let spritePath;
for (const sprite of item.spritePaths) { for (const sprite of item.spritePaths) {
if (sprite.name === spriteName) { if (sprite.name === spriteName) {
spritePath = sprite.path; spritePath = sprite.path;
@ -83,12 +85,14 @@ export const serve_style = {
console.log('Sprite load error:', filename); console.log('Sprite load error:', filename);
return res.sendStatus(404); return res.sendStatus(404);
} else { } else {
if (format === 'json') res.header('Content-type', 'application/json'); if (format === 'json')
res.header('Content-type', 'application/json');
if (format === 'png') res.header('Content-type', 'image/png'); if (format === 'png') res.header('Content-type', 'image/png');
return res.send(data); return res.send(data);
} }
}); });
}); },
);
return app; return app;
}, },
@ -160,18 +164,24 @@ export const serve_style = {
if (Array.isArray(styleJSON.sprite)) { if (Array.isArray(styleJSON.sprite)) {
styleJSON.sprite.forEach((spriteItem) => { styleJSON.sprite.forEach((spriteItem) => {
if (!httpTester.test(spriteItem.url)) { if (!httpTester.test(spriteItem.url)) {
let spriteName = spriteItem.url.substring(spriteItem.url.lastIndexOf('/') + 1); let spriteName = spriteItem.url.substring(
spriteItem.url.lastIndexOf('/') + 1,
);
let spritePath = path.join( let spritePath = path.join(
options.paths.sprites, options.paths.sprites,
spriteItem.url spriteItem.url
.replace('{style}', path.basename(styleFile, '.json')) .replace('{style}', path.basename(styleFile, '.json'))
.replace( .replace(
'{styleJsonFolder}', '{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleFile)) path.relative(options.paths.sprites, path.dirname(styleFile)),
) ),
); );
spriteItem.url = `local://styles/${id}/sprite/` + spriteName; spriteItem.url = `local://styles/${id}/sprite/` + spriteName;
spritePaths.push({id: spriteItem.id, name: spriteName, path: spritePath}); spritePaths.push({
id: spriteItem.id,
name: spriteName,
path: spritePath,
});
} }
}); });
} else { } else {
@ -182,8 +192,8 @@ export const serve_style = {
.replace('{style}', path.basename(styleFile, '.json')) .replace('{style}', path.basename(styleFile, '.json'))
.replace( .replace(
'{styleJsonFolder}', '{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleFile)) path.relative(options.paths.sprites, path.dirname(styleFile)),
) ),
); );
styleJSON.sprite = `local://styles/${id}/sprite`; styleJSON.sprite = `local://styles/${id}/sprite`;
spritePaths.push({ id: 'default', name: 'sprite', path: spritePath }); spritePaths.push({ id: 'default', name: 'sprite', path: spritePath });