ashatora/tileserver-gl
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Configurable optional alias for .pbf tiles (#109)

Browse Source
This commit is contained in:
Petr Sloup
2017-01-25 09:43:34 +01:00
parent 1079ece860
commit 6231f9f7a7
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/serve_data.js
View File

@@ -50,14 +50,18 @@ module.exports = function(options, repo, params, id, styles) {
});
});
var tilePattern = '/' + id + '/:z(\\d+)/:x(\\d+)/:y(\\d+).:format([\\w]+)';
var tilePattern = '/' + id + '/:z(\\d+)/:x(\\d+)/:y(\\d+).:format([\\w.]+)';
app.get(tilePattern, function(req, res, next) {
var z = req.params.z | 0,
x = req.params.x | 0,
y = req.params.y | 0;
if (req.params.format != tileJSON.format &&
!(req.params.format == 'geojson' && tileJSON.format == 'pbf')) {
var format = req.params.format;
if (format == options.pbfAlias) {
format = 'pbf';
}
if (format != tileJSON.format &&
!(format == 'geojson' && tileJSON.format == 'pbf')) {
return res.status(404).send('Invalid format');
}
if (z < tileJSON.minzoom || 0 || x < 0 || y < 0 ||
@@ -106,9 +110,9 @@ module.exports = function(options, repo, params, id, styles) {
}
}
}
if (req.params.format == 'pbf') {
if (format == 'pbf') {
headers['Content-Type'] = 'application/x-protobuf';
} else if (req.params.format == 'geojson') {
} else if (format == 'geojson') {
headers['Content-Type'] = 'application/json';
if (isGzipped) {
@@ -150,7 +154,9 @@ module.exports = function(options, repo, params, id, styles) {
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, {
'pbf': options.pbfAlias
});
return res.send(info);
});