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

fix tests

Browse Source
This commit is contained in:
Konstantin Käfer
2011-06-29 20:56:32 +02:00
parent 096408f44e
commit c1c56a244f
2 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/mbtiles.js
+3 -2
View File
@@ -342,11 +342,12 @@ MBTiles.prototype.getGrid = function(z, x, y, callback) {
memo[r.key_name] = JSON.parse(r.key_json); memo[r.key_name] = JSON.parse(r.key_json);
return memo; return memo;
}, {}); }, {});
var result = _(JSON.parse(grid)).extend({ data: data });
} catch (err) { } catch (err) {
return callback(new Error('Grid is invalid')); callback(new Error('Grid is invalid'));
} }
callback(null, _(JSON.parse(grid)).extend({ data: data })); callback(null, result);
} }
); );
}; };
test/read.test.js
+23 -33
View File
@@ -56,6 +56,8 @@ exports['get tiles'] = function(beforeExit) {
fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) { fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) {
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/); var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
if (coords) { if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) { mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) {
if (err) throw err; if (err) throw err;
assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file)); assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file));
@@ -66,11 +68,11 @@ exports['get tiles'] = function(beforeExit) {
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 0, 1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(3, 1, -1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(2, -3, 3, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 3, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(18, 2, 262140, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 0, 15, yieldsError(status, 'error', 'Tile does not exist'));
beforeExit(function() { beforeExit(function() {
assert.equal(status.success, 285); assert.equal(status.success, 285);
@@ -88,6 +90,8 @@ exports['get grids'] = function(beforeExit) {
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) { fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/); var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
if (coords) { if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) { mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
if (err) throw err; if (err) throw err;
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8')); assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
@@ -98,23 +102,15 @@ exports['get grids'] = function(beforeExit) {
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid is invalid'));
beforeExit(function() { beforeExit(function() {
assert.equal(status.success, 241); assert.equal(status.success, 241);
assert.equal(status.error, 14); assert.equal(status.error, 7);
}); });
}; };
@@ -157,6 +153,8 @@ exports['get grids with different schema'] = function(beforeExit) {
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) { fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/); var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
if (coords) { if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) { mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
if (err) throw err; if (err) throw err;
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8')); assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
@@ -167,23 +165,15 @@ exports['get grids with different schema'] = function(beforeExit) {
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid is invalid'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid is invalid'));
beforeExit(function() { beforeExit(function() {
assert.equal(status.success, 241); assert.equal(status.success, 241);
assert.equal(status.error, 14); assert.equal(status.error, 7);
}); });
}; };