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

return real error objects

Browse Source
This commit is contained in:
Konstantin Käfer
2011-06-21 16:39:14 +02:00
parent 3d87da5920
commit 6fe47f5fa9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mbtiles.js
View File

@@ -65,7 +65,7 @@ MBTiles.prototype.setup = function(callback) {
// has key/value pairs as a hash corresponding to column name and row value. // has key/value pairs as a hash corresponding to column name and row value.
// - `callback` Function. // - `callback` Function.
MBTiles.prototype.insert = function(table, objects, callback) { MBTiles.prototype.insert = function(table, objects, callback) {
if (!objects.length) return callback(); if (!objects.length) return callback(null);
var keys = _(objects[0]).keys(); var keys = _(objects[0]).keys();
var placeholders = []; var placeholders = [];
_(keys).each(function(k) { placeholders.push('?'); }); _(keys).each(function(k) { placeholders.push('?'); });
@@ -213,7 +213,7 @@ MBTiles.prototype.tile = function(x, y, z, callback) {
z, x, y, z, x, y,
function(err, row) { function(err, row) {
if (err) callback(err); if (err) callback(err);
else if (!row || !row.tile_data) callback('Tile does not exist'); else if (!row || !row.tile_data) callback(new Error('Tile does not exist'));
else callback(null, row.tile_data); else callback(null, row.tile_data);
}); });
}; };
@@ -241,7 +241,7 @@ MBTiles.prototype.grid = function(x, y, z, callback) {
}, },
function(err, row, rows) { function(err, row, rows) {
if (err) return callback(err); if (err) return callback(err);
if (!row || !row.grid) return callback('Grid does not exist'); if (!row || !row.grid) return callback(new Error('Grid does not exist'));
try { try {
var grid = zlib.inflate( var grid = zlib.inflate(
@@ -255,7 +255,7 @@ MBTiles.prototype.grid = function(x, y, z, callback) {
}, {}); }, {});
callback(null, _(JSON.parse(grid)).extend({ data: data })); callback(null, _(JSON.parse(grid)).extend({ data: data }));
} catch (err) { } catch (err) {
callback('Grid is invalid'); callback(new Error('Grid is invalid'));
} }
} }
); );
@@ -269,7 +269,7 @@ MBTiles.prototype.metadata = function(key, callback) {
key, key,
function(err, row) { function(err, row) {
if (err) callback(err); if (err) callback(err);
else if (!row) callback('Key does not exist'); else if (!row) callback(new Error('Key does not exist'));
else callback(null, row.value); else callback(null, row.value);
}); });
}; };

4
test/read.test.js
View File

@@ -19,7 +19,7 @@ exports['get metadata'] = function(beforeExit) {
mbtiles.metadata('version', function(err, value) { if (err) throw err; completion.version = value; }); mbtiles.metadata('version', function(err, value) { if (err) throw err; completion.version = value; });
mbtiles.metadata('formatter', function(err, value) { if (err) throw err; completion.formatter = value; }); mbtiles.metadata('formatter', function(err, value) { if (err) throw err; completion.formatter = value; });
mbtiles.metadata('bounds', function(err, value) { if (err) throw err; completion.bounds = value; }); mbtiles.metadata('bounds', function(err, value) { if (err) throw err; completion.bounds = value; });
mbtiles.metadata('invalid', function(err, value) { completion.invalid = err; }); mbtiles.metadata('invalid', function(err, value) { completion.invalid = err.message; });
beforeExit(function() { beforeExit(function() {
assert.deepEqual(completion, { assert.deepEqual(completion, {
@@ -36,7 +36,7 @@ exports['get metadata'] = function(beforeExit) {
function yieldsError(status, error, msg) { function yieldsError(status, error, msg) {
return function(err) { return function(err) {
assert.equal(err, msg); assert.equal(err.message, msg);
status[error]++; status[error]++;
}; };
} }