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

Update serve_font.js

Browse source
This commit is contained in:
acalcutt 2025-01-05 00:03:14 -05:00
parent 9a98b38db7
commit e79e011ae8
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/serve_font.js
View file

@ -30,13 +30,26 @@ export async function serve_font(options, allowedFonts, programOpts) {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
app.get('/fonts/:fontstack/:range.pbf', async (req, res) => { app.get('/fonts/:fontstack/:range.pbf', async (req, res) => {
const sFontStack = String(req.params.fontstack).replace(/\n|\r/g, '');
const sRange = String(req.params.range).replace(/\n|\r/g, '');
if (verbose) { if (verbose) {
console.log( console.log(
`Handling font request for: /fonts/%s/%s.pbf`, `Handling font request for: /fonts/%s/%s.pbf`,
String(req.params.fontstack).replace(/\n|\r/g, ''), sFontStack,
String(req.params.range).replace(/\n|\r/g, ''), sRange,
); );
} }
const modifiedSince = req.get('if-modified-since');
const cc = req.get('cache-control');
if (modifiedSince && (!cc || cc.indexOf('no-cache') === -1)) {
if (
new Date(lastModified).getTime() === new Date(modifiedSince).getTime()
) {
return res.sendStatus(304);
}
}
const fontstack = decodeURI(req.params.fontstack); const fontstack = decodeURI(req.params.fontstack);
const range = req.params.range; const range = req.params.range;
try { try {
@ -51,8 +64,16 @@ export async function serve_font(options, allowedFonts, programOpts) {
res.header('Last-Modified', lastModified); res.header('Last-Modified', lastModified);
return res.send(concatenated); return res.send(concatenated);
} catch (err) { } catch (err) {
console.error('Error serving font:', err); console.error(
return res.status(400).header('Content-Type', 'text/plain').send(err); `Error serving font: %s/%s.pbf, Error: %s`,
sFontStack,
sRange,
String(err),
);
return res
.status(400)
.header('Content-Type', 'text/plain')
.send('Error serving font');
} }
}); });