Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19e821a8fe | ||
|
|
659289d85c | ||
|
|
734d1f01f0 |
12
package.json
12
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tileserver-gl",
|
"name": "tileserver-gl",
|
||||||
"version": "2.3.0",
|
"version": "2.3.1",
|
||||||
"description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
|
"description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
|
||||||
"main": "src/main.js",
|
"main": "src/main.js",
|
||||||
"bin": "src/main.js",
|
"bin": "src/main.js",
|
||||||
@@ -25,19 +25,19 @@
|
|||||||
"@mapbox/vector-tile": "1.3.0",
|
"@mapbox/vector-tile": "1.3.0",
|
||||||
"advanced-pool": "0.3.3",
|
"advanced-pool": "0.3.3",
|
||||||
"base64url": "2.0.0",
|
"base64url": "2.0.0",
|
||||||
"canvas": "1.6.6",
|
"canvas": "1.6.8",
|
||||||
"clone": "2.1.1",
|
"clone": "2.1.1",
|
||||||
"color": "1.0.3",
|
"color": "1.0.3",
|
||||||
"cors": "2.8.4",
|
"cors": "2.8.4",
|
||||||
"express": "4.15.4",
|
"express": "4.16.2",
|
||||||
"glyph-pbf-composite": "0.0.2",
|
"glyph-pbf-composite": "0.0.2",
|
||||||
"handlebars": "4.0.10",
|
"handlebars": "4.0.11",
|
||||||
"http-shutdown": "^1.2.0",
|
"http-shutdown": "^1.2.0",
|
||||||
"morgan": "1.8.2",
|
"morgan": "1.9.0",
|
||||||
"nomnom": "1.8.1",
|
"nomnom": "1.8.1",
|
||||||
"pbf": "3.0.5",
|
"pbf": "3.0.5",
|
||||||
"proj4": "2.4.4",
|
"proj4": "2.4.4",
|
||||||
"request": "2.81.0",
|
"request": "2.83.0",
|
||||||
"sharp": "0.18.2",
|
"sharp": "0.18.2",
|
||||||
"tileserver-gl-styles": "1.2.0"
|
"tileserver-gl-styles": "1.2.0"
|
||||||
},
|
},
|
||||||
|
|||||||
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user