mirror of
https://github.com/maptiler/tileserver-gl.git
synced 2024-09-20 00:07:55 +03:00
Prioritize font fallbacks and try to respect proper font style
This commit is contained in:
parent
c1055a9647
commit
734d1f01f0
15
src/utils.js
15
src/utils.js
@ -84,7 +84,20 @@ var getFontPbf = function(allowedFonts, fontPath, name, range, fallbacks) {
|
|||||||
if (err) {
|
if (err) {
|
||||||
console.error('ERROR: Font not found:', name);
|
console.error('ERROR: Font not found:', name);
|
||||||
if (fallbacks && Object.keys(fallbacks).length) {
|
if (fallbacks && Object.keys(fallbacks).length) {
|
||||||
var fallbackName = Object.keys(fallbacks)[0];
|
var fallbackName;
|
||||||
|
|
||||||
|
var fontStyle = name.split(' ').pop();
|
||||||
|
if (['Regular', 'Bold', 'Italic'].indexOf(fontStyle) < 0) {
|
||||||
|
fontStyle = 'Regular';
|
||||||
|
}
|
||||||
|
fallbackName = 'Noto Sans ' + fontStyle;
|
||||||
|
if (!fallbacks[fallbackName]) {
|
||||||
|
fallbackName = 'Open Sans ' + fontStyle;
|
||||||
|
if (!fallbacks[fallbackName]) {
|
||||||
|
fallbackName = Object.keys(fallbacks)[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
console.error('ERROR: Trying to use', fallbackName, 'as a fallback');
|
console.error('ERROR: Trying to use', fallbackName, 'as a fallback');
|
||||||
delete fallbacks[fallbackName];
|
delete fallbacks[fallbackName];
|
||||||
getFontPbf(null, fontPath, fallbackName, range, fallbacks).then(resolve, reject);
|
getFontPbf(null, fontPath, fallbackName, range, fallbacks).then(resolve, reject);
|
||||||
|
Loading…
Reference in New Issue
Block a user