ashatora/node-mbtiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix handling of empty files

Browse Source
This commit is contained in:
Konstantin Käfer
2011-07-18 16:36:11 +02:00
parent a0c816c691
commit 64888c7e56
3 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mbtiles.js
View File

@@ -376,14 +376,23 @@ MBTiles.prototype.getInfo = function(callback) {
if (err) return callback(err);
var range = parseInt(info.maxzoom, 10) - parseInt(info.minzoom, 10);
info.minzoom = parseInt(info.minzoom, 10);
if (isNaN(info.minzoom) || typeof info.minzoom !== 'number') delete info.minzoom;
info.maxzoom = parseInt(info.maxzoom, 10);
if (isNaN(info.maxzoom) || typeof info.maxzoom !== 'number') delete info.maxzoom;
info.bounds = _((info.bounds || '').split(',')).map(parseFloat);
if (info.bounds.length !== 4 || info.bounds[0] === null) delete info.bounds;
if (info.center) info.center = _((info.center).split(',')).map(parseFloat);
if (!info.center || info.center.length !== 3) info.center = [
if ((!info.center || info.center.length !== 3) && info.bounds) info.center = [
(info.bounds[2] - info.bounds[0]) / 2 + info.bounds[0],
(info.bounds[3] - info.bounds[1]) / 2 + info.bounds[1],
(range <= 1) ? info.maxzoom : Math.floor(range * 0.5) + info.minzoom
];
if (info.center && (info.center.length !== 3 || info.center[0] === null)) {
delete info.center;
}
return callback(null, info);
});
};

70
test/info.test.js Normal file
View File

@@ -0,0 +1,70 @@
process.env.NODE_ENV = 'test';
var fs = require('fs');
var Step = require('step');
var assert = require('assert');
var MBTiles = require('..');
var fixtures = {
plain_1: __dirname + '/fixtures/plain_1.mbtiles',
empty: __dirname + '/fixtures/empty.mbtiles'
};
try { fs.unlink(fixtures.empty); } catch (err) {}
exports['get metadata'] = function(beforeExit) {
var completed = false;
new MBTiles(fixtures.plain_1, function(err, mbtiles) {
if (err) throw err;
mbtiles.getInfo(function(err, data) {
completed = true;
if (err) throw err;
assert.deepEqual({
name: 'plain_1',
description: 'demo description',
version: '1.0.3',
scheme: 'tms',
minzoom: 0,
maxzoom: 4,
formatter: null,
center: [ 0, 7.500000001278025, 2 ],
bounds: [ -179.9999999749438, -69.99999999526695, 179.9999999749438, 84.99999999782301 ],
// These aren't part of TileJSON, but exist in an MBTiles file.
filesize: 561152,
type: 'baselayer',
id: 'plain_1',
basename: 'plain_1.mbtiles'
}, data);
})
});
beforeExit(function() {
assert.ok(completed);
});
};
exports['get/put metadata from empty file'] = function(beforeExit) {
var completed = false;
new MBTiles(fixtures.empty, function(err, mbtiles) {
if (err) throw err;
mbtiles.getInfo(function(err, data) {
completed = true;
if (err) throw err;
assert.deepEqual({
basename: "empty.mbtiles",
filesize: 16384,
id: "empty",
scheme: "tms"
}, data);
})
});
};

33
test/read.test.js
View File

@@ -15,39 +15,6 @@ var fixtures = {
try { fs.unlink(fixtures.non_existent); } catch (err) {}
exports['get metadata'] = function(beforeExit) {
var completed = false;
new MBTiles(fixtures.plain_1, function(err, mbtiles) {
mbtiles.getInfo(function(err, data) {
completed = true;
if (err) throw err;
assert.deepEqual({
name: 'plain_1',
description: 'demo description',
version: '1.0.3',
scheme: 'tms',
minzoom: 0,
maxzoom: 4,
formatter: null,
center: [ 0, 7.500000001278025, 2 ],
bounds: [ -179.9999999749438, -69.99999999526695, 179.9999999749438, 84.99999999782301 ],
// These aren't part of TileJSON, but exist in an MBTiles file.
filesize: 561152,
type: 'baselayer',
id: 'plain_1',
basename: 'plain_1.mbtiles'
}, data);
})
});
beforeExit(function() {
assert.ok(completed);
});
};
function yieldsError(status, error, msg) {
return function(err) {
assert.ok(err);