ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-08-25 14:37:27 +00:00
Code Issues Projects Releases Wiki Activity

Update fontstacks URL according to https://github.com/klokantech/tileserver-gl/pull/104#issuecomment-274444087

Browse Source
This commit is contained in:
jirik
2017-02-02 13:19:52 +01:00
parent fd291490d0
commit bbf26a3f38
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/metadata.js
+10 -3
View File
@@ -1,4 +1,5 @@
import request from 'request' import request from 'request'
import npmurl from 'url'
function loadJSON(url, defaultValue, cb) { function loadJSON(url, defaultValue, cb) {
request({ request({
@@ -23,9 +24,15 @@ export function downloadGlyphsMetadata(urlTemplate, cb) {
if(!urlTemplate) return cb([]) if(!urlTemplate) return cb([])
// Special handling because Tileserver GL serves the fontstacks metadata differently // Special handling because Tileserver GL serves the fontstacks metadata differently
// https://github.com/klokantech/tileserver-gl/pull/104 // https://github.com/klokantech/tileserver-gl/pull/104#issuecomment-274444087
let url = urlTemplate.replace('/fonts/{fontstack}/{range}.pbf', '/fontstacks.json') let urlObj = npmurl.parse(urlTemplate);
url = url.replace('{fontstack}/{range}.pbf', 'fontstacks.json') const normPathPart = '/%7Bfontstack%7D/%7Brange%7D.pbf';
if(urlObj.pathname === normPathPart) {
urlObj.pathname = '/fontstacks.json';
} else {
urlObj.pathname = urlObj.pathname.replace(normPathPart, '.json');
}
let url = npmurl.format(urlObj);
loadJSON(url, [], cb) loadJSON(url, [], cb)
} }