Merge branch 'master' into david/configureKeyName2

docs/config.rst

@@ -4,7 +4,9 @@ Configuration file
 
 The configuration file defines the behavior of the application. It's a regular JSON file.
 
-Example::
+Example:
+
+.. code-block:: json
 
   {
     "options": {
@@ -109,7 +111,7 @@ Default is ``2048``.
 --------------
 
 Additional image side length added during tile rendering that is cropped from the delivered tile. This is useful for resolving the issue with cropped labels,
-but it does come with a performance degradation, because additional, adjacent vector tiles need to be loaded to genenrate a single tile.
+but it does come with a performance degradation, because additional, adjacent vector tiles need to be loaded to generate a single tile.
 Default is ``0`` to disable this processing.
 
 ``minRendererPoolSizes``
@@ -154,7 +156,7 @@ Each item in this object defines one style (map). It can have the following opti
 
 * ``style`` -- name of the style json file [required]
 * ``serve_rendered`` -- whether to render the raster tiles for this style or not
-* ``serve_data`` -- whether to allow acces to the original tiles, sprites and required glyphs
+* ``serve_data`` -- whether to allow access to the original tiles, sprites and required glyphs
 * ``tilejson`` -- properties to add to the TileJSON created for the raster data
 
   * ``format`` and ``bounds`` can be especially useful

package.json

@@ -38,7 +38,7 @@
     "pbf": "3.2.1",
     "proj4": "2.6.0",
     "request": "2.88.2",
-    "sharp": "0.25.1",
+    "sharp": "0.26.2",
     "tileserver-gl-styles": "2.0.0"
   },
   "devDependencies": {

src/serve_rendered.js

@@ -375,7 +375,7 @@ module.exports = {
         scale = getScale(req.params.scale),
         format = req.params.format;
       if (z < 0 || x < 0 || y < 0 ||
-        z > 20 || x >= Math.pow(2, z) || y >= Math.pow(2, z)) {
+        z > 22 || x >= Math.pow(2, z) || y >= Math.pow(2, z)) {
         return res.status(404).send('Out of bounds');
       }
       const tileSize = 256;

src/server.js

@@ -140,7 +140,7 @@ function start(opts) {
             return dataItemId;
           } else {
             if (fromData || !allowMoreData) {
-              console.log(`ERROR: style "${file.name}" using unknown mbtiles "${mbtiles}"! Skipping...`);
+              console.log(`ERROR: style "${item.style}" using unknown mbtiles "${mbtiles}"! Skipping...`);
               return undefined;
             } else {
               let id = mbtiles.substr(0, mbtiles.lastIndexOf('.')) || mbtiles;