Merge branch 'master' of github.com:mapbox/node-mbtiles into tilelive-refactoring

Conflicts: lib/mbtiles.js
2011-06-27 09:34:32 +02:00
parent fc8164249e c0ed6d34ec
commit 4d8da2dbae
2 changed files with 1 additions and 1 deletions
--- a/lib/mbtiles.js
+++ b/lib/mbtiles.js
@@ -275,8 +275,8 @@ MBTiles.prototype.grid = function(x, y, z, callback) {
            );
        },
        function(err, row, rows) {
+            if ((!row || !row.grid) || (err && err.errno == 1)) return callback('Grid does not exist');
            if (err) return callback(err);
-            if (!row || !row.grid) return callback(new Error('Grid does not exist'));

            try {
                var grid = zlib.inflate(