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

chore: move nested respondImage() function to top level

Browse source 
Signed-off-by: Martin d'Allens <martin.dallens@liberty-rider.com>
This commit is contained in:
Martin d'Allens 2023-11-19 23:28:42 +01:00 committed by Andrew Calcutt
parent 2525b29cf4
commit 3437a653b3
1 changed files with 173 additions and 176 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/serve_rendered.js
View file

@ -352,21 +352,8 @@ const calcZForBBox = (bbox, w, h, query) => {
return z;
};
const existingFonts = {};
let maxScaleFactor = 2;
export const serve_rendered = {
init: (options, repo) => {
maxScaleFactor = Math.min(Math.floor(options.maxScaleFactor || 3), 9);
let scalePattern = '';
for (let i = 2; i <= maxScaleFactor; i++) {
scalePattern += i.toFixed();
}
scalePattern = `@[${scalePattern}]x`;
const app = express().disable('x-powered-by');
const respondImage = (
const respondImage = (
options,
item,
z,
lon,
@ -381,7 +368,7 @@ export const serve_rendered = {
next,
opt_overlay,
opt_mode = 'tile',
) => {
) => {
if (
Math.abs(lon) > 180 ||
Math.abs(lat) > 85.06 ||
@ -439,10 +426,7 @@ export const serve_rendered = {
pool.release(renderer);
if (err) {
console.error(err);
return res
.status(500)
.header('Content-Type', 'text/plain')
.send(err);
return res.status(500).header('Content-Type', 'text/plain').send(err);
}
// Fix semi-transparent outlines on raw, premultiplied input
@ -493,12 +477,7 @@ export const serve_rendered = {
composite_array.push({ input: opt_overlay });
}
if (item.watermark) {
const canvas = renderWatermark(
width,
height,
scale,
item.watermark,
);
const canvas = renderWatermark(width, height, scale, item.watermark);
composite_array.push({ input: canvas.toBuffer() });
}
@ -540,7 +519,21 @@ export const serve_rendered = {
});
});
});
};
};
const existingFonts = {};
let maxScaleFactor = 2;
export const serve_rendered = {
init: (options, repo) => {
maxScaleFactor = Math.min(Math.floor(options.maxScaleFactor || 3), 9);
let scalePattern = '';
for (let i = 2; i <= maxScaleFactor; i++) {
scalePattern += i.toFixed();
}
scalePattern = `@[${scalePattern}]x`;
const app = express().disable('x-powered-by');
app.get(
`/:id/:z(\\d+)/:x(\\d+)/:y(\\d+):scale(${scalePattern})?.:format([\\w]+)`,
@ -582,6 +575,7 @@ export const serve_rendered = {
z,
);
return respondImage(
options,
item,
z,
tileCenter[0],
@ -664,6 +658,7 @@ export const serve_rendered = {
);
return respondImage(
options,
item,
z,
x,
@ -745,6 +740,7 @@ export const serve_rendered = {
req.query,
);
return respondImage(
options,
item,
z,
x,
@ -879,6 +875,7 @@ export const serve_rendered = {
);
return respondImage(
options,
item,
z,
x,