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

fix: allow sprite array in styles

Browse source 
Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2024-04-20 14:55:48 -04:00 committed by acalcutt
parent 3ef69c904f
commit eb978ad2f1
2 changed files with 88 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/serve_rendered.js
View file

@ -1045,16 +1045,34 @@ export const serve_rendered = {
return false; return false;
} }
if (styleJSON.sprite && !httpTester.test(styleJSON.sprite)) { if (styleJSON.sprite) {
styleJSON.sprite = if (Array.isArray(styleJSON.sprite)) {
'sprites://' + styleJSON.sprite.forEach((spriteItem) => {
styleJSON.sprite if (!httpTester.test(spriteItem.url)) {
.replace('{style}', path.basename(styleFile, '.json')) spriteItem.url =
.replace( 'sprites://' +
'{styleJsonFolder}', spriteItem.url
path.relative(options.paths.sprites, path.dirname(styleJSONPath)), .replace('{style}', path.basename(styleFile, '.json'))
); .replace(
'{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleJSONPath)),
);
}
});
} else {
if (!httpTester.test(styleJSON.sprite)) {
styleJSON.sprite =
'sprites://' +
styleJSON.sprite
.replace('{style}', path.basename(styleFile, '.json'))
.replace(
'{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleJSONPath)),
);
}
}
} }
if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) { if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) {
styleJSON.glyphs = `fonts://${styleJSON.glyphs}`; styleJSON.glyphs = `fonts://${styleJSON.glyphs}`;
} }

79
src/serve_style.js
View file

@ -42,7 +42,13 @@ export const serve_style = {
} }
// mapbox-gl-js viewer cannot handle sprite urls with query // mapbox-gl-js viewer cannot handle sprite urls with query
if (styleJSON_.sprite) { if (styleJSON_.sprite) {
styleJSON_.sprite = fixUrl(req, styleJSON_.sprite, item.publicUrl); if (Array.isArray(styleJSON_.sprite)) {
styleJSON_.sprite.forEach((spriteItem) => {
spriteItem.url = fixUrl(req, spriteItem.url, item.publicUrl);
});
} else {
styleJSON_.sprite = fixUrl(req, styleJSON_.sprite, item.publicUrl);
}
} }
if (styleJSON_.glyphs) { if (styleJSON_.glyphs) {
styleJSON_.glyphs = fixUrl(req, styleJSON_.glyphs, item.publicUrl); styleJSON_.glyphs = fixUrl(req, styleJSON_.glyphs, item.publicUrl);
@ -50,14 +56,27 @@ export const serve_style = {
return res.send(styleJSON_); return res.send(styleJSON_);
}); });
app.get('/:id/sprite:scale(@[23]x)?.:format([\\w]+)', (req, res, next) => { app.get('/:id/:name:scale(@[23]x)?.:format([\\w]+)', (req, res, next) => {
const item = repo[req.params.id]; const item = repo[req.params.id];
if (!item || !item.spritePath) {
if (!item || !item.spritePaths) {
return res.sendStatus(404); return res.sendStatus(404);
} }
let spritePath
for (const sprite of item.spritePaths) {
if (sprite.name === req.params.name) {
spritePath = sprite.path;
}
}
if (!spritePath) {
return res.sendStatus(404);
}
const scale = req.params.scale; const scale = req.params.scale;
const format = req.params.format; const format = req.params.format;
const filename = `${item.spritePath + (scale || '')}.${format}`; const filename = `${spritePath + (scale || '')}.${format}`;
return fs.readFile(filename, (err, data) => { return fs.readFile(filename, (err, data) => {
if (err) { if (err) {
console.log('Sprite load error:', filename); console.log('Sprite load error:', filename);
@ -135,27 +154,51 @@ export const serve_style = {
} }
} }
let spritePath; let spriteName
let spritePaths = [];
if (styleJSON.sprite && !httpTester.test(styleJSON.sprite)) { if (styleJSON.sprite && styleJSON.sprite) {
spritePath = path.join( if (Array.isArray(styleJSON.sprite)) {
options.paths.sprites, styleJSON.sprite.forEach((spriteItem) => {
styleJSON.sprite if (!httpTester.test(spriteItem.url)) {
.replace('{style}', path.basename(styleFile, '.json')) spriteName = spriteItem.url.substring(spriteItem.url.lastIndexOf('/') + 1);
.replace( let spritePath = path.join(
'{styleJsonFolder}', options.paths.sprites,
path.relative(options.paths.sprites, path.dirname(styleFile)), spriteItem.url
), .replace('{style}', path.basename(styleFile, '.json'))
); .replace(
styleJSON.sprite = `local://styles/${id}/sprite`; '{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleFile))
)
);
spriteItem.url = `local://styles/${id}/` + spriteName;
spritePaths.push({id: spriteItem.id, name: spriteName, path: spritePath});
}
});
} else {
if (!httpTester.test(styleJSON.sprite)) {
spriteName = styleJSON.sprite.substring(styleJSON.sprite.lastIndexOf('/') + 1);
let spritePath = path.join(
options.paths.sprites,
styleJSON.sprite
.replace('{style}', path.basename(styleFile, '.json'))
.replace(
'{styleJsonFolder}',
path.relative(options.paths.sprites, path.dirname(styleFile))
)
);
styleJSON.sprite = `local://styles/${id}/` + spriteName;
spritePaths.push({id: 'default', name: spriteName, path: spritePath});
}
}
} }
if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) { if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) {
styleJSON.glyphs = 'local://fonts/{fontstack}/{range}.pbf'; styleJSON.glyphs = 'local://fonts/{fontstack}/{range}.pbf';
} }
repo[id] = { repo[id] = {
styleJSON, styleJSON,
spritePath, spritePaths,
publicUrl, publicUrl,
name: styleJSON.name, name: styleJSON.name,
}; };