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

fix: do shallow clone of arrays for index page

Browse source 
Based on https://github.com/maptiler/tileserver-gl/pull/529 . might fix slow load due to tile cache

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-12 20:51:02 -04:00
parent 5f1b2814ba
commit bf4dbf319a
2 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/templates/index.tmpl
View file

@ -78,7 +78,7 @@
{{/if}} {{/if}}
<div class="details"> <div class="details">
<h3>{{name}}</h3> <h3>{{name}}</h3>
<p class="identifier">identifier: {{@key}}{{#if formatted_filesize}} | size: {{formatted_filesize}}{{/if}} | type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data {{#if extension}} | ext: {{extension}}{{/if}}</p> <p class="identifier">identifier: {{@key}}{{#if formatted_filesize}} | size: {{formatted_filesize}}{{/if}} | type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data {{#if source_type}} | ext: {{source_type}}{{/if}}</p>
<p class="services"> <p class="services">
services: <a href="{{public_url}}data/{{@key}}.json{{&../key_query}}">TileJSON</a> services: <a href="{{public_url}}data/{{@key}}.json{{&../key_query}}">TileJSON</a>
{{#if wmts_link}} {{#if wmts_link}}

57
src/server.js
View file

@ -451,54 +451,54 @@ function start(opts) {
}; };
serveTemplate('/$', 'index', (req) => { serveTemplate('/$', 'index', (req) => {
const styles = clone(serving.styles || {}); let styles = {}
for (const id of Object.keys(styles)) { for (const id of Object.keys(serving.styles || {})) {
const style = styles[id]; styles[id] = Object.assign({}, serving.styles[id]);
style.name = (serving.styles[id] || serving.rendered[id] || {}).name; styles[id].serving_data = serving.styles[id];
style.serving_data = serving.styles[id]; styles[id].serving_rendered = serving.rendered[id];
style.serving_rendered = serving.rendered[id]; if (styles[id].serving_rendered) {
if (style.serving_rendered) { const center = styles[id].serving_rendered.tileJSON.center;
const center = style.serving_rendered.tileJSON.center;
if (center) { if (center) {
style.viewer_hash = `#${center[2]}/${center[1].toFixed( styles[id].viewer_hash = `#${center[2]}/${center[1].toFixed(
5, 5,
)}/${center[0].toFixed(5)}`; )}/${center[0].toFixed(5)}`;
const centerPx = mercator.px([center[0], center[1]], center[2]); const centerPx = mercator.px([center[0], center[1]], center[2]);
style.thumbnail = `${center[2]}/${Math.floor( styles[id].thumbnail = `${center[2]}/${Math.floor(
centerPx[0] / 256, centerPx[0] / 256,
)}/${Math.floor(centerPx[1] / 256)}.png`; )}/${Math.floor(centerPx[1] / 256)}.png`;
} }
style.xyz_link = getTileUrls( styles[id].xyz_link = getTileUrls(
req, req,
style.serving_rendered.tileJSON.tiles, styles[id].serving_rendered.tileJSON.tiles,
`styles/${id}`, `styles/${id}`,
style.serving_rendered.tileJSON.format, styles[id].serving_rendered.tileJSON.format,
opts.publicUrl, opts.publicUrl,
)[0]; )[0];
} }
} }
const data = clone(serving.data || {});
for (const id of Object.keys(data)) { let data = {}
const data_ = data[id]; for (const id of Object.keys(serving.data || {})) {
const tilejson = data[id].tileJSON; data[id] = Object.assign({}, serving.data[id]);
const center = tilejson.center; let tilejson = Object.assign({}, serving.data[id].tileJSON);
const center = data[id].tilejson.center;
if (center) { if (center) {
data_.viewer_hash = `#${center[2]}/${center[1].toFixed( data[id].viewer_hash = `#${center[2]}/${center[1].toFixed(
5, 5,
)}/${center[0].toFixed(5)}`; )}/${center[0].toFixed(5)}`;
} }
data_.is_vector = tilejson.format === 'pbf'; data[id].is_vector = tilejson.format === 'pbf';
if (!data_.is_vector) { if (!data[id].is_vector) {
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( data[id].thumbnail = `${center[2]}/${Math.floor(
centerPx[0] / 256, centerPx[0] / 256,
)}/${Math.floor(centerPx[1] / 256)}.${data_.tileJSON.format}`; )}/${Math.floor(centerPx[1] / 256)}.${tilejson.format}`;
} }
data_.xyz_link = getTileUrls( data[id].xyz_link = getTileUrls(
req, req,
tilejson.tiles, tilejson.tiles,
`data/${id}`, `data/${id}`,
@ -509,7 +509,7 @@ function start(opts) {
}, },
)[0]; )[0];
} }
if (data_.filesize) { if (data[id].filesize) {
let suffix = 'kB'; let suffix = 'kB';
let size = parseInt(data_.filesize, 10) / 1024; let size = parseInt(data_.filesize, 10) / 1024;
if (size > 1024) { if (size > 1024) {
@ -520,13 +520,10 @@ function start(opts) {
suffix = 'GB'; suffix = 'GB';
size /= 1024; size /= 1024;
} }
data_.formatted_filesize = `${size.toFixed(2)} ${suffix}`; data[id].formatted_filesize = `${size.toFixed(2)} ${suffix}`;
data_.extension = tilejson.extension;
}
if (tilejson.extension) {
data_.extension = tilejson.extension;
} }
} }
return { return {
styles: Object.keys(styles).length ? styles : null, styles: Object.keys(styles).length ? styles : null,
data: Object.keys(data).length ? data : null, data: Object.keys(data).length ? data : null,