Update version to 0.8.0

To fix rendering issues with certain datasets on older devices

Dockerfile

@@ -4,6 +4,7 @@ MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
 RUN apt-get -qq update \
 && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     curl \
+    unzip \
     build-essential \
     python \
     libcairo2-dev \

package.json

@@ -1,8 +1,9 @@
 {
   "name": "tileserver-gl",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Map tile server for JSON GL styles - serverside generated raster tiles",
   "main": "src/main.js",
+  "bin": "src/main.js",
   "authors": [
     "Petr Sloup <petr.sloup@klokantech.com>"
   ],
@@ -17,6 +18,7 @@
   "dependencies": {
     "async": "1.5.2",
     "advanced-pool": "0.3.2",
+    "base64url": "1.0.6",
     "canvas": "1.4.0",
     "clone": "1.0.2",
     "color": "0.11.3",
@@ -27,8 +29,8 @@
     "mbtiles": "0.9.0",
     "morgan": "1.7.0",
     "nomnom": "1.8.1",
-    "request": "2.72.0",
+    "request": "2.73.0",
-    "sharp": "0.15.0",
+    "sharp": "0.15.1",
     "sphericalmercator": "1.0.5"
   },
   "devDependencies": {

run.sh

@@ -1,2 +1,11 @@
 #!/bin/bash
+if [ ! -f /data/config.json ]; then
+  echo "INFO: No config.json found! Downloading sample data..."
+  echo "--------------------------------------------------------------------------------"
+  curl -L -o sample_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.8.0.zip
+  unzip -q sample_data.zip -d sample_data
+  mv sample_data/tileserver-gl-data-*/* -t /data
+  rm sample_data.zip
+  rm -r sample_data
+fi
 xvfb-run -a -e /dev/stdout --server-args="-screen 0 1024x768x24" node /usr/src/app/src/main.js -p 80 -c /data/config.json

src/serve_data.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var crypto = require('crypto'),
+var fs = require('fs'),
-    fs = require('fs'),
     path = require('path');
 
 var clone = require('clone'),
@@ -59,12 +58,11 @@ module.exports = function(options, repo, params, id) {
           return res.status(500).send(err.message);
         }
       } else {
-        var md5 = crypto.createHash('md5').update(data).digest('base64');
-        headers['content-md5'] = md5;
         if (tileJSON['format'] == 'pbf') {
-          headers['content-type'] = 'application/x-protobuf';
+          headers['Content-Type'] = 'application/x-protobuf';
-          headers['content-encoding'] = 'gzip';
+          headers['Content-Encoding'] = 'gzip';
         }
+        delete headers['ETag']; // do not trust the tile ETag -- regenerate
         res.set(headers);
 
         if (data == null) {

src/serve_rendered.js

@@ -2,7 +2,6 @@
 
 var async = require('async'),
     advancedPool = require('advanced-pool'),
-    crypto = require('crypto'),
     fs = require('fs'),
     path = require('path'),
     util = require('util'),
@@ -78,9 +77,6 @@ module.exports = function(options, repo, params, id) {
                 if (headers['Last-Modified']) {
                   response.modified = new Date(headers['Last-Modified']);
                 }
-                if (headers['ETag']) {
-                  response.etag = headers['ETag'];
-                }
 
                 if (format == 'pbf') {
                   response.data = zlib.unzipSync(data);
@@ -292,10 +288,8 @@ module.exports = function(options, repo, params, id) {
             return res.status(404).send('Not found');
           }
 
-          var md5 = crypto.createHash('md5').update(buffer).digest('base64');
           res.set({
-            'content-md5': md5,
+            'Content-Type': 'image/' + format
-            'content-type': 'image/' + format
           });
           return res.status(200).send(buffer);
         });

src/server.js

@@ -7,20 +7,24 @@ process.env.UV_THREADPOOL_SIZE =
 var fs = require('fs'),
     path = require('path');
 
-var clone = require('clone'),
+var base64url = require('base64url'),
+    clone = require('clone'),
     cors = require('cors'),
     express = require('express'),
     handlebars = require('handlebars'),
     mercator = new (require('sphericalmercator'))(),
     morgan = require('morgan');
 
-var serve_font = require('./serve_font'),
+var packageJson = require('../package'),
+    serve_font = require('./serve_font'),
     serve_rendered = require('./serve_rendered'),
     serve_style = require('./serve_style'),
     serve_data = require('./serve_data'),
     utils = require('./utils');
 
 module.exports = function(opts, callback) {
+  console.log('Starting TileServer-GL v' + packageJson.version);
+
   var app = express().disable('x-powered-by'),
       serving = {
         styles: {},
@@ -172,6 +176,7 @@ module.exports = function(opts, callback) {
             return res.status(404).send('Not found');
           }
         }
+        data['server_version'] = packageJson.version;
         data['key_query_part'] =
             req.query.key ? 'key=' + req.query.key + '&' : '';
         data['key_query'] = req.query.key ? '?key=' + req.query.key : '';
@@ -201,10 +206,9 @@ module.exports = function(opts, callback) {
         }
 
         var query = req.query.key ? ('?key=' + req.query.key) : '';
-        style.wmts_link = 'https://wmts.maptiler.com/' +
+        style.wmts_link = 'http://wmts.maptiler.com/' +
-          new Buffer(req.protocol + '://' + req.headers.host +
+          base64url('http://' + req.headers.host +
-            '/styles/' + id + '/rendered.json' + query).toString('base64') +
+            '/styles/' + id + '/rendered.json' + query) + '/wmts';
-            '/wmts';
       }
     });
     var data = clone(serving.data || {});
@@ -227,8 +231,8 @@ module.exports = function(opts, callback) {
 
         var query = req.query.key ? ('?key=' + req.query.key) : '';
         data_.wmts_link = 'http://wmts.maptiler.com/' +
-          new Buffer('http://' + req.headers.host +
+          base64url('http://' + req.headers.host +
-            '/data/' + id + '.json' + query).toString('base64') + '/wmts';
+            '/data/' + id + '.json' + query) + '/wmts';
       }
       if (data_.filesize) {
         var suffix = 'kB';