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

switch to using native zlib, inflate works, odd test failures for deflate

Browse Source
This commit is contained in:
Dane Springmeyer
2011-12-01 14:43:32 -08:00
parent fbcdc07d06
commit 90b35f65ef
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/mbtiles.js
View File

@@ -2,7 +2,7 @@ var _ = require('underscore'),
fs = require('fs'),
Step = require('step'),
crypto = require('crypto'),
_zlib = require('_zlib'),
zlib = require('zlib'),
path = require('path'),
url = require('url'),
qs = require('querystring'),
@@ -215,8 +215,9 @@ MBTiles.prototype.getGrid = function(z, x, y, callback) {
}
if (err) return callback(err);
/*
try {
var grid = _zlib.inflate(
var grid = zlib.inflate(
!Buffer.isBuffer(row.grid)
? new Buffer(row.grid, 'binary')
: row.grid
@@ -231,6 +232,24 @@ MBTiles.prototype.getGrid = function(z, x, y, callback) {
}
callback(null, result);
*/
zlib.inflate(!Buffer.isBuffer(row.grid)
? new Buffer(row.grid, 'binary')
: row.grid
, function(err,buffer) {
if (err) {
return callback(new Error('Grid is invalid:' + err.message));
}
var data = rows.reduce(function(memo, r) {
memo[r.key_name] = JSON.parse(r.key_json);
return memo;
}, {});
var result = _(JSON.parse(buffer.toString())).extend({ data: data });
callback(null, result);
});
}
);
};
@@ -565,13 +584,23 @@ MBTiles.prototype.putGrid = function(z, x, y, data, callback) {
var id = crypto.createHash('md5').update(json).digest('hex');
if (!this._gridCache[id]) {
// This corresponds to the grid_utfgrid table.
this._gridCache[id] = _zlib.deflate(new Buffer(json, 'utf8'));
// This corresponds to the grid_key table.
this._keyCache[id] = Object.keys(data.data || {});
// This corresponds to the keymap table.
_(this._dataCache).extend(data.data || {});
/*
this._gridCache[id] = zlib.deflate(new Buffer(json, 'utf8'));
*/
Step(function() {
zlib.deflate(new Buffer(json, 'utf8'),this);
}, function(err,buffer) {
if (err) return callback(err);
this._gridCache[id] = buffer;
// This corresponds to the grid_key table.
this._keyCache[id] = Object.keys(data.data || {});
// This corresponds to the keymap table.
_(this._dataCache).extend(data.data || {});
}
);
}
// This corresponds to the map table.