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

More strict routing pattern matching (fix tests)

Browse source
This commit is contained in:
Petr Sloup 2016-03-17 11:45:55 +01:00
parent 34befd43c9
commit 6cf006ec50
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/server.js
View file

@ -174,7 +174,7 @@ module.exports = function(opts, callback) {
}); });
}; };
serveTemplate(/^\/$/, 'index', function() { serveTemplate('/$', 'index', function() {
var styles = clone(config.styles || {}); var styles = clone(config.styles || {});
Object.keys(styles).forEach(function(id) { Object.keys(styles).forEach(function(id) {
var style = styles[id]; var style = styles[id];
@ -211,7 +211,7 @@ module.exports = function(opts, callback) {
}; };
}); });
serveTemplate('/styles/:id/', 'viewer', function(params) { serveTemplate('/styles/:id/$', 'viewer', function(params) {
var id = params.id; var id = params.id;
var style = clone((config.styles || {})[id]); var style = clone((config.styles || {})[id]);
if (!style) { if (!style) {
@ -224,11 +224,11 @@ module.exports = function(opts, callback) {
return style; return style;
}); });
app.use('/raster/:id/', function(req, res, next) { app.use('/raster/:id/$', function(req, res, next) {
return res.redirect(301, '/styles/' + req.params.id + '/'); return res.redirect(301, '/styles/' + req.params.id + '/');
}); });
serveTemplate('/vector/:id/', 'xray', function(params) { serveTemplate('/vector/:id/$', 'xray', function(params) {
var id = params.id; var id = params.id;
var vector = serving.vector[id]; var vector = serving.vector[id];
if (!vector) { if (!vector) {