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

fix: issue with files outside the root directory

Browse source 
also default to mbtiles if file is not found

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-11 16:43:54 -04:00
parent fde9ed96a5
commit 800670728b
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/server.js
View file

@ -201,11 +201,6 @@ function start(opts) {
data[id].pmtiles === fileid data[id].pmtiles === fileid
) { ) {
dataItemId = id; dataItemId = id;
} else if (
data[id].filename !== undefined &&
data[id].filename === fileid
) {
dataItemId = id;
} }
} }
} }
@ -215,14 +210,14 @@ function start(opts) {
} else { } else {
if (fromData || !allowMoreData) { if (fromData || !allowMoreData) {
console.log( console.log(
`ERROR: style "${item.style}" using unknown mbtiles "${fileid}"! Skipping...`, `ERROR: style "${item.style}" using unknown file "${fileid}"! Skipping...`,
); );
return undefined; return undefined;
} else { } else {
let id = fileid.substr(0, fileid.lastIndexOf('.')) || fileid; let id = fileid.substr(0, fileid.lastIndexOf('.')) || fileid;
while (data[id]) id += '_'; while (data[id]) id += '_';
data[id] = { data[id] = {
filename: fileid, mbtiles: fileid,
}; };
return id; return id;
} }
@ -250,14 +245,11 @@ function start(opts) {
for (const id of Object.keys(data)) { for (const id of Object.keys(data)) {
if (id === fileid) { if (id === fileid) {
if (data[id].pmtiles !== undefined) { if (data[id].pmtiles !== undefined) {
inputFile = data[id].pmtiles; inputFile = path.resolve(options.paths.pmtiles, data[id].pmtiles);
fileType = 'pmtiles'; fileType = 'pmtiles';
} else if (data[id].mbtiles !== undefined) { } else if (data[id].mbtiles !== undefined) {
inputFile = data[id].mbtiles; inputFile = path.resolve(options.paths.mbtiles, data[id].mbtiles);
fileType = 'mbtiles'; fileType = 'mbtiles';
} else if (data[id].filename !== undefined) {
inputFile = data[id].fileid;
fileType = inputFile.split('.').pop().toLowerCase();
} }
} }
} }