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

👷 injecting baseURL into all template datasets

Browse source
This commit is contained in:
Michael Straßburger 2016-12-05 16:40:41 +01:00
parent 4402c52377
commit 707d91681f
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/serve_data.js
View file

@ -13,9 +13,9 @@ module.exports = function(options, repo, params, id) {
var app = express().disable('x-powered-by');
var mbtilesFile = path.resolve(options.paths.mbtiles, params.mbtiles);
var baseURL = options.baseURL;
var tileJSON = {
'tiles': params.domains || options.domains,
'baseURL': options.baseURL
'tiles': params.domains || options.domains
};
repo[id] = tileJSON;
@ -82,7 +82,7 @@ module.exports = function(options, repo, params, id) {
app.get('/' + id + '.json', function(req, res, next) {
var info = clone(tileJSON);
info.tiles = utils.getTileUrls(req, info.tiles,
'data/' + id, info.format);
'data/' + id, info.format, baseURL);
return res.send(info);
});

5
src/serve_style.js
View file

@ -59,9 +59,8 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
if (!opt_nokey && req.query.key) {
query = '?key=' + req.query.key;
}
var url = baseURL ? baseURL : req.protocol + '://' + req.headers.host;
return url.replace(
'local://', url + '/') + query;
return url.replace('local://',
(baseURL ? baseURL : req.protocol + '://' + req.headers.host) + '/') + query;
};
var styleJSON_ = clone(styleJSON);

2
src/server.js
View file

@ -255,6 +255,7 @@ module.exports = function(opts, callback) {
req, style.serving_rendered.tiles,
'styles/' + id + '/rendered', style.serving_rendered.format, baseURL);
style.xyz_link = tiles[0];
style.baseURL = baseURL;
}
});
var data = clone(serving.data || {});
@ -296,6 +297,7 @@ module.exports = function(opts, callback) {
size /= 1024;
}
data_.formatted_filesize = size.toFixed(2) + ' ' + suffix;
data_.baseURL = baseURL;
}
});
return {