Update version to 0.8.2

Avoid curl | bash

Dockerfile

@@ -3,13 +3,19 @@ MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
 
 RUN apt-get -qq update \
 && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    apt-transport-https \
     curl \
+    unzip \
     build-essential \
     python \
     libcairo2-dev \
     xvfb \
-&& curl -sL https://deb.nodesource.com/setup_4.x | bash - \
-&& apt-get -y install nodejs \
+&& echo "deb https://deb.nodesource.com/node_4.x jessie main" >> /etc/apt/sources.list.d/nodejs.list \
+&& echo "deb-src https://deb.nodesource.com/node_4.x jessie main" >> /etc/apt/sources.list.d/nodejs.list \
+&& apt-get -qq update \
+&& DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install \
+    nodejs \
+&& rm /etc/apt/sources.list.d/nodejs.list \
 && apt-get clean
 
 RUN mkdir -p /usr/src/app

package.json

@@ -1,8 +1,9 @@
 {
   "name": "tileserver-gl",
-  "version": "0.6.0",
+  "version": "0.8.2",
   "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>"
   ],
@@ -15,24 +16,26 @@
     "test": "mocha test/**.js"
   },
   "dependencies": {
-    "async": "1.5.2",
+    "async": "2.0.1",
     "advanced-pool": "0.3.2",
+    "base64url": "2.0.0",
     "canvas": "1.4.0",
     "clone": "1.0.2",
     "color": "0.11.3",
     "cors": "2.7.1",
     "express": "4.14.0",
+    "glyph-pbf-composite": "0.0.2",
     "handlebars": "4.0.5",
     "mapbox-gl-native": "3.2.1",
     "mbtiles": "0.9.0",
     "morgan": "1.7.0",
     "nomnom": "1.8.1",
-    "request": "2.72.0",
-    "sharp": "0.15.0",
+    "request": "2.74.0",
+    "sharp": "0.15.1",
     "sphericalmercator": "1.0.5"
   },
   "devDependencies": {
-    "should": "^9.0.0",
+    "should": "^10.0.0",
     "mocha": "^2.5.0",
     "supertest": "^1.2.0"
   }

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'),
-    fs = require('fs'),
+var 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-encoding'] = 'gzip';
+          headers['Content-Type'] = 'application/x-protobuf';
+          headers['Content-Encoding'] = 'gzip';
         }
