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

Update resume to only return coords. Tilelive API no longer requires copied count.

Browse Source
This commit is contained in:
Young Hahn
2012-01-29 14:29:49 -05:00
parent 9c9fcdfaf9
commit 2e4bc80217
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/mbtiles.js
View File

@@ -620,17 +620,12 @@ MBTiles.prototype.copyResume = function(callback) {
if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
var mbtiles = this;
Step(function() {
// y is ASC here because tilelive.copy uses XYZ when writing/ordering
// tiles but y is "flipped" to TMS when stored in an MBTiles database.
mbtiles._db.get('SELECT zoom_level AS z, tile_column AS x, tile_row AS y FROM tiles ORDER BY z DESC, y ASC, x DESC LIMIT 1', this.parallel());
mbtiles._db.get('SELECT COUNT(*) AS copied FROM tiles WHERE tile_data IS NOT NULL', this.parallel());
}, function(err, coords, copied) {
// y is ASC here because tilelive.copy uses XYZ when writing/ordering
// tiles but y is "flipped" to TMS when stored in an MBTiles database.
this._db.get('SELECT zoom_level AS z, tile_column AS x, tile_row AS y FROM tiles ORDER BY z DESC, y ASC, x DESC LIMIT 1', function(err, row) {
if (err) return callback(err);
// Flip Y coordinate back to XYZ for tilelive API.
if (coords) coords.y = (1 << coords.z) - 1 - coords.y;
if (coords && copied) coords.copied = copied.copied;
return callback(null, coords);
if (row) row.y = (1 << row.z) - 1 - row.y; // TMS => XYZ
return callback(null, row);
});
};