Update package version to 0.9.1

Avoid curl | bash

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 test_data
+data
+light
 config.json

.travis.yml

@@ -15,7 +15,7 @@ before_install:
   - sudo apt-get install -qq xvfb
 install:
   - npm install
-  - wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.0.3.zip
+  - wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.8.zip
   - unzip -q test_data.zip -d tmp_test_data
   - mkdir test_data
   - mv tmp_test_data/tileserver-gl-data-*/* -t test_data

Dockerfile

@@ -3,14 +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 - \
+&& echo "deb https://deb.nodesource.com/node_4.x jessie main" >> /etc/apt/sources.list.d/nodejs.list \
-&& apt-get -y install nodejs \
+&& 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

deploy-light.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+
+'use strict';
+
+// SYNC THE `light` FOLDER
+require('child_process').execSync('rsync -av --exclude="light" --exclude=".git" --exclude="node_modules" --delete . light', {
+  stdio: 'inherit'
+});
+
+// PATCH `package.json`
+var fs = require('fs');
+var packageJson = require('./package');
+
+packageJson.name += '-light';
+delete packageJson.dependencies['canvas'];
+delete packageJson.dependencies['mapbox-gl-native'];
+delete packageJson.dependencies['sharp'];
+
+delete packageJson.devDependencies;
+
+var str = JSON.stringify(packageJson, undefined, 2);
+fs.writeFileSync('light/package.json', str);
+
+// PUBLISH
+require('child_process').execSync('npm publish light', {
+  stdio: 'inherit'
+});

docs/Makefile

@@ -0,0 +1,177 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/TileServerGL.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/TileServerGL.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/TileServerGL"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/TileServerGL"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/conf.py

@@ -0,0 +1,258 @@
+# -*- coding: utf-8 -*-
+#
+# TileServer GL documentation build configuration file, created by
+# sphinx-quickstart on Thu Aug  4 23:48:49 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'TileServer GL'
+copyright = u'2016, Klokan Technologies GmbH'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '1'
+# The full version, including alpha/beta/rc tags.
+release = '1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'TileServerGLdoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+  ('index', 'TileServerGL.tex', u'TileServer GL Documentation',
+   u'Klokan Technologies GmbH', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'tileservergl', u'TileServer GL Documentation',
+     [u'Klokan Technologies GmbH'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'TileServerGL', u'TileServer GL Documentation',
+   u'Klokan Technologies GmbH', 'TileServerGL', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False

docs/index.rst

@@ -0,0 +1,22 @@
+.. TileServer GL documentation master file, created by
+   sphinx-quickstart on Thu Aug  4 23:48:49 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to TileServer GL's documentation!
+=========================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Map tile server for JSON GL styles - serverside generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -16,25 +16,26 @@
     "test": "mocha test/**.js"
   },
   "dependencies": {
-    "async": "1.5.2",
+    "async": "2.0.1",
     "advanced-pool": "0.3.2",
-    "base64url": "1.0.6",
+    "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.73.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"
   }

public/templates/data.tmpl

@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>{{name}} - TileServer GL</title>
   {{#is_vector}}
   <link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" />

public/templates/viewer.tmpl

@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>{{name}} - TileServer GL</title>
   <link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" />
   <script src="/mapbox-gl.js{{&key_query}}"></script>

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) {
+  var fontPath = options.paths.fonts;
-    // 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([]));
-    }
-  };
 
   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(',');
+    return utils.getFontsPbf(allowedFonts, fontPath, fontstack, range,
-
+        function(err, concated) {
-    var queue = [];
+      if (err || concated.length === 0) {
-    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 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

@@ -38,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;
@@ -54,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]];
@@ -289,6 +299,7 @@ module.exports = function(options, repo, params, id) {
           }
 
           res.set({
+            'Last-Modified': lastModified,
             'Content-Type': 'image/' + format
           });
           return res.status(200).send(buffer);
@@ -298,6 +309,13 @@ module.exports = function(options, repo, params, id) {
   };
 
   app.get(tilePattern, function(req, res, next) {
+    var modifiedSince = req.get('if-modified-since'), cc = req.get('cache-control');
+    if (modifiedSince && (!cc || cc.indexOf('no-cache') == -1)) {
+      if (new Date(lastModified) <= new Date(modifiedSince)) {
+        return res.sendStatus(304);
+      }
+    }
+
     var z = req.params.z | 0,
         x = req.params.x | 0,
         y = req.params.y | 0,

src/server.js

@@ -17,13 +17,18 @@ var base64url = require('base64url'),
 
 var packageJson = require('../package'),
     serve_font = require('./serve_font'),
-    serve_rendered = require('./serve_rendered'),
+    serve_rendered = null,
     serve_style = require('./serve_style'),
     serve_data = require('./serve_data'),
     utils = require('./utils');
 
+if (packageJson.name.slice(-6) !== '-light') {
+  // do not require `serve_rendered` in the light package
+  serve_rendered = require('./serve_rendered');
+}
+
 module.exports = function(opts, callback) {
-  console.log('Starting TileServer-GL v' + packageJson.version);
+  console.log('Starting ' + packageJson.name + ' v' + packageJson.version);
 
   var app = express().disable('x-powered-by'),
       serving = {
@@ -100,8 +105,12 @@ module.exports = function(opts, callback) {
         }));
     }
     if (item.serve_rendered !== false) {
-      app.use('/styles/' + id + '/',
+      if (serve_rendered) {
-              serve_rendered(options, serving.rendered, item, id));
+        app.use('/styles/' + id + '/',
+                serve_rendered(options, serving.rendered, item, id));
+      } else {
+        item.serve_rendered = false;
+      }
     }
   });
 
@@ -176,7 +185,7 @@ module.exports = function(opts, callback) {
             return res.status(404).send('Not found');
           }
         }
-        data['server_version'] = packageJson.version;
+        data['server_version'] = packageJson.name + ' v' + packageJson.version;
         data['key_query_part'] =
             req.query.key ? 'key=' + req.query.key + '&' : '';
         data['key_query'] = req.query.key ? '?key=' + req.query.key : '';

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/metadata.js

@@ -64,6 +64,6 @@ describe('Metadata', function() {
     });
   });
 
-  testTileJSON('/styles/test/rendered.json', 'test');
+  testTileJSON('/styles/bright/rendered.json', 'bright');
   testTileJSON('/data/zurich-vector.json', 'zurich-vector');
 });

test/static.js

@@ -12,88 +12,90 @@ var testStatic = function(prefix, q, format, status, scale, type, query) {
   });
 };
 
+var prefix = 'bright';
+
 describe('Static endpoints', function() {
   describe('center-based', function() {
     describe('valid requests', function() {
       describe('various formats', function() {
-        testStatic('test', '0,0,0/256x256', 'png', 200, undefined, /image\/png/);
+        testStatic(prefix, '0,0,0/256x256', 'png', 200, undefined, /image\/png/);
-        testStatic('test', '0,0,0/256x256', 'jpg', 200, undefined, /image\/jpeg/);
+        testStatic(prefix, '0,0,0/256x256', 'jpg', 200, undefined, /image\/jpeg/);
-        testStatic('test', '0,0,0/256x256', 'jpeg', 200, undefined, /image\/jpeg/);
+        testStatic(prefix, '0,0,0/256x256', 'jpeg', 200, undefined, /image\/jpeg/);
-        testStatic('test', '0,0,0/256x256', 'webp', 200, undefined, /image\/webp/);
+        testStatic(prefix, '0,0,0/256x256', 'webp', 200, undefined, /image\/webp/);
       });
 
       describe('different parameters', function() {
-        testStatic('test', '0,0,0/300x300', 'png', 200, 2);
+        testStatic(prefix, '0,0,0/300x300', 'png', 200, 2);
-        testStatic('test', '0,0,0/300x300', 'png', 200, 3);
+        testStatic(prefix, '0,0,0/300x300', 'png', 200, 3);
 
-        testStatic('test', '80,40,20/600x300', 'png', 200, 3);
+        testStatic(prefix, '80,40,20/600x300', 'png', 200, 3);
-        testStatic('test', '8.5,40.5,20/300x150', 'png', 200, 3);
+        testStatic(prefix, '8.5,40.5,20/300x150', 'png', 200, 3);
-        testStatic('test', '-8.5,-40.5,20/300x150', 'png', 200, 3);
+        testStatic(prefix, '-8.5,-40.5,20/300x150', 'png', 200, 3);
 
-        testStatic('test', '8,40,2@0,0/300x150', 'png', 200);
+        testStatic(prefix, '8,40,2@0,0/300x150', 'png', 200);
-        testStatic('test', '8,40,2@180,45/300x150', 'png', 200, 2);
+        testStatic(prefix, '8,40,2@180,45/300x150', 'png', 200, 2);
-        testStatic('test', '8,40,2@10/300x150', 'png', 200, 3);
+        testStatic(prefix, '8,40,2@10/300x150', 'png', 200, 3);
-        testStatic('test', '8,40,2@10.3,20.4/300x300', 'png', 200);
+        testStatic(prefix, '8,40,2@10.3,20.4/300x300', 'png', 200);
-        testStatic('test', '0,0,2@390,120/300x300', 'png', 200);
+        testStatic(prefix, '0,0,2@390,120/300x300', 'png', 200);
       });
     });
 
     describe('invalid requests return 4xx', function() {
-      testStatic('test', '190,0,0/256x256', 'png', 400);
+      testStatic(prefix, '190,0,0/256x256', 'png', 400);
-      testStatic('test', '0,86,0/256x256', 'png', 400);
+      testStatic(prefix, '0,86,0/256x256', 'png', 400);
-      testStatic('test', '80,40,20/0x0', 'png', 400);
+      testStatic(prefix, '80,40,20/0x0', 'png', 400);
-      testStatic('test', '0,0,0/256x256', 'gif', 400);
+      testStatic(prefix, '0,0,0/256x256', 'gif', 400);
-      testStatic('test', '0,0,0/256x256', 'png', 404, 1);
+      testStatic(prefix, '0,0,0/256x256', 'png', 404, 1);
 
-      testStatic('test', '0,0,-1/256x256', 'png', 404);
+      testStatic(prefix, '0,0,-1/256x256', 'png', 404);
-      testStatic('test', '0,0,1.5/256x256', 'png', 404);
+      testStatic(prefix, '0,0,1.5/256x256', 'png', 404);
-      testStatic('test', '0,0,0/256.5x256.5', 'png', 404);
+      testStatic(prefix, '0,0,0/256.5x256.5', 'png', 404);
 
-      testStatic('test', '0,0,0,/256x256', 'png', 404);
+      testStatic(prefix, '0,0,0,/256x256', 'png', 404);
-      testStatic('test', '0,0,0,0,/256x256', 'png', 404);
+      testStatic(prefix, '0,0,0,0,/256x256', 'png', 404);
     });
   });
 
   describe('area-based', function() {
     describe('valid requests', function() {
       describe('various formats', function() {
-        testStatic('test', '-180,-80,180,80/10x10', 'png', 200, undefined, /image\/png/);
+        testStatic(prefix, '-180,-80,180,80/10x10', 'png', 200, undefined, /image\/png/);
-        testStatic('test', '-180,-80,180,80/10x10', 'jpg', 200, undefined, /image\/jpeg/);
+        testStatic(prefix, '-180,-80,180,80/10x10', 'jpg', 200, undefined, /image\/jpeg/);
-        testStatic('test', '-180,-80,180,80/10x10', 'jpeg', 200, undefined, /image\/jpeg/);
+        testStatic(prefix, '-180,-80,180,80/10x10', 'jpeg', 200, undefined, /image\/jpeg/);
-        testStatic('test', '-180,-80,180,80/10x10', 'webp', 200, undefined, /image\/webp/);
+        testStatic(prefix, '-180,-80,180,80/10x10', 'webp', 200, undefined, /image\/webp/);
       });
 
       describe('different parameters', function() {
-        testStatic('test', '-180,-90,180,90/20x20', 'png', 200, 2);
+        testStatic(prefix, '-180,-90,180,90/20x20', 'png', 200, 2);
-        testStatic('test', '0,0,1,1/200x200', 'png', 200, 3);
+        testStatic(prefix, '0,0,1,1/200x200', 'png', 200, 3);
 
-        testStatic('test', '-280,-80,0,80/280x160', 'png', 200);
+        testStatic(prefix, '-280,-80,0,80/280x160', 'png', 200);
       });
     });
 
     describe('invalid requests return 4xx', function() {
-      testStatic('test', '0,87,1,88/5x2', 'png', 400);
+      testStatic(prefix, '0,87,1,88/5x2', 'png', 400);
 
-      testStatic('test', '0,0,1,1/1x1', 'gif', 400);
+      testStatic(prefix, '0,0,1,1/1x1', 'gif', 400);
 
-      testStatic('test', '-180,-80,180,80/0.5x2.6', 'png', 404);
+      testStatic(prefix, '-180,-80,180,80/0.5x2.6', 'png', 404);
     });
   });
 
   describe('autofit path', function() {
     describe('valid requests', function() {
-      testStatic('test', 'auto/256x256', 'png', 200, undefined, /image\/png/, '?path=10,10|20,20');
+      testStatic(prefix, 'auto/256x256', 'png', 200, undefined, /image\/png/, '?path=10,10|20,20');
 
       describe('different parameters', function() {
-        testStatic('test', 'auto/20x20', 'png', 200, 2, /image\/png/, '?path=10,10|20,20');
+        testStatic(prefix, 'auto/20x20', 'png', 200, 2, /image\/png/, '?path=10,10|20,20');
-        testStatic('test', 'auto/200x200', 'png', 200, 3, /image\/png/, '?path=-10,-10|-20,-20');
+        testStatic(prefix, 'auto/200x200', 'png', 200, 3, /image\/png/, '?path=-10,-10|-20,-20');
       });
     });
 
     describe('invalid requests return 4xx', function() {
-      testStatic('test', 'auto/256x256', 'png', 400);
+      testStatic(prefix, 'auto/256x256', 'png', 400);
-      testStatic('test', 'auto/256x256', 'png', 400, undefined, undefined, '?path=10,10');
+      testStatic(prefix, 'auto/256x256', 'png', 400, undefined, undefined, '?path=10,10');
-      testStatic('test', 'auto/2560x2560', 'png', 400, undefined, undefined, '?path=10,10|20,20');
+      testStatic(prefix, 'auto/2560x2560', 'png', 400, undefined, undefined, '?path=10,10|20,20');
     });
   });
 });

test/style.js

@@ -8,13 +8,15 @@ var testIs = function(url, type, status) {
   });
 };
 
+var prefix = 'bright';
+
 describe('Styles', function() {
-  describe('/styles/test.json is valid style', function() {
+  describe('/styles/' + prefix + '.json is valid style', function() {
-    testIs('/styles/test.json', /application\/json/);
+    testIs('/styles/' + prefix + '.json', /application\/json/);
 
     it('contains expected properties', function(done) {
       supertest(app)
-        .get('/styles/test.json')
+        .get('/styles/' + prefix + '.json')
         .expect(function(res) {
           res.body.version.should.equal(8);
           res.body.name.should.be.String();
@@ -29,20 +31,20 @@ describe('Styles', function() {
     testIs('/styles/streets.json', /./, 404);
   });
 
-  describe('/styles/test/sprite[@2x].{format}', function() {
+  describe('/styles/' + prefix + '/sprite[@2x].{format}', function() {
-    testIs('/styles/test/sprite.json', /application\/json/);
+    testIs('/styles/' + prefix + '/sprite.json', /application\/json/);
-    testIs('/styles/test/sprite@2x.json', /application\/json/);
+    testIs('/styles/' + prefix + '/sprite@2x.json', /application\/json/);
-    testIs('/styles/test/sprite.png', /image\/png/);
+    testIs('/styles/' + prefix + '/sprite.png', /image\/png/);
-    testIs('/styles/test/sprite@2x.png', /image\/png/);
+    testIs('/styles/' + prefix + '/sprite@2x.png', /image\/png/);
   });
 });
 
 describe('Fonts', function() {
   testIs('/fonts/Open Sans Bold/0-255.pbf', /application\/x-protobuf/);
-  testIs('/fonts/Open Sans Regular/65280-65533.pbf', /application\/x-protobuf/);
+  testIs('/fonts/Open Sans Regular/65280-65535.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);

test/tiles_rendered.js

@@ -9,35 +9,37 @@ var testTile = function(prefix, z, x, y, format, status, scale, type) {
   });
 };
 
+var prefix = 'bright';
+
 describe('Raster tiles', function() {
   describe('valid requests', function() {
     describe('various formats', function() {
-      testTile('test', 0, 0, 0, 'png', 200, undefined, /image\/png/);
+      testTile(prefix, 0, 0, 0, 'png', 200, undefined, /image\/png/);
-      testTile('test', 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/);
+      testTile(prefix, 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/);
-      testTile('test', 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/);
+      testTile(prefix, 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/);
-      testTile('test', 0, 0, 0, 'webp', 200, undefined, /image\/webp/);
+      testTile(prefix, 0, 0, 0, 'webp', 200, undefined, /image\/webp/);
     });
 
     describe('different coordinates and scales', function() {
-      testTile('test', 1, 1, 1, 'png', 200);
+      testTile(prefix, 1, 1, 1, 'png', 200);
 
-      testTile('test', 0, 0, 0, 'png', 200, 2);
+      testTile(prefix, 0, 0, 0, 'png', 200, 2);
-      testTile('test', 0, 0, 0, 'png', 200, 3);
+      testTile(prefix, 0, 0, 0, 'png', 200, 3);
-      testTile('test', 2, 1, 1, 'png', 200, 3);
+      testTile(prefix, 2, 1, 1, 'png', 200, 3);
     });
   });
 
   describe('invalid requests return 4xx', function() {
     testTile('non_existent', 0, 0, 0, 'png', 404);
-    testTile('test', -1, 0, 0, 'png', 404);
+    testTile(prefix, -1, 0, 0, 'png', 404);
-    testTile('test', 25, 0, 0, 'png', 404);
+    testTile(prefix, 25, 0, 0, 'png', 404);
-    testTile('test', 0, 1, 0, 'png', 404);
+    testTile(prefix, 0, 1, 0, 'png', 404);
-    testTile('test', 0, 0, 1, 'png', 404);
+    testTile(prefix, 0, 0, 1, 'png', 404);
-    testTile('test', 0, 0, 0, 'gif', 400);
+    testTile(prefix, 0, 0, 0, 'gif', 400);
-    testTile('test', 0, 0, 0, 'pbf', 400);
+    testTile(prefix, 0, 0, 0, 'pbf', 400);
 
-    testTile('test', 0, 0, 0, 'png', 404, 1);
+    testTile(prefix, 0, 0, 0, 'png', 404, 1);
-    testTile('test', 0, 0, 0, 'png', 404, 4);
+    testTile(prefix, 0, 0, 0, 'png', 404, 4);
 
     //testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this
   });