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

Minor tilejson-reading fix when decorating templates

Browse source
This commit is contained in:
Petr Sloup 2020-02-10 14:14:07 +01:00
parent cf0eedb379
commit f2dc13e298
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/server.js
View file

@ -351,11 +351,12 @@ function start(opts) {
const data = clone(serving.data || {}); const data = clone(serving.data || {});
for (const id of Object.keys(data)) { for (const id of Object.keys(data)) {
const data_ = data[id]; const data_ = data[id];
const center = data_.center; const tilejson = data[id].tileJSON;
const center = tilejson.center;
if (center) { if (center) {
data_.viewer_hash = `#${center[2]}/${center[1].toFixed(5)}/${center[0].toFixed(5)}`; data_.viewer_hash = `#${center[2]}/${center[1].toFixed(5)}/${center[0].toFixed(5)}`;
} }
data_.is_vector = data_.format === 'pbf'; data_.is_vector = tilejson.format === 'pbf';
if (!data_.is_vector) { if (!data_.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]);
@ -363,7 +364,7 @@ function start(opts) {
} }
data_.xyz_link = utils.getTileUrls( data_.xyz_link = utils.getTileUrls(
req, data_.tiles, `data/${id}`, data_.format, opts.publicUrl, { req, tilejson.tiles, `data/${id}`, tilejson.format, opts.publicUrl, {
'pbf': options.pbfAlias 'pbf': options.pbfAlias
})[0]; })[0];
} }
@ -427,7 +428,7 @@ function start(opts) {
return null; return null;
} }
data.id = id; data.id = id;
data.is_vector = data.format === 'pbf'; data.is_vector = data.tileJSON.format === 'pbf';
return data; return data;
}); });