Update package version to 1.1.1

README.md

@@ -2,16 +2,17 @@
 [![Build Status](https://travis-ci.org/klokantech/tileserver-gl.svg?branch=master)](https://travis-ci.org/klokantech/tileserver-gl)
 [![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/)
 
+Vector and raster maps with GL styles. Map tile server for Mapbox Android, iOS, GL JS, Leaflet, OpenLayers, GIS via WMTS, etc. Server side rendering by Mapbox GL Native.
 
 ## Quickstart
 Use `npm install -g tileserver-gl` to install the package from npm.
 
 Then you can simply run `tileserver-gl zurich_switzerland.mbtiles` to start the server for the given mbtiles.
 
-Alternatively, you can use `tileserver-gl-light` package instead, which is pure javascript (does not have any native dependencies) and can run anywhere, but does not contain rasterization features.
-
 Or you can use `docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl` to run the server inside a docker container.
 
+Alternatively, you can use `tileserver-gl-light` package instead, which is pure javascript (does not have any native dependencies) and can run anywhere, but does not contain rasterization features.
+
 Prepared vector tiles can be downloaded from [OSM2VectorTiles](http://osm2vectortiles.org/).
 
 ## Documentation

README_light.md

@@ -0,0 +1,17 @@
+# TileServer GL light
+[![Build Status](https://travis-ci.org/klokantech/tileserver-gl.svg?branch=master)](https://travis-ci.org/klokantech/tileserver-gl)
+[![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/)
+
+Vector maps with GL styles. Map tile server for Mapbox Android, iOS, GL JS, Leaflet, OpenLayers, etc. without server side rendering.
+
+## Quickstart
+Use `npm install -g tileserver-gl-light` to install the package from npm.
+
+Then you can simply run `tileserver-gl-light zurich_switzerland.mbtiles` to start the server for the given mbtiles.
+
+See also `tileserver-gl` which contains server side rendering.
+
+Prepared vector tiles can be downloaded from [OSM2VectorTiles](http://osm2vectortiles.org/).
+
+## Documentation
+You can read full documentation of this project at http://tileserver.readthedocs.io/.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tileserver-gl",
-  "version": "1.1.0",
-  "description": "Map tile server for JSON GL styles - serverside generated raster tiles",
+  "version": "1.1.1",
+  "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
   "authors": [

publish.js

@@ -20,6 +20,7 @@ var fs = require('fs');
 var packageJson = require('./package');
 
 packageJson.name += '-light';
+packageJson.description = 'Map tile server for JSON GL styles - serving vector tiles';
 delete packageJson.dependencies['canvas'];
 delete packageJson.dependencies['mapbox-gl-native'];
 delete packageJson.dependencies['node-pngquant-native'];
@@ -29,6 +30,7 @@ delete packageJson.devDependencies;
 
 var str = JSON.stringify(packageJson, undefined, 2);
 fs.writeFileSync('light/package.json', str);
+fs.renameSync('light/README_light.md', 'light/README.md');
 
 /* PUBLISH */
 

src/serve_rendered.js

@@ -462,6 +462,10 @@ module.exports = function(options, repo, params, id, dataResolver) {
         scale = getScale(req.params.scale),
         format = req.params.format;
 
+    if (z < 0) {
+      return res.status(404).send('Invalid zoom');
+    }
+
     var path = extractPathFromQuery(req.query);
     var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
                                 path, req.query);

test/static.js

@@ -28,6 +28,8 @@ describe('Static endpoints', function() {
         testStatic(prefix, '0,0,0/300x300', 'png', 200, 2);
         testStatic(prefix, '0,0,0/300x300', 'png', 200, 3);
 
+        testStatic(prefix, '0,0,1.5/256x256', 'png', 200);
+
         testStatic(prefix, '80,40,20/600x300', 'png', 200, 3);
         testStatic(prefix, '8.5,40.5,20/300x150', 'png', 200, 3);
         testStatic(prefix, '-8.5,-40.5,20/300x150', 'png', 200, 3);
@@ -48,7 +50,6 @@ describe('Static endpoints', function() {
       testStatic(prefix, '0,0,0/256x256', 'png', 404, 1);
 
       testStatic(prefix, '0,0,-1/256x256', 'png', 404);
-      testStatic(prefix, '0,0,1.5/256x256', 'png', 404);
       testStatic(prefix, '0,0,0/256.5x256.5', 'png', 404);
 
       testStatic(prefix, '0,0,0,/256x256', 'png', 404);

test/tiles_rendered.js

@@ -26,6 +26,7 @@ describe('Raster tiles', function() {
       testTile(prefix, 0, 0, 0, 'png', 200, 2);
       testTile(prefix, 0, 0, 0, 'png', 200, 3);
       testTile(prefix, 2, 1, 1, 'png', 200, 3);
+      testTile(prefix, 0, 0, 0, 'png', 200, 4);
     });
   });
 
@@ -39,7 +40,7 @@ describe('Raster tiles', function() {
     testTile(prefix, 0, 0, 0, 'pbf', 400);
 
     testTile(prefix, 0, 0, 0, 'png', 404, 1);
-    testTile(prefix, 0, 0, 0, 'png', 404, 4);
+    testTile(prefix, 0, 0, 0, 'png', 404, 5);
 
     //testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this
   });