fix

src/serve_data.js

@@ -6,7 +6,7 @@ const zlib = require('zlib');
 
 const clone = require('clone');
 const express = require('express');
-const MBTiles = require('@mapbox/mbtiles');
+const MBTiles = require('./mbtiles');
 const Pbf = require('pbf');
 const VectorTile = require('@mapbox/vector-tile').VectorTile;
 
@@ -102,6 +102,94 @@ module.exports = {
       });
     });
 
+    app.get('/:id/:t(\\d+)/:z(\\d+)/:x(\\d+)/:y(\\d+).:format([\\w.]+)', (req, res, next) => {
+      const item = repo[req.params.id];
+      if (!item) {
+        return res.sendStatus(404);
+      }
+      let tileJSONFormat = item.tileJSON.format;
+      const t = req.params.t | 0;
+      const z = req.params.z | 0;
+      const x = req.params.x | 0;
+      const y = req.params.y | 0;
+      let format = req.params.format;
+      if (format === options.pbfAlias) {
+        format = 'pbf';
+      }
+      if (format !== tileJSONFormat &&
+          !(format === 'geojson' && tileJSONFormat === 'pbf')) {
+        return res.status(404).send('Invalid format');
+      }
+      if (z < item.tileJSON.minzoom || 0 || x < 0 || y < 0 ||
+          z > item.tileJSON.maxzoom ||
+          x >= Math.pow(2, z) || y >= Math.pow(2, z) ||
+          t < 0) {
+        return res.status(404).send('Out of bounds');
+      }
+      item.source.getTileT(t, z, x, y, (err, data, headers) => {
+        let isGzipped;
+        if (err) {
+          if (/does not exist/.test(err.message)) {
+            return res.status(204).send();
+          } else {
+            return res.status(500).send(err.message);
+          }
+        } else {
+          if (data == null) {
+            return res.status(404).send('Not found');
+          } else {
+            if (tileJSONFormat === 'pbf') {
+              isGzipped = data.slice(0, 2).indexOf(
+                Buffer.from([0x1f, 0x8b])) === 0;
+              if (options.dataDecoratorFunc) {
+                if (isGzipped) {
+                  data = zlib.unzipSync(data);
+                  isGzipped = false;
+                }
+                data = options.dataDecoratorFunc(id, 'data', data, z, x, y);
+              }
+            }
+            if (format === 'pbf') {
+              headers['Content-Type'] = 'application/x-protobuf';
+            } else if (format === 'geojson') {
+              headers['Content-Type'] = 'application/json';
+
+              if (isGzipped) {
+                data = zlib.unzipSync(data);
+                isGzipped = false;
+              }
+
+              const tile = new VectorTile(new Pbf(data));
+              const geojson = {
+                "type": "FeatureCollection",
+                "features": []
+              };
+              for (let layerName in tile.layers) {
+                const layer = tile.layers[layerName];
+                for (let i = 0; i < layer.length; i++) {
+                  const feature = layer.feature(i);
+                  const featureGeoJSON = feature.toGeoJSON(x, y, z);
+                  featureGeoJSON.properties.layer = layerName;
+                  geojson.features.push(featureGeoJSON);
+                }
+              }
+              data = JSON.stringify(geojson);
+            }
+            delete headers['ETag']; // do not trust the tile ETag -- regenerate
+            headers['Content-Encoding'] = 'gzip';
+            res.set(headers);
+
+            if (!isGzipped) {
+              data = zlib.gzipSync(data);
+              isGzipped = true;
+            }
+
+            return res.status(200).send(data);
+          }
+        }
+      });
+    });
+
     app.get('/:id.json', (req, res, next) => {
       const item = repo[req.params.id];
       if (!item) {