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

This commit is contained in:
Dane Springmeyer
2012-03-06 17:56:23 -08:00
3 changed files with 16 additions and 6 deletions

View File

@@ -174,7 +174,7 @@ MBTiles.prototype.getTile = function(z, x, y, callback) {
} else {
var options = {
'Content-Type': MBTiles.utils.getMimeType(row.tile_data),
'Last-Modified': mbtiles._stat.mtime,
'Last-Modified': new Date(mbtiles._stat.mtime).toUTCString(),
'ETag': mbtiles._stat.size + '-' + Number(mbtiles._stat.mtime)
};
return callback(null, row.tile_data, options);
@@ -229,8 +229,12 @@ MBTiles.prototype.getGrid = function(z, x, y, callback) {
} catch (err) {
return callback(new Error('Grid is invalid'));
}
callback(null, result);
var options = {
'Content-Type': 'text/javascript',
'Last-Modified': new Date(that._stat.mtime).toUTCString(),
'ETag': that._stat.size + '-' + Number(that._stat.mtime)
};
callback(null, result, options);
}
);
};