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

Fix behavior of area-based static maps

Browse source
This commit is contained in:
Petr Sloup 2016-03-09 17:10:27 +01:00
parent ad867f305b
commit a495993e68
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/serve_raster.js
View file

@ -188,7 +188,8 @@ module.exports = function(maps, options, prefix) {
if (Math.abs(lon) > 180 || Math.abs(lat) > 85.06) { if (Math.abs(lon) > 180 || Math.abs(lat) > 85.06) {
return res.status(400).send('Invalid center'); return res.status(400).send('Invalid center');
} }
if (width <= 0 || height <= 0 || width > 2048 || height > 2048) { if (Math.min(width, height) <= 0 ||
Math.max(width, height) * scale > 6000) {
return res.status(400).send('Invalid size'); return res.status(400).send('Invalid size');
} }
if (format == 'png' || format == 'webp') { if (format == 'png' || format == 'webp') {
@ -288,11 +289,15 @@ module.exports = function(maps, options, prefix) {
FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN); FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN);
app.get(util.format(staticPattern, boundsPattern), function(req, res, next) { app.get(util.format(staticPattern, boundsPattern), function(req, res, next) {
var bbox = [+req.params.minx, +req.params.miny,
+req.params.maxx, +req.params.maxy];
var z = req.params.z | 0, var z = req.params.z | 0,
x = ((+req.params.minx) + (+req.params.maxx)) / 2, x = (bbox[0] + bbox[2]) / 2,
y = ((+req.params.miny) + (+req.params.maxy)) / 2, y = (bbox[1] + bbox[3]) / 2;
w = req.params.width | 0, var minCorner = mercator.px([bbox[0], bbox[3]], z),
h = req.params.height | 0, maxCorner = mercator.px([bbox[2], bbox[1]], z);
var w = (maxCorner[0] - minCorner[0]) | 0,
h = (maxCorner[1] - minCorner[1]) | 0,
scale = getScale(req.params.scale), scale = getScale(req.params.scale),
format = req.params.format; format = req.params.format;
return respondImage(z, x, y, w, h, scale, format, res, next); return respondImage(z, x, y, w, h, scale, format, res, next);