Improved font serving

This commit is contained in:
Petr Sloup
2016-12-09 13:19:34 +01:00
parent bbc14abb4a
commit 509d32da68
4 changed files with 71 additions and 18 deletions
+19 -2
View File
@@ -1,7 +1,9 @@
'use strict';
var clone = require('clone'),
express = require('express');
express = require('express'),
fs = require('fs'),
path = require('path');
var utils = require('./utils');
@@ -12,14 +14,29 @@ module.exports = function(options, allowedFonts) {
var fontPath = options.paths.fonts;
var existingFonts = {};
fs.readdir(options.paths.fonts, function(err, files) {
files.forEach(function(file) {
fs.stat(path.join(fontPath, file), function(err, stats) {
if (!err) {
if (stats.isDirectory()) {
existingFonts[path.basename(file)] = true;
}
}
});
});
});
app.get('/:fontstack/:range([\\d]+-[\\d]+).pbf',
function(req, res, next) {
var fontstack = decodeURI(req.params.fontstack);
var range = req.params.range;
return utils.getFontsPbf(allowedFonts, fontPath, fontstack, range,
return utils.getFontsPbf(allowedFonts, fontPath, fontstack, range, existingFonts,
function(err, concated) {
if (err || concated.length === 0) {
console.log(err);
console.log(concated.length);
return res.status(400).send('');
} else {
res.header('Content-type', 'application/x-protobuf');