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

fix: http check + errors

Browse source 
Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-13 15:11:08 -04:00
parent cd13093a1a
commit 3cab6f1edf
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -177,7 +177,7 @@ const StartWithInputFile = async (inputFile) => {
return StartServer(null, config); return StartServer(null, config);
} else { } else {
if (isValidHttpUrl(inputFile)) { if (isValidHttpUrl(inputFile)) {
console.log(`ERROR: MBTiles does not support web based files. "${inputFile}" is not a valid input file.`,); console.log(`ERROR: MBTiles does not support web based files. "${inputFile}" is not a valid data file.`,);
process.exit(1); process.exit(1);
} }
const instance = new MBTiles(inputFile + '?mode=ro', (err) => { const instance = new MBTiles(inputFile + '?mode=ro', (err) => {

5
src/serve_data.js
View file

@ -203,9 +203,8 @@ export const serve_data = {
} else if (params.mbtiles) { } else if (params.mbtiles) {
inputType = 'mbtiles'; inputType = 'mbtiles';
if (isValidHttpUrl(params.mbtiles)) { if (isValidHttpUrl(params.mbtiles)) {
throw Error( console.log(`ERROR: MBTiles does not support web based files. "${params.mbtiles}" is not a valid data file.`,);
`ERROR: MBTiles does not support web based files. "${params.mbtiles}" is not a valid input file.`, process.exit(1);
);
} else { } else {
inputFile = path.resolve(options.paths.mbtiles, params.mbtiles); inputFile = path.resolve(options.paths.mbtiles, params.mbtiles);
} }

2
src/server.js
View file

@ -235,7 +235,7 @@ function start(opts) {
for (const id of Object.keys(data)) { for (const id of Object.keys(data)) {
if (id === dataId) { if (id === dataId) {
fileType = Object.keys(data[id])[0]; fileType = Object.keys(data[id])[0];
if (isValidHttpUrl(inputFile)) { if (isValidHttpUrl(data[id][fileType])) {
inputFile = data[id][fileType]; inputFile = data[id][fileType];
} else { } else {
inputFile = path.resolve( inputFile = path.resolve(