Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle relative publicUrl value

Browse source
This commit is contained in:
Brandon Mitchell 2019-06-02 21:51:43 -04:00
parent e506014763
commit 203a0161e6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/utils.js
View file

@ -1,14 +1,19 @@
'use strict'; 'use strict';
var path = require('path'), var path = require('path'),
fs = require('fs'); fs = require('fs'),
url = require('url');
var clone = require('clone'), var clone = require('clone'),
glyphCompose = require('glyph-pbf-composite'); glyphCompose = require('glyph-pbf-composite');
module.exports.getPublicUrl = function(publicUrl, req) { module.exports.getPublicUrl = function(publicUrl, req) {
return publicUrl || (req.protocol + '://' + req.headers.host + '/') if (publicUrl) {
return (new url.URL(publicUrl, req.protocol + '://' + req.headers.host)).toString()
} else {
return req.protocol + '://' + req.headers.host + '/'
}
} }
module.exports.getTileUrls = function(req, domains, path, format, publicUrl, aliases) { module.exports.getTileUrls = function(req, domains, path, format, publicUrl, aliases) {
@ -54,13 +59,15 @@ module.exports.getTileUrls = function(req, domains, path, format, publicUrl, ali
} }
var uris = []; var uris = [];
if (!publicUrl) { if (!publicUrl) {
domains.forEach(function(domain) { domains.forEach(function(domain) {
uris.push(req.protocol + '://' + domain + '/' + path + uris.push(req.protocol + '://' + domain + '/' + path +
'/{z}/{x}/{y}.' + format + query); '/{z}/{x}/{y}.' + format + query);
}); });
} else { } else {
uris.push(publicUrl + path + '/{z}/{x}/{y}.' + format + query) uris.push(module.exports.getPublicUrl(publicUrl, req) + path +
'/{z}/{x}/{y}.' + format + query)
} }
return uris; return uris;