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

improve sprite path

Browse source 
Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
acalcutt 2024-12-30 00:23:33 -05:00
parent 592e74c303
commit 32fd48814c
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/serve_style.js
View file

@ -63,21 +63,13 @@ export const serve_style = {
return res.send(styleJSON_); return res.send(styleJSON_);
}); });
app.get(`/:id/:sprite{/:spriteID}{@:scale}{.:format}`, (req, res, next) => { app.get(`/:id/sprite{/:spriteID}{@:scale}{.:format}`, (req, res, next) => {
const { spriteID = 'default', id, format } = req.params; const { spriteID = 'default', id, format } = req.params;
const scale = allowedSpriteScales(req.params.scale); const spriteScale = allowedSpriteScales(req.params.scale);
if (
!allowedSpriteFormats(format) ||
((id == 256 || id == 512) && format === 'json')
) {
//Workaround for {/:tileSize}/:id.json' and /styles/:id/wmts.xml
return next('route');
}
const item = repo[id]; const item = repo[id];
if (!item) { if (!item || !allowedSpriteFormats(format)) {
return res.sendStatus(404); // Ensure item exists first to prevent errors return res.sendStatus(404);
} }
const sprite = item.spritePaths.find((sprite) => sprite.id === spriteID); const sprite = item.spritePaths.find((sprite) => sprite.id === spriteID);
@ -85,9 +77,9 @@ export const serve_style = {
return res.status(400).send('Bad Sprite ID or Scale'); return res.status(400).send('Bad Sprite ID or Scale');
} }
const spriteScale = allowedSpriteScales(scale);
const filename = `${sprite.path}${spriteScale}.${format}`; const filename = `${sprite.path}${spriteScale}.${format}`;
// eslint-disable-next-line security/detect-non-literal-fs-filename
fs.readFile(filename, (err, data) => { fs.readFile(filename, (err, data) => {
if (err) { if (err) {
console.error('Sprite load error: %s, Error: %s', filename, err); console.error('Sprite load error: %s, Error: %s', filename, err);