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:08:04 -05:00
parent e79e011ae8
commit dce7732716
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/serve_font.js
View file

@ -30,8 +30,12 @@ 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, ''); const sRange = String(req.params.range).replace(/\n|\r/g, '');
const sFontStack = String(decodeURI(req.params.fontstack)).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`,
@ -50,14 +54,12 @@ export async function serve_font(options, allowedFonts, programOpts) {
} }
} }
const fontstack = decodeURI(req.params.fontstack);
const range = req.params.range;
try { try {
const concatenated = await getFontsPbf( const concatenated = await getFontsPbf(
options.serveAllFonts ? null : allowedFonts, options.serveAllFonts ? null : allowedFonts,
fontPath, fontPath,
fontstack, sFontStack,
range, sRange,
existingFonts, existingFonts,
); );
res.header('Content-type', 'application/x-protobuf'); res.header('Content-type', 'application/x-protobuf');