ashatora/tileserver-gl
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Fix sprite and glyph loading from remote URLs

Browse Source
This commit is contained in:
Petr Sloup
2016-12-08 18:22:11 +01:00
parent 442baee1ce
commit bbc14abb4a
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/serve_rendered.js
View File

@@ -144,9 +144,19 @@ module.exports = function(options, repo, params, id, dataResolver) {
});
};
styleJSON = clone(require(path.join(options.paths.styles, styleFile)));
styleJSON.sprite = 'sprites://' + path.basename(styleFile, '.json');
styleJSON.glyphs = 'fonts://{fontstack}/{range}.pbf';
var styleJSONPath = path.join(options.paths.styles, styleFile);
styleJSON = clone(require(styleJSONPath));
var httpTester = /^(http(s)?:)?\/\//;
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 (!httpTester.test(styleJSON.glyphs)) {
styleJSON.glyphs = 'fonts://' + styleJSON.glyphs;
}
var tileJSON = {
'tilejson': '2.0.0',