Simplify, update for tilelive batch rendering API.

index.js

@@ -1,16 +1,13 @@
 var MBTiles = require('./lib/mbtiles'),
-    zlib = require('zlib'),
-    Buffer = require('buffer').Buffer,
     Step = require('step');
 
 module.exports = {
     MBTiles: MBTiles,
-    pool: function(datasource, options) {
+    pool: function(datasource) {
         return {
             create: function(callback) {
                 var resource = new MBTiles(
                     datasource,
-                    options,
                     function() { callback(resource); }
                 );
             },
@@ -37,42 +34,11 @@ module.exports = {
             );
             break;
         case 'grid.json':
-            var grid;
-            Step(
-                function() {
-                    resource.grid(options.x, options.y, options.z, this);
-                },
-                function(err, buf) {
-                    if (err) throw err;
-                    if (!Buffer.isBuffer(buf))
-                        buf = new Buffer(buf, 'binary');
-                    var inflated = zlib.inflate(buf);
-                    this(null,inflated);
-                },
-                function(err, buf) {
-                    if (err) throw err;
-                    grid = buf.toString();
-                    resource.grid_data(options.x, options.y, options.z, this);
-                },
-                function(err, gd) {
-                    if (err) return callback(err);
-                    // Manually append grid data as a string to the grid buffer.
-                    // Ideally we would
-                    //
-                    //     JSON.stringify(_.extend(JSON.parse(grid), { data: gd }))
-                    //
-                    // But calling JSON stringify will escape UTF8 characters of a
-                    // high enough ordinal making the grid data unusable. Instead,
-                    // manipulate the JSON string directly, popping the trailing }
-                    // off and splicing the grid data in at the "data" key.
-                    grid = grid.substr(0, grid.length - 1)
-                        + ', "data":'
-                        + JSON.stringify(gd)
-                        + '}';
-                    options.jsonp && (grid = options.jsonp + '(' + grid + ');');
-                    callback(err, [grid, { 'Content-Type': 'text/javascript' }]);
-                }
-            );
+            resource.grid(options.x, options.y, options.z, function(err, grid) {
+                grid = JSON.stringify(grid);
+                options.jsonp && (grid = options.jsonp + '(' + grid + ');');
+                callback(err, [grid, { 'Content-Type': 'text/javascript' }]);
+            });
             break;
         default:
             resource.tile(options.x, options.y, options.z, function(err, image) {
@@ -86,6 +52,9 @@ module.exports = {
         case 'setup':
             resource.setup(callback);
             break;
+        case 'metadata':
+            resource.insertMetadata(data, callback);
+            break;
         case 'tiles':
             resource.insertTiles(data, callback);
             break;