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

applied lint:js:fix

Browse source
This commit is contained in:
Miko 2024-10-13 22:54:31 +02:00
parent 21a25592d2
commit c94bd22b8e
3 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/serve_data.js
View file

@ -174,8 +174,8 @@ export const serve_data = {
} }
if ( if (
item.source._info.encoding != "terrarium" && item.source._info.encoding != 'terrarium' &&
item.source._info.encoding != "mapbox" item.source._info.encoding != 'mapbox'
) { ) {
return res.status(404).send('Missing encoding'); return res.status(404).send('Missing encoding');
} }
@ -263,20 +263,36 @@ export const serve_data = {
var green = imgdata.data[index + 1]; var green = imgdata.data[index + 1];
var blue = imgdata.data[index + 2]; var blue = imgdata.data[index + 2];
let elevation; let elevation;
if (item.source._info.encoding == "mapbox") { if (item.source._info.encoding == 'mapbox') {
elevation = -10000 + ((red * 256 * 256 + green * 256 + blue) * 0.1); elevation =
} else if (item.source._info.encoding == "terrarium") { -10000 + (red * 256 * 256 + green * 256 + blue) * 0.1;
elevation = (red * 256 + green + blue / 256) - 32768; } else if (item.source._info.encoding == 'terrarium') {
elevation = red * 256 + green + blue / 256 - 32768;
} else { } else {
elevation = "invalid encoding"; elevation = 'invalid encoding';
} }
//"index": index, "length": imgdata.data.length, //"index": index, "length": imgdata.data.length,
return res.status(200).send({ "z": z, "x": xy[0], "y": xy[1], "red": red, "green": green, "blue": blue, "latitude": tileCenter[0], "longitude": tileCenter[1], "elevation": elevation }); return res.status(200).send({
z: z,
x: xy[0],
y: xy[1],
red: red,
green: green,
blue: blue,
latitude: tileCenter[0],
longitude: tileCenter[1],
elevation: elevation,
});
};
image.onerror = (err) => {
return res
.status(500)
.header('Content-Type', 'text/plain')
.send(err.message);
}; };
image.onerror = err => { return res.status(500).header('Content-Type', 'text/plain').send(err.message); }
//image.onerror = err => { return res.status(200).header('Content-Type', 'image/webp').send(data); } //image.onerror = err => { return res.status(200).header('Content-Type', 'image/webp').send(data); }
if (item.source._info.format == "webp") { if (item.source._info.format == 'webp') {
const img = await sharp(data).toFormat('png').toBuffer(); const img = await sharp(data).toFormat('png').toBuffer();
image.src = img; image.src = img;
} else { } else {
@ -372,7 +388,7 @@ export const serve_data = {
const mbw = await openMbTilesWrapper(inputFile); const mbw = await openMbTilesWrapper(inputFile);
const info = await mbw.getInfo(); const info = await mbw.getInfo();
source = mbw.getMbTiles(); source = mbw.getMbTiles();
info["encoding"] = params["encoding"]; info['encoding'] = params['encoding'];
tileJSON['name'] = id; tileJSON['name'] = id;
tileJSON['format'] = 'pbf'; tileJSON['format'] = 'pbf';

18
src/server.js
View file

@ -513,13 +513,16 @@ function start(opts) {
data.is_vector = tileJSON.format === 'pbf'; data.is_vector = tileJSON.format === 'pbf';
if (!data.is_vector) { if (!data.is_vector) {
if ((tileJSON.encoding === 'terrarium' || tileJSON.encoding === 'mapbox')) { if (
tileJSON.encoding === 'terrarium' ||
tileJSON.encoding === 'mapbox'
) {
data.elevation_link = getTileUrls( data.elevation_link = getTileUrls(
req, req,
tileJSON.tiles, tileJSON.tiles,
`data/${id}/elevation` `data/${id}/elevation`,
)[0]; )[0];
}; }
if (center) { if (center) {
const centerPx = mercator.px([center[0], center[1]], center[2]); const centerPx = mercator.px([center[0], center[1]], center[2]);
data.thumbnail = `${center[2]}/${Math.floor(centerPx[0] / 256)}/${Math.floor(centerPx[1] / 256)}.${tileJSON.format}`; data.thumbnail = `${center[2]}/${Math.floor(centerPx[0] / 256)}/${Math.floor(centerPx[1] / 256)}.${tileJSON.format}`;
@ -610,13 +613,16 @@ function start(opts) {
if (!data) { if (!data) {
return null; return null;
} }
const is_terrain = ((data.tileJSON.encoding === 'terrarium' || data.tileJSON.encoding === 'mapbox') && (preview === "preview")); const is_terrain =
(data.tileJSON.encoding === 'terrarium' ||
data.tileJSON.encoding === 'mapbox') &&
preview === 'preview';
return { return {
...data, ...data,
id, id,
use_maplibre: (data.tileJSON.format === 'pbf' || is_terrain), use_maplibre: data.tileJSON.format === 'pbf' || is_terrain,
is_terrain: is_terrain, is_terrain: is_terrain,
is_terrainrgb: (data.tileJSON.encoding === "mapbox"), is_terrainrgb: data.tileJSON.encoding === 'mapbox',
terrain_encoding: data.tileJSON.encoding, terrain_encoding: data.tileJSON.encoding,
}; };
}); });

4
src/utils.js
View file

@ -119,10 +119,10 @@ export const getTileUrls = (
tileParams = `${tileSize}/{z}/{x}/{y}`; tileParams = `${tileSize}/{z}/{x}/{y}`;
} }
if (format && format != "") { if (format && format != '') {
format = `.${format}`; format = `.${format}`;
} else { } else {
format = ""; format = '';
} }
const uris = []; const uris = [];