use async version for gzip and gunzip

src/serve_data.js

@@ -22,18 +22,30 @@ function isGzipped(data) {
   return data[0] === 0x1f && data[1] === 0x8b;
 }
 
-function unzipTile(tile) {
+function unzip(tile, fn) {
-  if (tile.isGzipped) {
+  if (!tile.isGzipped) {
-    tile.data = zlib.gunzipSync(tile.data);
+    return fn();
-    tile.isGzipped = false;
   }
+  zlib.gunzip(tile.data, function(err, buffer) {
+    if (!err) {
+      tile.data = buffer;
+      tile.isGzipped = false;
+    }
+    fn(err);
+  });
 }
 
-function zipTile(tile) {
+function zip(tile, fn) {
-  if (!tile.isGzipped) {
+  if (tile.isGzipped) {
-    tile.data = zlib.gzipSync(tile.data);
+    return fn();
-    tile.isGzipped = true;
   }
+  zlib.gzip(tile.data, function(err, buffer) {
+    if (!err) {
+      tile.data = buffer;
+      tile.isGzipped = true;
+    }
+    fn(err);
+  });
 }
 
 module.exports = function(options, repo, params, id, styles) {
@@ -147,12 +159,16 @@ module.exports = function(options, repo, params, id, styles) {
     }
     var tile = req.tile;
     var shrinker = lookupShrinker(style);
-    if (shrinker) {
+    if (!shrinker) {
-      unzipTile(tile);
+      return next();
-      tile.data = shrinker(tile.data, req.params.z, tileJSON.maxzoom);
-      //console.log(shrinker.getStats());
     }
-    next();
+    unzip(tile, function(err) {
+      if (!err) {
+        tile.data = shrinker(tile.data, req.params.z, tileJSON.maxzoom);
+        //console.log(shrinker.getStats());
+      }
+      next(err);
+    });
   }
 
   function formatTile(req, res, next) {
@@ -166,27 +182,35 @@ module.exports = function(options, repo, params, id, styles) {
       z = req.params.z;
 
     tile.contentType = 'application/json';
-    unzipTile(tile);
+    unzip(tile, function(err) {
-
+      if (err) {
-    var vectorTile = new VectorTile(new pbf(tile.data));
+        return next(err);
-    var geojson = {
-      "type": "FeatureCollection",
-      "features": []
-    };
-
-    for (var layerName in vectorTile.layers) {
-      var layer = vectorTile.layers[layerName];
-      for (var i = 0; i < layer.length; i++) {
-        var feature = layer.feature(i);
-        var featureGeoJSON = feature.toGeoJSON(x, y, z);
-        featureGeoJSON.properties.layer = layerName;
-        geojson.features.push(featureGeoJSON);
       }
-    }
 
-    tile.data = JSON.stringify(geojson);
+      var vectorTile = new VectorTile(new pbf(tile.data));
+      var geojson = {
+        "type": "FeatureCollection",
+        "features": []
+      };
 
-    next();
+      for (var layerName in vectorTile.layers) {
+        var layer = vectorTile.layers[layerName];
+        for (var i = 0; i < layer.length; i++) {
+          var feature = layer.feature(i);
+          var featureGeoJSON = feature.toGeoJSON(x, y, z);
+          featureGeoJSON.properties.layer = layerName;
+          geojson.features.push(featureGeoJSON);
+        }
+      }
+
+      tile.data = JSON.stringify(geojson);
+
+      next();
+    });
+  }
+
+  function zipTile(req, res, next) {
+    zip(req.tile, next);
   }
 
   function sendTile(req, res) {
@@ -197,9 +221,7 @@ module.exports = function(options, repo, params, id, styles) {
     headers['Content-Encoding'] = 'gzip';
     res.set(headers);
 
-    zipTile(req.tile);
+    res.status(200).send(req.tile.data);
-
-    return res.status(200).send(req.tile.data);
   }
 
   app.get(tilePattern,
@@ -207,6 +229,7 @@ module.exports = function(options, repo, params, id, styles) {
     getTile,
     shrinkTile,
     formatTile,
+    zipTile,
     sendTile
   );