+        delete headers['ETag']; // do not trust the tile ETag -- regenerate
         res.set(headers);
 
         if (data == null) {

src/serve_font.js

@@ -1,56 +1,29 @@
 'use strict';
 
-var async = require('async'),
-    path = require('path'),
-    fs = require('fs');
-
 var clone = require('clone'),
     express = require('express');
 
+var utils = require('./utils');
 
 module.exports = function(options, allowedFonts) {
   var app = express().disable('x-powered-by');
 
-  var fontPath = options.paths.fonts;
+  var lastModified = new Date().toUTCString();
 
-  var getFontPbf = function(name, range, callback) {
-    // if some of the files failed to load (does not exist or not allowed),
-    // return empty buffer so the other fonts can still work
-    if (allowedFonts[name]) {
-      var filename = path.join(fontPath, name, range + '.pbf');
-      return fs.readFile(filename, function(err, data) {
-        if (err) {
-          console.log('Font load error:', filename);
-          return callback(null, new Buffer([]));
-        } else {
-          return callback(null, data);
-        }
-      });
-    } else {
-      return callback(null, new Buffer([]));
-    }
-  };
+  var fontPath = options.paths.fonts;
 
   app.get('/:fontstack/:range([\\d]+-[\\d]+).pbf',
       function(req, res, next) {
     var fontstack = decodeURI(req.params.fontstack);
     var range = req.params.range;
 
-    var fonts = fontstack.split(',');
-
-    var queue = [];
-    fonts.forEach(function(font) {
-      queue.push(function(callback) {
-        getFontPbf(font, range, callback);
-      });
-    });
-
-    return async.parallel(queue, function(err, results) {
-      var concated = Buffer.concat(results);
-      if (err || concated.length == 0) {
+    return utils.getFontsPbf(allowedFonts, fontPath, fontstack, range,
+        function(err, concated) {
+      if (err || concated.length === 0) {
         return res.status(400).send('');
       } else {
         res.header('Content-type', 'application/x-protobuf');
+        res.header('Last-Modified', lastModified);
         return res.send(concated);
       }
     });

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'),
@@ -39,6 +38,8 @@ mbgl.on('message', function(e) {
 module.exports = function(options, repo, params, id) {
   var app = express().disable('x-powered-by');
 
+  var lastModified = new Date().toUTCString();
+
   var rootPath = options.paths.root;
 
   var styleFile = params.style;
@@ -55,12 +56,20 @@ module.exports = function(options, repo, params, id) {
         request: function(req, callback) {
           var protocol = req.url.split(':')[0];
           //console.log('Handling request:', req);
-          if (protocol == 'sprites' || protocol == 'fonts') {
+          if (protocol == 'sprites') {
             var dir = options.paths[protocol];
             var file = unescape(req.url).substring(protocol.length + 3);
             fs.readFile(path.join(dir, file), function(err, data) {
               callback(err, { data: data });
             });
+          } else if (protocol == 'fonts') {
+            var parts = req.url.split('/');
+            var fontstack = unescape(parts[2]);
+            var range = parts[3].split('.')[0];
+            utils.getFontsPbf(null, options.paths[protocol], fontstack, range,
+                function(err, concated) {
+              callback(err, {data: concated});
+            });
           } else if (protocol == 'mbtiles') {
             var parts = req.url.split('/');
             var source = map.sources[parts[2]];
@@ -78,9 +87,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 +298,9 @@ 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
+            'Last-Modified': lastModified,
+            '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/' +
-          new Buffer(req.protocol + '://' + req.headers.host +
-            '/styles/' + id + '/rendered.json' + query).toString('base64') +
-            '/wmts';
+        style.wmts_link = 'http://wmts.maptiler.com/' +
+          base64url('http://' + req.headers.host +
+            '/styles/' + id + '/rendered.json' + query) + '/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 +
-            '/data/' + id + '.json' + query).toString('base64') + '/wmts';
+          base64url('http://' + req.headers.host +
+            '/data/' + id + '.json' + query) + '/wmts';
       }
       if (data_.filesize) {
         var suffix = 'kB';

src/utils.js

@@ -1,5 +1,11 @@
 'use strict';
 
+var async = require('async'),
+    path = require('path'),
+    fs = require('fs');
+
+var glyphCompose = require('glyph-pbf-composite');
+
 module.exports.getTileUrls = function(req, domains, path, format) {
 
   if (domains) {
@@ -37,3 +43,36 @@ module.exports.fixTileJSONCenter = function(tileJSON) {
     ];
   }
 };
+
+module.exports.getFontsPbf = function(allowedFonts, fontPath, names, range, callback) {
+  var getFontPbf = function(name, range, callback) {
+    if (!allowedFonts || allowedFonts[name]) {
+      var filename = path.join(fontPath, name, range + '.pbf');
+      return fs.readFile(filename, function(err, data) {
+        if (err) {
+          return callback(new Error('Font load error: ' + name));
+        } else {
+          return callback(null, data);
+        }
+      });
+    } else {
+      return callback(new Error('Font not allowed: ' + name));
+    }
+  };
+
+  var fonts = names.split(',');
+  var queue = [];
+  fonts.forEach(function(font) {
+    queue.push(function(callback) {
+      getFontPbf(font, range, callback);
+    });
+  });
+
+  return async.parallel(queue, function(err, results) {
+    if (err) {
+      callback(err, new Buffer([]));
+    } else {
+      callback(err, glyphCompose.combine(results));
+    }
+  });
+};

test/style.js

@@ -42,7 +42,7 @@ describe('Fonts', function() {
   testIs('/fonts/Open Sans Regular/65280-65533.pbf', /application\/x-protobuf/);
   testIs('/fonts/Open Sans Bold,Open Sans Regular/0-255.pbf',
          /application\/x-protobuf/);
-  testIs('/fonts/Nonsense,Open Sans Bold/0-255.pbf', /application\/x-protobuf/);
+  testIs('/fonts/Nonsense,Open Sans Bold/0-255.pbf', /./, 400);
 
   testIs('/fonts/Nonsense/0-255.pbf', /./, 400);
   testIs('/fonts/Nonsense1,Nonsense2/0-255.pbf', /./, 400);