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

More sensible errors for non-existent mbtiles

Browse source
This commit is contained in:
Petr Sloup 2016-08-19 08:25:12 +02:00
parent afda5d00bc
commit 845e31b3f2
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/serve_data.js
View file

@ -19,6 +19,10 @@ module.exports = function(options, repo, params, id) {
repo[id] = tileJSON; repo[id] = tileJSON;
var mbtilesFileStats = fs.statSync(mbtilesFile);
if (!mbtilesFileStats.isFile() || mbtilesFileStats.size == 0) {
throw Error('Not valid MBTiles file: ' + mbtilesFile);
}
var source = new mbtiles(mbtilesFile, function(err) { var source = new mbtiles(mbtilesFile, function(err) {
source.getInfo(function(err, info) { source.getInfo(function(err, info) {
tileJSON['name'] = id; tileJSON['name'] = id;
@ -28,7 +32,7 @@ module.exports = function(options, repo, params, id) {
tileJSON['tilejson'] = '2.0.0'; tileJSON['tilejson'] = '2.0.0';
tileJSON['basename'] = id; tileJSON['basename'] = id;
tileJSON['filesize'] = fs.statSync(mbtilesFile)['size']; tileJSON['filesize'] = mbtilesFileStats['size'];
delete tileJSON['scheme']; delete tileJSON['scheme'];
Object.assign(tileJSON, params.tilejson || {}); Object.assign(tileJSON, params.tilejson || {});

8
src/serve_rendered.js
View file

@ -173,8 +173,12 @@ module.exports = function(options, repo, params, id) {
queue.push(function(callback) { queue.push(function(callback) {
var mbtilesFile = url.substring('mbtiles://'.length); var mbtilesFile = url.substring('mbtiles://'.length);
map.sources[name] = new mbtiles( mbtilesFile = path.join(options.paths.mbtiles, mbtilesFile);
path.join(options.paths.mbtiles, mbtilesFile), function(err) { var mbtilesFileStats = fs.statSync(mbtilesFile);
if (!mbtilesFileStats.isFile() || mbtilesFileStats.size == 0) {
throw Error('Not valid MBTiles file: ' + mbtilesFile);
}
map.sources[name] = new mbtiles(mbtilesFile, function(err) {
map.sources[name].getInfo(function(err, info) { map.sources[name].getInfo(function(err, info) {
var type = source.type; var type = source.type;
Object.assign(source, info); Object.assign(source, info);