Use common app.get for images and static images
Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
acalcutt
parent
70d6986a9e
commit
e1460fbf67
1 changed files with 274 additions and 236 deletions
|
|
@ -624,35 +624,34 @@ const respondImage = async (
|
|||
});
|
||||
};
|
||||
|
||||
const existingFonts = {};
|
||||
let maxScaleFactor = 2;
|
||||
|
||||
export const serve_rendered = {
|
||||
/**
|
||||
* Initializes the serve_rendered module.
|
||||
* @param {object} options Configuration options.
|
||||
* @param {object} repo Repository object.
|
||||
* @returns {Promise<express.Application>} A promise that resolves to the Express app.
|
||||
* Handles requests for tile images.
|
||||
* @param {object} options - Configuration options for the server.
|
||||
* @param {object} repo - The repository object holding style data.
|
||||
* @param {object} req - Express request object.
|
||||
* @param {object} res - Express response object.
|
||||
* @param {Function} next - Express next middleware function.
|
||||
* @param {number} maxScaleFactor - The maximum scale factor allowed.
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
init: async function (options, repo) {
|
||||
maxScaleFactor = Math.min(Math.floor(options.maxScaleFactor || 3), 9);
|
||||
const app = express().disable('x-powered-by');
|
||||
|
||||
app.get(
|
||||
`/:id{/:tileSize}/:z/:x/:y{@:scale}{.:format}`,
|
||||
async (req, res, next) => {
|
||||
try {
|
||||
console.log(req.params);
|
||||
if (
|
||||
req.params.z === 'static' ||
|
||||
(req.params.tileSize &&
|
||||
req.params.tileSize != 256 &&
|
||||
req.params.tileSize != 512)
|
||||
async function handleTileRequest(
|
||||
options,
|
||||
repo,
|
||||
req,
|
||||
res,
|
||||
next,
|
||||
maxScaleFactor,
|
||||
) {
|
||||
//workaroud for /:id/static{/:raw}{/:type}/:width{x:height}{@:scale}{.:format}
|
||||
next('route');
|
||||
} else {
|
||||
const item = repo[req.params.id];
|
||||
const {
|
||||
id,
|
||||
p2: zParam,
|
||||
p3: xParam,
|
||||
p4: yParam,
|
||||
scale: scaleParam,
|
||||
format,
|
||||
p1: tileSize,
|
||||
} = req.params;
|
||||
const item = repo[id];
|
||||
if (!item) {
|
||||
return res.sendStatus(404);
|
||||
}
|
||||
|
|
@ -664,13 +663,11 @@ export const serve_rendered = {
|
|||
return res.sendStatus(304);
|
||||
}
|
||||
}
|
||||
|
||||
const z = req.params.z | 0;
|
||||
const x = req.params.x | 0;
|
||||
const y = req.params.y | 0;
|
||||
const scale = parseScale(req.params.scale, maxScaleFactor);
|
||||
const format = req.params.format;
|
||||
const tileSize = parseInt(req.params.tileSize, 10) || 256;
|
||||
const z = parseFloat(zParam) | 0;
|
||||
const x = parseFloat(xParam) | 0;
|
||||
const y = parseFloat(yParam) | 0;
|
||||
const scale = parseScale(scaleParam, maxScaleFactor);
|
||||
const parsedTileSize = parseInt(tileSize, 10) || 256;
|
||||
if (
|
||||
scale == null ||
|
||||
z < 0 ||
|
||||
|
|
@ -684,63 +681,74 @@ export const serve_rendered = {
|
|||
}
|
||||
|
||||
const tileCenter = mercator.ll(
|
||||
[
|
||||
((x + 0.5) / (1 << z)) * (256 << z),
|
||||
((y + 0.5) / (1 << z)) * (256 << z),
|
||||
],
|
||||
[((x + 0.5) / (1 << z)) * (256 << z), ((y + 0.5) / (1 << z)) * (256 << z)],
|
||||
z,
|
||||
);
|
||||
|
||||
// prettier-ignore
|
||||
return await respondImage(
|
||||
options, item, z, tileCenter[0], tileCenter[1], 0, 0, tileSize, tileSize, scale, format, res,
|
||||
options, item, z, tileCenter[0], tileCenter[1], 0, 0, parsedTileSize, parsedTileSize, scale, format, res,
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
next('route');
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
if (options.serveStaticMaps !== false) {
|
||||
app.get(
|
||||
`/:id/static{/:raw}{/:type}/:width{x:height}{@:scale}{.:format}`,
|
||||
async (req, res, next) => {
|
||||
try {
|
||||
const item = repo[req.params.id];
|
||||
console.log(req.params);
|
||||
const format = req.params.format;
|
||||
const w = parseInt(req.params.width) || 512;
|
||||
const h = parseInt(req.params.height) || 512;
|
||||
const scale = parseScale(req.params.scale, maxScaleFactor);
|
||||
let raw = req.params.raw !== undefined;
|
||||
let type = req.params.type;
|
||||
if (!type) {
|
||||
/**
|
||||
* Handles requests for static map images.
|
||||
* @param {object} options - Configuration options for the server.
|
||||
* @param {object} repo - The repository object holding style data.
|
||||
* @param {object} req - Express request object.
|
||||
* @param {object} res - Express response object.
|
||||
* @param {Function} next - Express next middleware function.
|
||||
* @param {number} maxScaleFactor - The maximum scale factor allowed.
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
async function handleStaticRequest(
|
||||
options,
|
||||
repo,
|
||||
req,
|
||||
res,
|
||||
next,
|
||||
maxScaleFactor,
|
||||
) {
|
||||
const {
|
||||
id,
|
||||
scale: scaleParam,
|
||||
format,
|
||||
p2: raw,
|
||||
p3: type,
|
||||
p4: width,
|
||||
p5: height,
|
||||
} = req.params;
|
||||
const item = repo[id];
|
||||
const parsedWidth = parseInt(width) || 512;
|
||||
const parsedHeight = parseInt(height) || 512;
|
||||
const scale = parseScale(scaleParam, maxScaleFactor);
|
||||
let isRaw = raw !== undefined;
|
||||
let staticType = type;
|
||||
|
||||
if (!staticType) {
|
||||
//workaround for type when raw is not set
|
||||
type = req.params.raw;
|
||||
raw = false;
|
||||
staticType = raw;
|
||||
isRaw = false;
|
||||
}
|
||||
|
||||
if (!item || !type || !format || !scale) {
|
||||
if (!item || !staticType || !format || !scale) {
|
||||
return res.sendStatus(404);
|
||||
}
|
||||
|
||||
const staticTypeMatch = type.match(staticTypeRegex);
|
||||
console.log(staticTypeMatch.groups);
|
||||
const staticTypeMatch = staticType.match(staticTypeRegex);
|
||||
console.log(staticTypeMatch);
|
||||
if (staticTypeMatch.groups.lon) {
|
||||
// Center Based Static Image
|
||||
const z = staticTypeMatch.groups.zoom;
|
||||
let x = staticTypeMatch.groups.lon;
|
||||
let y = staticTypeMatch.groups.lat;
|
||||
const bearing = staticTypeMatch.groups.bearing;
|
||||
const pitch = staticTypeMatch.groups.pitch;
|
||||
|
||||
const z = parseFloat(staticTypeMatch.groups.zoom) || 0;
|
||||
let x = parseFloat(staticTypeMatch.groups.lon) || 0;
|
||||
let y = parseFloat(staticTypeMatch.groups.lat) || 0;
|
||||
const bearing = parseFloat(staticTypeMatch.groups.bearing) || 0;
|
||||
const pitch = parseInt(staticTypeMatch.groups.pitch) || 0;
|
||||
if (z < 0) {
|
||||
return res.status(404).send('Invalid zoom');
|
||||
}
|
||||
|
||||
const transformer = raw
|
||||
const transformer = isRaw
|
||||
? mercator.inverse.bind(mercator)
|
||||
: item.dataProjWGStoInternalWGS;
|
||||
|
||||
|
|
@ -751,20 +759,16 @@ export const serve_rendered = {
|
|||
}
|
||||
|
||||
const paths = extractPathsFromQuery(req.query, transformer);
|
||||
const markers = extractMarkersFromQuery(
|
||||
req.query,
|
||||
options,
|
||||
transformer,
|
||||
);
|
||||
const markers = extractMarkersFromQuery(req.query, options, transformer);
|
||||
|
||||
// prettier-ignore
|
||||
const overlay = await renderOverlay(
|
||||
z, x, y, bearing, pitch, w, h, scale, paths, markers, req.query,
|
||||
z, x, y, bearing, pitch, parsedWidth, parsedHeight, scale, paths, markers, req.query,
|
||||
);
|
||||
|
||||
// prettier-ignore
|
||||
return await respondImage(
|
||||
options, item, z, x, y, bearing, pitch, w, h, scale, format, res, overlay, 'static',
|
||||
options, item, z, x, y, bearing, pitch, parsedWidth, parsedHeight, scale, format, res, overlay, 'static',
|
||||
);
|
||||
} else if (staticTypeMatch.groups.minx) {
|
||||
// Area Based Static Image
|
||||
|
|
@ -776,7 +780,7 @@ export const serve_rendered = {
|
|||
];
|
||||
let center = [(bbox[0] + bbox[2]) / 2, (bbox[1] + bbox[3]) / 2];
|
||||
|
||||
const transformer = raw
|
||||
const transformer = isRaw
|
||||
? mercator.inverse.bind(mercator)
|
||||
: item.dataProjWGStoInternalWGS;
|
||||
|
||||
|
|
@ -790,43 +794,33 @@ export const serve_rendered = {
|
|||
center = transformer(center);
|
||||
}
|
||||
|
||||
const z = calcZForBBox(bbox, w, h, req.query);
|
||||
const z = calcZForBBox(bbox, parsedWidth, parsedHeight, req.query);
|
||||
const x = center[0];
|
||||
const y = center[1];
|
||||
const bearing = 0;
|
||||
const pitch = 0;
|
||||
|
||||
const paths = extractPathsFromQuery(req.query, transformer);
|
||||
const markers = extractMarkersFromQuery(
|
||||
req.query,
|
||||
options,
|
||||
transformer,
|
||||
);
|
||||
|
||||
const markers = extractMarkersFromQuery(req.query, options, transformer);
|
||||
// prettier-ignore
|
||||
const overlay = await renderOverlay(
|
||||
z, x, y, bearing, pitch, w, h, scale, paths, markers, req.query,
|
||||
z, x, y, bearing, pitch, parsedWidth, parsedHeight, scale, paths, markers, req.query,
|
||||
);
|
||||
|
||||
// prettier-ignore
|
||||
return await respondImage(
|
||||
options, item, z, x, y, bearing, pitch, w, h, scale, format, res, overlay, 'static',
|
||||
options, item, z, x, y, bearing, pitch, parsedWidth, parsedHeight, scale, format, res, overlay, 'static',
|
||||
);
|
||||
} else if (staticTypeMatch.groups.auto) {
|
||||
// Area Static Image
|
||||
const bearing = 0;
|
||||
const pitch = 0;
|
||||
|
||||
const transformer = raw
|
||||
const transformer = isRaw
|
||||
? mercator.inverse.bind(mercator)
|
||||
: item.dataProjWGStoInternalWGS;
|
||||
|
||||
const paths = extractPathsFromQuery(req.query, transformer);
|
||||
const markers = extractMarkersFromQuery(
|
||||
req.query,
|
||||
options,
|
||||
transformer,
|
||||
);
|
||||
const markers = extractMarkersFromQuery(req.query, options, transformer);
|
||||
|
||||
// Extract coordinates from markers
|
||||
const markerCoordinates = [];
|
||||
|
|
@ -858,7 +852,7 @@ export const serve_rendered = {
|
|||
|
||||
// Calculate zoom level
|
||||
const maxZoom = parseFloat(req.query.maxzoom);
|
||||
let z = calcZForBBox(bbox, w, h, req.query);
|
||||
let z = calcZForBBox(bbox, parsedWidth, parsedHeight, req.query);
|
||||
if (maxZoom > 0) {
|
||||
z = Math.min(z, maxZoom);
|
||||
}
|
||||
|
|
@ -868,22 +862,66 @@ export const serve_rendered = {
|
|||
|
||||
// prettier-ignore
|
||||
const overlay = await renderOverlay(
|
||||
z, x, y, bearing, pitch, w, h, scale, paths, markers, req.query,
|
||||
z, x, y, bearing, pitch, parsedWidth, parsedHeight, scale, paths, markers, req.query,
|
||||
);
|
||||
|
||||
// prettier-ignore
|
||||
return await respondImage(
|
||||
options, item, z, x, y, bearing, pitch, w, h, scale, format, res, overlay, 'static',
|
||||
options, item, z, x, y, bearing, pitch, parsedWidth, parsedHeight, scale, format, res, overlay, 'static',
|
||||
);
|
||||
} else {
|
||||
return res.sendStatus(404);
|
||||
}
|
||||
}
|
||||
|
||||
const existingFonts = {};
|
||||
let maxScaleFactor = 2;
|
||||
|
||||
export const serve_rendered = {
|
||||
/**
|
||||
* Initializes the serve_rendered module.
|
||||
* @param {object} options Configuration options.
|
||||
* @param {object} repo Repository object.
|
||||
* @returns {Promise<express.Application>} A promise that resolves to the Express app.
|
||||
*/
|
||||
init: async function (options, repo) {
|
||||
maxScaleFactor = Math.min(Math.floor(options.maxScaleFactor || 3), 9);
|
||||
const app = express().disable('x-powered-by');
|
||||
|
||||
app.get(
|
||||
`/:id{/:p1}/:p2/:p3/:p4{x:p5}{@:scale}{.:format}`,
|
||||
async (req, res, next) => {
|
||||
try {
|
||||
const { p2 } = req.params;
|
||||
if (p2 === 'static') {
|
||||
// Route to static if p2 is static
|
||||
if (options.serveStaticMaps !== false) {
|
||||
return handleStaticRequest(
|
||||
options,
|
||||
repo,
|
||||
req,
|
||||
res,
|
||||
next,
|
||||
maxScaleFactor,
|
||||
);
|
||||
}
|
||||
return res.sendStatus(404);
|
||||
}
|
||||
|
||||
return handleTileRequest(
|
||||
options,
|
||||
repo,
|
||||
req,
|
||||
res,
|
||||
next,
|
||||
maxScaleFactor,
|
||||
);
|
||||
} catch (e) {
|
||||
next('route');
|
||||
console.log(e);
|
||||
return next(e);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
app.get('{/:tileSize}/:id.json', (req, res, next) => {
|
||||
const item = repo[req.params.id];
|
||||
|
|
|
|||
Loading…
Reference in a new issue