Update package version to 1.3.0-beta.3

Use Mapbox GL Inspect for X-Ray View

.gitignore

@@ -1,3 +1,8 @@
+docs/_build
 node_modules
 test_data
+data
+light
+plugins
 config.json
+*.mbtiles

.travis.yml

@@ -15,9 +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/releases/download/v1.3.0/test_data.zip
-  - unzip -q test_data.zip -d tmp_test_data
+  - unzip -q test_data.zip -d test_data
-  - mkdir test_data
-  - mv tmp_test_data/tileserver-gl-data-*/* -t test_data
 script:
   - xvfb-run --server-args="-screen 0 1024x768x24" npm test

Dockerfile

@@ -3,14 +3,20 @@ 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 \
+    libprotobuf-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
@@ -21,4 +27,4 @@ VOLUME /data
 WORKDIR /data
 
 EXPOSE 80
-CMD ["/usr/src/app/run.sh"]
+ENTRYPOINT ["/usr/src/app/run.sh"]

Dockerfile_light

@@ -0,0 +1,12 @@
+FROM node:4
+MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
+
+RUN mkdir -p /usr/src/app
+COPY / /usr/src/app
+RUN cd /usr/src/app && npm install --production
+
+VOLUME /data
+WORKDIR /data
+
+EXPOSE 80
+ENTRYPOINT ["node", "/usr/src/app/", "-p", "80"]

PUBLISHING.md

@@ -0,0 +1,6 @@
+# Publishing new version
+
+- Update version in `package.json`
+- `git tag vx.x.x`
+- `git push --tags`
+- `node publish.js` (publishes packages to npm)

README.md

@@ -1,59 +1,46 @@
+![tileserver-gl](https://cloud.githubusercontent.com/assets/59284/18173467/fa3aa2ca-7069-11e6-86b1-0f1266befeb6.jpeg)
+
+
 # TileServer GL
 [![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. Server side rendering by Mapbox GL Native. Map tile server for Mapbox GL JS, Android, iOS, Leaflet, OpenLayers, GIS via WMTS, etc.
 
-## Installation
+## Get Started
 
-### Docker
+Install `tileserver-gl` with server-side raster rendering of vector tiles with npm
- - `docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl`
 
-### Without docker
+```bash
- - Make sure you have Node v4 or higher (`nvm install 4`)
+npm install -g tileserver-gl
- - `npm install`
+```
- - `node src/main.js`
 
-## Sample data
+Now download vector tiles from [OSM2VectorTiles](http://osm2vectortiles.org/downloads/).
-Sample data can be downloaded at https://github.com/klokantech/tileserver-gl-data/archive/master.zip
 
-#### Usage
+```bash
-- unpack somewhere and `cd` to the directory
+curl -o zurich_switzerland.mbtiles https://osm2vectortiles-downloads.os.zhdk.cloud.switch.ch/v2.0/extracts/zurich_switzerland.mbtiles
-- `docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl`
+```
-  - (or `node path/to/repo/src/main.js`)
 
-## Configuration
+Start `tileserver-gl` with the downloaded vector tiles.
 
-Create `config.json` file in the root directory.
+```bash
-The config file can contain definition of several paths where the tiles will be served.
+tileserver-gl zurich_switzerland.mbtiles
+```
 
-### Example configuration file
+Alternatively, you can use the `tileserver-gl-light` package instead, which is pure javascript (does not have any native dependencies) and can run anywhere, but does not contain rasterization on the server side made with MapBox GL Native.
-See https://github.com/klokantech/tileserver-gl-data/blob/master/config.json
 
-**Note**: To specify local mbtiles as source of the vector tiles inside the style, use urls with `mbtiles` protocol with path relative to the `cwd + options.paths.root + options.paths.mbtiles`. (For example `mbtiles://switzerland.mbtiles`)
+## Using Docker
 
-## Available URLs
+An alternative to npm to start the packed software easier is to install [Docker](http://www.docker.com/) on your computer and then run in the directory with the downloaded MBTiles the command:
 
-- If you visit the server on the configured port (default 8080) you should see your maps appearing in the browser.
+```bash
-- Style is served at `/styles/{id}.json` (+ array at `/styles.json`)
+docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl
-  - Sprites at `/styles/{id}/sprite[@2x].{format}`
+```
-  - Fonts at `/fonts/{fontstack}/{start}-{end}.pbf`
+
-- Rendered tiles are at `/styles/{id}/rendered/{z}/{x}/{y}[@2x].{format}`
+This will download and start a ready to use container on your computer and the maps are going to be available in webbrowser on localhost:8080.
-  - The optional `@2x` (or `@3x`) part can be used to render HiDPI (retina) tiles
+
-  - Available formats: `png`, `jpg` (`jpeg`), `webp`
+On laptop you can use [Docker Kitematic](https://kitematic.com/) and search "tileserver-gl" and run it, then drop in the 'data' folder the MBTiles.
-  - TileJSON at `/styles/{id}/rendered.json`
+
-- Static images are rendered at:
+## Documentation
-  - `/styles/{id}/static/{lon},{lat},{zoom}[@{bearing}[,{pitch}]]/{width}x{height}[@2x].{format}` (center-based)
+
-  - `/styles/{id}/static/{minx},{miny},{maxx},{maxy}/{width}x{height}[@2x].{format}` (area-based)
+You can read full documentation of this project at http://tileserver.readthedocs.io/.
-  - `/styles/{id}/static/auto/{width}x{height}[@2x].{format}` (autofit path -- see below)
-  - The static image endpoints additionally support following query parameters:
-    - `path` - comma-separated `lng,lat`, pipe-separated pairs
-      - e.g. `5.9,45.8|5.9,47.8|10.5,47.8|10.5,45.8|5.9,45.8`
-    - `latlng` - indicates the `path` coordinates are in `lat,lng` order rather than the usual `lng,lat`
-    - `fill` - color to use as the fill (e.g. `red`, `rgba(255,255,255,0.5)`, `#0000ff`)
-    - `stroke` - color of the path stroke
-    - `width` - width of the stroke
-    - `padding` - "percetange" padding for fitted endpoints (area-based and path autofit)
-      - value of `0.1` means "add 10% size to each side to make sure the area of interest is nicely visible"
-- Source data at `/data/{mbtiles}/{z}/{x}/{y}.{format}`
-  - TileJSON at `/data/{mbtiles}.json`
-- Array of all TileJSONs at `/index.json` (`/rendered.json`; `/data.json`)

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

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/config.rst

@@ -0,0 +1,154 @@
+==================
+Configuration file
+==================
+
+The configuration file defines the behavior of the application. It's a regular JSON file.
+
+Example::
+
+  {
+    "options": {
+      "paths": {
+        "root": "",
+        "fonts": "fonts",
+        "sprites": "sprites",
+        "styles": "styles",
+        "mbtiles": ""
+      },
+      "domains": [
+        "localhost:8080",
+        "127.0.0.1:8080"
+      ],
+      "formatQuality": {
+        "jpeg": 80,
+        "webp": 90,
+        "pngQuantization": false,
+        "png": 90
+      },
+      "maxSize": 2048,
+      "serveAllFonts": false
+    },
+    "styles": {
+      "basic": {
+        "style": "basic.json",
+        "tilejson": {
+          "type": "overlay",
+          "bounds": [8.44806, 47.32023, 8.62537, 47.43468]
+        }
+      },
+      "hybrid": {
+        "style": "satellite-hybrid.json",
+        "serve_rendered": false,
+        "tilejson": {
+          "format": "webp"
+        }
+      }
+    },
+    "data": {
+      "zurich-vector": {
+        "mbtiles": "zurich.mbtiles"
+      }
+    }
+  }
+
+
+``options``
+===========
+
+``paths``
+---------
+
+Defines where to look for the different types of input data.
+
+The value of ``root`` is used as prefix for all data types.
+
+``domains``
+-----------
+
+You can use this to optionally specify on what domains the rendered tiles are accessible. This can be used for basic load-balancing or to bypass browser's limit for the number of connections per domain.
+
+``formatQuality``
+-----------------
+
+Quality of the compression of individual image formats. [0-100]
+
+The value for ``png`` is only used when ``pngQuantization`` is ``true``.
+
+``maxSize``
+-----------
+
+Maximum image side length to be allowed to be rendered (including scale factor). Default is ``2048``.
+
+``styles``
+==========
+
+Each item in this object defines one style (map). It can have the following options:
+
+* ``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
+* ``tilejson`` -- properties to add to the TileJSON created for the raster data
+
+  * ``format`` and ``bounds`` can be especially useful
+
+``data``
+========
+
+Each item specifies one data source which should be made accessible by the server. It has the following options:
+
+* ``mbtiles`` -- name of the mbtiles file [required]
+
+The mbtiles file does not need to be specified here unless you explicitly want to serve the raw data.
+
+Referencing local files from style JSON
+=======================================
+
+You can link various data sources from the style JSON (for example even remote TileJSONs).
+
+MBTiles
+-------
+
+To specify that you want to use local mbtiles, use to following syntax: ``mbtiles://switzerland.mbtiles``.
+The TileServer-GL will try to find the file ``switzerland.mbtiles`` in ``root`` + ``mbtiles`` path.
+
+For example::
+
+  "sources": {
+    "source1": {
+      "url": "mbtiles://switzerland.mbtiles",
+      "type": "vector"
+    }
+  }
+
+Alternatively, you can use ``mbtiles://{zurich-vector}`` to reference existing data object from the config.
+In this case, the server will look into the ``config.json`` to determine what mbtiles file to use.
+For the config above, this is equivalent to ``mbtiles://zurich.mbtiles``.
+
+Sprites
+-------
+
+If your style requires any sprites, make sure the style JSON contains proper path in the ``sprite`` property.
+
+It can be a local path (e.g. ``my-style/sprite``) or remove http(s) location (e.g. ``https://mycdn.com/my-style/sprite``). Several possible extension are added to this path, so the following files should be present:
+
+* ``sprite.json``
+* ``sprite.png``
+* ``sprite@2x.json``
+* ``sprite@2x.png``
+
+You can also use the following placeholders in the sprite path for easier use:
+
+* ``{style}`` -- gets replaced with the name of the style file (``xxx.json``)
+* ``{styleJsonFolder}`` -- gets replaced with the path to the style file
+
+Fonts (glyphs)
+--------------
+
+Similarly to the sprites, the style JSON also needs to contain proper paths to the font glyphs (in the ``glyphs`` property) and can be both local and remote.
+
+It should contain the following placeholders:
+
+* ``{fontstack}`` -- name of the font and variant
+* ``{range}`` -- range of the glyphs
+
+For example ``"glyphs": "{fontstack}/{range}.pbf"`` will instruct TileServer-GL to look for the files such as ``fonts/Open Sans/0-255.pbf`` (``fonts`` come from the ``paths`` property of the ``config.json`` example above).

docs/deployment.rst

@@ -0,0 +1,20 @@
+==========
+Deployment
+==========
+
+Typically - you should use nginx/lighttpd/apache on the frontend - and the tileserver-gl server is hidden behind it in production deployment.
+
+Caching
+=======
+
+There is a plenty of options you can use to create proper caching infrastructure: Varnish, CloudFlare, ...
+
+Securing
+========
+
+Nginx can be used to add protection via https, password, referrer, IP address restriction, access keys, etc.
+
+Running behind a proxy or a load-balancer
+=========================================
+
+If you need to run TileServer GL behind a proxy, make sure the proxy sends ``X-Forwarded-*`` headers to the server (most importantly ``X-Forwarded-Host`` and ``X-Forwaded-Proto``) to ensures the URLs generated inside TileJSON etc. are using the desired domain and protocol.

docs/endpoints.rst

@@ -0,0 +1,66 @@
+===================
+Available endpoints
+===================
+
+If you visit the server on the configured port (default 8080) you can see your maps appearing in the browser.
+
+Styles
+======
+* Styles are served at ``/styles/{id}.json`` (+ array at ``/styles.json``)
+
+  * Sprites at ``/styles/{id}/sprite[@2x].{format}``
+  * Fonts at ``/fonts/{fontstack}/{start}-{end}.pbf``
+
+Rendered tiles
+==============
+* Rendered tiles are served at ``/styles/{id}/rendered/{z}/{x}/{y}[@2x].{format}``
+
+  * The optional ``@2x`` (or ``@3x``, ``@4x``) part can be used to render HiDPI (retina) tiles
+  * Available formats: ``png``, ``jpg`` (``jpeg``), ``webp``
+  * TileJSON at ``/styles/{id}/rendered.json``
+
+* The rendered tiles are not available in the ``tileserver-gl-light`` version.
+
+Static images
+=============
+* Several endpoints:
+
+  * ``/styles/{id}/static/{lon},{lat},{zoom}[@{bearing}[,{pitch}]]/{width}x{height}[@2x].{format}`` (center-based)
+  * ``/styles/{id}/static/{minx},{miny},{maxx},{maxy}/{width}x{height}[@2x].{format}`` (area-based)
+  * ``/styles/{id}/static/auto/{width}x{height}[@2x].{format}`` (autofit path -- see below)
+
+* All the static image endpoints additionally support following query parameters:
+
+  * ``path`` - comma-separated ``lng,lat``, pipe-separated pairs
+
+    * e.g. ``5.9,45.8|5.9,47.8|10.5,47.8|10.5,45.8|5.9,45.8``
+
+  * ``latlng`` - indicates the ``path`` coordinates are in ``lat,lng`` order rather than the usual ``lng,lat``
+  * ``fill`` - color to use as the fill (e.g. ``red``, ``rgba(255,255,255,0.5)``, ``#0000ff``)
+  * ``stroke`` - color of the path stroke
+  * ``width`` - width of the stroke
+  * ``padding`` - "percetange" padding for fitted endpoints (area-based and path autofit)
+
+    * value of ``0.1`` means "add 10% size to each side to make sure the area of interest is nicely visible"
+
+* You can also use (experimental) ``/styles/{id}/static/raw/...`` endpoints with raw spherical mercator coordinates (EPSG:3857) instead of WGS84.
+
+* The static images are not available in the ``tileserver-gl-light`` version.
+
+Source data
+===========
+* Source data are served at ``/data/{mbtiles}/{z}/{x}/{y}.{format}``
+
+  * Format depends on the source file (usually ``png`` or ``pbf``)
+
+    * ``geojson`` is also available (useful for inspecting the tiles) in case the original format is ``pbf``
+
+  * TileJSON at ``/data/{mbtiles}.json``
+
+TileJSON arrays
+===============
+Array of all TileJSONs is at ``/index.json`` (``/rendered.json``; ``/data.json``)
+
+List of available fonts
+=======================
+Array of names of the available fonts is at ``/fontstacks.json``

docs/index.rst

@@ -0,0 +1,28 @@
+.. 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
+
+   installation
+   usage
+   config
+   deployment
+   endpoints
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

docs/installation.rst

@@ -0,0 +1,58 @@
+============
+Installation
+============
+
+Docker
+======
+
+When running docker image, no special installation is needed -- the docker will automatically download the image if not present.
+
+Just run ``docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl``.
+
+Additional options (see :doc:`/usage`) can be passed to the TileServer GL by appending them to the end of this command. You can, for example, do the following:
+
+* ``docker run ... klokantech/tileserver-gl my-tiles.mbtiles`` -- explicitly specify which mbtiles to use (if you have more in the folder)
+* ``docker run ... klokantech/tileserver-gl --verbose`` -- to see the default config created automatically
+
+npm
+===
+
+Just run ``npm install -g tileserver-gl``.
+
+
+Native dependencies
+-------------------
+
+There are some native dependencies that you need to make sure are installed if you plan to run the TileServer GL natively without docker.
+The precise package names you need to install may differ on various platforms.
+
+These are required on Debian 9:
+  * ``build-essential``
+  * ``libcairo2-dev``
+  * ``libprotobuf-dev``
+
+
+``tileserver-gl-light`` on npm
+==============================
+
+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.
+
+
+From source
+===========
+
+Make sure you have Node v4 (nvm install 4) and run::
+
+  npm install
+  node .
+
+
+On OSX
+======
+
+Make sure to have dependencies of canvas_ package installed::
+
+  brew install pkg-config cairo libpng jpeg giflib
+
+
+.. _canvas: https://www.npmjs.com/package/canvas

docs/usage.rst

@@ -0,0 +1,28 @@
+=====
+Usage
+=====
+
+Getting started
+======
+
+::
+
+    Usage: tileserver-gl [mbtiles] [options]
+
+    mbtiles     MBTiles file (uses demo configuration);
+                ignored if the configuration file is also specified
+
+    Options:
+       -c, --config    Configuration file  [config.json]
+       -b, --bind      Bind address
+       -p, --port      Port  [8080]
+       -V, --verbose   More verbose output
+       -v, --version   Version info
+
+
+
+Default styles and configuration
+======
+
+- If no configuration file is specified, the default styles (compatible with osm2vectortiles) are used.
+- If no mbtiles file is specified (and is not found in the current working directory), an extract is downloaded directly from osm2vectortiles.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tileserver-gl",
-  "version": "0.8.0",
+  "version": "1.3.0-beta.3",
-  "description": "Map tile server for JSON GL styles - serverside generated raster tiles",
+  "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
   "authors": [
@@ -12,30 +12,41 @@
     "url": "https://github.com/klokantech/tileserver-gl.git"
   },
   "license": "BSD-2-Clause",
+  "engines": {
+    "node": ">=4.2.1 <5"
+  },
   "scripts": {
     "test": "mocha test/**.js"
   },
   "dependencies": {
-    "async": "1.5.2",
+    "async": "2.1.4",
     "advanced-pool": "0.3.2",
-    "base64url": "1.0.6",
+    "base64url": "2.0.0",
-    "canvas": "1.4.0",
+    "canvas": "1.6.2",
-    "clone": "1.0.2",
+    "clone": "2.1.0",
-    "color": "0.11.3",
+    "color": "1.0.3",
-    "cors": "2.7.1",
+    "cors": "2.8.1",
     "express": "4.14.0",
-    "handlebars": "4.0.5",
+    "glyph-pbf-composite": "0.0.2",
-    "mapbox-gl-native": "3.2.1",
+    "handlebars": "4.0.6",
+    "mapbox-gl-native": "3.4.2",
     "mbtiles": "0.9.0",
     "morgan": "1.7.0",
+    "node-pngquant-native": "1.0.4",
     "nomnom": "1.8.1",
-    "request": "2.73.0",
+    "pbf": "3.0.5",
-    "sharp": "0.15.1",
+    "request": "2.79.0",
-    "sphericalmercator": "1.0.5"
+    "sharp": "0.16.2",
+    "tileserver-gl-styles": "1.0.0",
+    "vector-tile": "1.3.0",
+    "@mapbox/sphericalmercator": "1.0.5"
+  },
+  "optionalDependencies": {
+    "tileshrink-gl": "./plugins/tileshrink-gl"
   },
   "devDependencies": {
-    "should": "^9.0.0",
+    "should": "^11.1.1",
-    "mocha": "^2.5.0",
+    "mocha": "^3.2.0",
-    "supertest": "^1.2.0"
+    "supertest": "^2.0.1"
   }
 }

public/resources/mapbox-gl-inspect.css

@@ -0,0 +1,40 @@
+.mapbox-gl-inspect_popup {
+  color: #333;
+  display: table;
+}
+
+.mapbox-gl-inspect_feature:not(:last-child) {
+  border-bottom: 1px solid #ccc;
+}
+
+.mapbox-gl-inspect_layer:before {
+  content: '#';
+}
+
+.mapbox-gl-inspect_layer {
+  display: block;
+  font-weight: bold;
+}
+
+.mapbox-gl-inspect_property {
+  display: table-row;
+}
+
+.mapbox-gl-inspect_property-value {
+  display: table-cell;
+
+}
+
+.mapbox-gl-inspect_property-name {
+  display: table-cell;
+  padding-right: 10px;
+}
+
+.mapboxgl-ctrl-inspect {
+  background-image: url('data:image/svg+xml;charset=utf8,<svg%20xmlns="http://www.w3.org/2000/svg"%20fill="#333333%22%20preserveAspectRatio=%22xMidYMid%20meet%22%20viewBox=%22-10%20-10%2060%2060%22%3E%3Cg%3E%3Cpath%20d=%22m15%2021.6q0-2%201.5-3.5t3.5-1.5%203.5%201.5%201.5%203.5-1.5%203.6-3.5%201.4-3.5-1.4-1.5-3.6z%20m18.4%2011.1l-6.4-6.5q1.4-2.1%201.4-4.6%200-3.4-2.5-5.8t-5.9-2.4-5.9%202.4-2.5%205.8%202.5%205.9%205.9%202.5q2.4%200%204.6-1.4l7.4%207.4q-0.9%200.6-2%200.6h-20q-1.3%200-2.3-0.9t-1.1-2.3l0.1-26.8q0-1.3%201-2.3t2.3-0.9h13.4l10%2010v19.3z%22%3E%3C/path%3E%3C/g%3E%3C/svg%3E');
+}
+
+.mapboxgl-ctrl-map {
+  background-image: url('data:image/svg+xml;charset=utf8,<svg%20xmlns="http://www.w3.org/2000/svg"%20fill="#333333%22%20viewBox=%22-10%20-10%2060%2060%22%20preserveAspectRatio=%22xMidYMid%20meet%22%3E%3Cg%3E%3Cpath%20d=%22m25%2031.640000000000004v-19.766666666666673l-10-3.511666666666663v19.766666666666666z%20m9.140000000000008-26.640000000000004q0.8599999999999923%200%200.8599999999999923%200.8600000000000003v25.156666666666666q0%200.625-0.625%200.783333333333335l-9.375%203.1999999999999993-10-3.5133333333333354-8.906666666666668%203.4383333333333326-0.2333333333333334%200.07833333333333314q-0.8616666666666664%200-0.8616666666666664-0.8599999999999994v-25.156666666666663q0-0.625%200.6233333333333331-0.7833333333333332l9.378333333333334-3.198333333333334%2010%203.5133333333333336%208.905000000000001-3.4383333333333344z%22%3E%3C/path%3E%3C/g%3E%3C/svg%3E');
+}
+

public/resources/mapbox-gl.css

@@ -21,13 +21,13 @@
 .mapboxgl-ctrl-top-left,
 .mapboxgl-ctrl-top-right,
 .mapboxgl-ctrl-bottom-left,
-.mapboxgl-ctrl-bottom-right  { position:absolute; }
+.mapboxgl-ctrl-bottom-right  { position:absolute; pointer-events:none; z-index:2; }
 .mapboxgl-ctrl-top-left      { top:0; left:0; }
 .mapboxgl-ctrl-top-right     { top:0; right:0; }
 .mapboxgl-ctrl-bottom-left   { bottom:0; left:0; }
 .mapboxgl-ctrl-bottom-right  { right:0; bottom:0; }
 
-.mapboxgl-ctrl { clear:both; }
+.mapboxgl-ctrl { clear:both; pointer-events:auto }
 .mapboxgl-ctrl-top-left .mapboxgl-ctrl { margin:10px 0 0 10px; float:left; }
 .mapboxgl-ctrl-top-right .mapboxgl-ctrl{ margin:10px 10px 0 0; float:right; }
 .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl { margin:0 0 10px 10px; float:left; }
@@ -65,37 +65,68 @@
     background-color: rgba(0,0,0,0.05);
 }
 .mapboxgl-ctrl-icon,
-.mapboxgl-ctrl-icon > div.arrow {
+.mapboxgl-ctrl-icon > span.arrow {
     speak: none;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
-.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-out {
+.mapboxgl-ctrl-icon {
     padding: 5px;
+}
+.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-out {
     background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%270%200%2020%2020%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%0A%20%20%3Cpath%20style%3D%27fill%3A%23333333%3B%27%20d%3D%27m%207%2C9%20c%20-0.554%2C0%20-1%2C0.446%20-1%2C1%200%2C0.554%200.446%2C1%201%2C1%20l%206%2C0%20c%200.554%2C0%201%2C-0.446%201%2C-1%200%2C-0.554%20-0.446%2C-1%20-1%2C-1%20z%27%20%2F%3E%0A%3C%2Fsvg%3E%0A");
 }
-.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-in  {
+.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-in {
-    padding: 5px;
     background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%270%200%2020%2020%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%0A%20%20%3Cpath%20style%3D%27fill%3A%23333333%3B%27%20d%3D%27M%2010%206%20C%209.446%206%209%206.4459904%209%207%20L%209%209%20L%207%209%20C%206.446%209%206%209.446%206%2010%20C%206%2010.554%206.446%2011%207%2011%20L%209%2011%20L%209%2013%20C%209%2013.55401%209.446%2014%2010%2014%20C%2010.554%2014%2011%2013.55401%2011%2013%20L%2011%2011%20L%2013%2011%20C%2013.554%2011%2014%2010.554%2014%2010%20C%2014%209.446%2013.554%209%2013%209%20L%2011%209%20L%2011%207%20C%2011%206.4459904%2010.554%206%2010%206%20z%27%20%2F%3E%0A%3C%2Fsvg%3E%0A");
 }
 .mapboxgl-ctrl-icon.mapboxgl-ctrl-geolocate  {
-    padding: 5px;
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D%270%200%2020%2020%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%0D%0A%20%20%3Cpath%20style%3D%27fill%3A%23333%3B%27%20d%3D%27M10%204C9%204%209%205%209%205L9%205.1A5%205%200%200%200%205.1%209L5%209C5%209%204%209%204%2010%204%2011%205%2011%205%2011L5.1%2011A5%205%200%200%200%209%2014.9L9%2015C9%2015%209%2016%2010%2016%2011%2016%2011%2015%2011%2015L11%2014.9A5%205%200%200%200%2014.9%2011L15%2011C15%2011%2016%2011%2016%2010%2016%209%2015%209%2015%209L14.9%209A5%205%200%200%200%2011%205.1L11%205C11%205%2011%204%2010%204zM10%206.5A3.5%203.5%200%200%201%2013.5%2010%203.5%203.5%200%200%201%2010%2013.5%203.5%203.5%200%200%201%206.5%2010%203.5%203.5%200%200%201%2010%206.5zM10%208.3A1.8%201.8%200%200%200%208.3%2010%201.8%201.8%200%200%200%2010%2011.8%201.8%201.8%200%200%200%2011.8%2010%201.8%201.8%200%200%200%2010%208.3z%27%20%2F%3E%0D%0A%3C%2Fsvg%3E");
-    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%270%200%2020%2020%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath%20style%3D%27fill%3A%23333333%3B%27%20d%3D%27M13%2C7%20L10.5%2C11.75%20L10.25%2C10%20z%20M13.888%2C6.112%20C13.615%2C5.84%2013.382%2C6.076%2012.5%2C6.5%20C10.14%2C7.634%206%2C10%206%2C10%20L9.5%2C10.5%20L10%2C14%20C10%2C14%2012.366%2C9.86%2013.5%2C7.5%20C13.924%2C6.617%2014.16%2C6.385%2013.888%2C6.112%27%2F%3E%3C%2Fsvg%3E");
+}
+.mapboxgl-ctrl-icon.mapboxgl-ctrl-geolocate.watching  {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D%270%200%2020%2020%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%0D%0A%20%20%3Cpath%20style%3D%27fill%3A%2300f%3B%27%20d%3D%27M10%204C9%204%209%205%209%205L9%205.1A5%205%200%200%200%205.1%209L5%209C5%209%204%209%204%2010%204%2011%205%2011%205%2011L5.1%2011A5%205%200%200%200%209%2014.9L9%2015C9%2015%209%2016%2010%2016%2011%2016%2011%2015%2011%2015L11%2014.9A5%205%200%200%200%2014.9%2011L15%2011C15%2011%2016%2011%2016%2010%2016%209%2015%209%2015%209L14.9%209A5%205%200%200%200%2011%205.1L11%205C11%205%2011%204%2010%204zM10%206.5A3.5%203.5%200%200%201%2013.5%2010%203.5%203.5%200%200%201%2010%2013.5%203.5%203.5%200%200%201%206.5%2010%203.5%203.5%200%200%201%2010%206.5zM10%208.3A1.8%201.8%200%200%200%208.3%2010%201.8%201.8%200%200%200%2010%2011.8%201.8%201.8%200%200%200%2011.8%2010%201.8%201.8%200%200%200%2010%208.3z%27%20%2F%3E%0D%0A%3C%2Fsvg%3E");
 }
 
-.mapboxgl-ctrl-icon.mapboxgl-ctrl-compass > div.arrow {
+.mapboxgl-ctrl-icon.mapboxgl-ctrl-compass > span.arrow {
     width: 20px;
     height: 20px;
     margin: 5px;
     background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%0A%09%3Cpolygon%20fill%3D%27%23333333%27%20points%3D%276%2C9%2010%2C1%2014%2C9%27%2F%3E%0A%09%3Cpolygon%20fill%3D%27%23CCCCCC%27%20points%3D%276%2C11%2010%2C19%2014%2C11%20%27%2F%3E%0A%3C%2Fsvg%3E");
     background-repeat: no-repeat;
+    display: inline-block;
 }
 
 .mapboxgl-ctrl.mapboxgl-ctrl-attrib {
     padding: 0 5px;
-    background-color: rgba(255,255,255,0.5);
+    background-color: rgba(255, 255, 255, .5);
     margin: 0;
 }
+.mapboxgl-ctrl-attrib.compact {
+    padding-top: 2px;
+    padding-bottom: 2px;
+    margin: 0 10px 10px 10px;
+    position: relative;
+    padding-right: 24px;
+    background-color: #fff;
+    border-radius: 3px 12px 12px 3px;
+    visibility: hidden;
+}
+.mapboxgl-ctrl-attrib.compact:hover {
+    visibility: visible;
+}
+.mapboxgl-ctrl-attrib.compact:after {
+    content: '';
+    cursor: pointer;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D%270%200%2020%2020%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%0D%0A%09%3Cpath%20fill%3D%27%23333333%27%20fill-rule%3D%27evenodd%27%20d%3D%27M4%2C10a6%2C6%200%201%2C0%2012%2C0a6%2C6%200%201%2C0%20-12%2C0%20M9%2C7a1%2C1%200%201%2C0%202%2C0a1%2C1%200%201%2C0%20-2%2C0%20M9%2C10a1%2C1%200%201%2C1%202%2C0l0%2C3a1%2C1%200%201%2C1%20-2%2C0%27%20%2F%3E%0D%0A%3C%2Fsvg%3E");
+    background-color: rgba(255, 255, 255, .5);
+    width: 24px;
+    height: 24px;
+    box-sizing: border-box;
+    visibility: visible;
+    border-radius: 12px;
+}
 .mapboxgl-ctrl-attrib a {
     color: rgba(0,0,0,0.75);
     text-decoration: none;
@@ -109,6 +140,16 @@
     margin-left: 2px;
 }
 
+.mapboxgl-ctrl-scale {
+    background-color: rgba(255,255,255,0.75);
+    font-size: 10px;
+    border-width: medium 2px 2px;
+    border-style: none solid solid;
+    border-color: #333;
+    padding: 0 5px;
+    color: #333;
+}
+
 .mapboxgl-popup {
     position: absolute;
     top: 0;
@@ -229,6 +270,13 @@
     border-bottom-right-radius: 0;
 }
 
+.mapboxgl-marker {
+    position: absolute;
+    top: 0;
+    left: 0;
+    will-change: transform;
+}
+
 .mapboxgl-crosshair,
 .mapboxgl-crosshair .mapboxgl-interactive,
 .mapboxgl-crosshair .mapboxgl-interactive:active {

public/templates/data.tmpl

@@ -2,17 +2,19 @@
 <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}}" />
+  <link rel="stylesheet" type="text/css" href="/mapbox-gl-inspect.css{{&key_query}}" />
   <script src="/mapbox-gl.js{{&key_query}}"></script>
+  <script src="/mapbox-gl-inspect.min.js{{&key_query}}"></script>
   <style>
-    body {background:#000;color:#ccc;}
+    body {background:#fff;color:#333;}
     #map {position:absolute;top:0;left:0;right:250px;bottom:0;}
     h1 {position:absolute;top:5px;right:0;width:240px;margin:0;line-height:20px;font-size:20px;}
     #layerList {position:absolute;top:35px;right:0;bottom:60%;width:240px;overflow:auto;}
     #layerList div div {width:15px;height:15px;display:inline-block;}
-    #propertyList {position:absolute;top:40%;bottom:0;right:0;width:240px;overflow:auto;color:#fff;}
   </style>
   {{/is_vector}}
   {{^is_vector}}
@@ -34,87 +36,37 @@
   <script>
   var map = new mapboxgl.Map({
     container: 'map',
-    hash: true
+    hash: true,
-  });
+    style: {
-  map.addControl(new mapboxgl.Navigation());
-
-  function generateColor(str) {
-    var rgb = [0, 0, 0];
-    for (var i = 0; i < str.length; i++) {
-        var v = str.charCodeAt(i);
-        rgb[v % 3] = (rgb[i % 3] + (13*(v%13))) % 12;
-    }
-    var r = 4 + rgb[0];
-    var g = 4 + rgb[1];
-    var b = 4 + rgb[2];
-    r = (r * 16) + r;
-    g = (g * 16) + g;
-    b = (b * 16) + b;
-    return [r, g, b, 1];
-  };
-
-  function initLayer(data) {
-    var layer;
-    var layerList = document.getElementById('layerList');
-    var layers_ = [];
-    data['vector_layers'].forEach(function(el) {
-      var color = generateColor(el['id']);
-      var colorText = 'rgba(' + color[0] + ',' + color[1] + ',' + color[2] + ',' + color[3] + ')';
-      layers_.push({
-        id: el['id'] + Math.random(),
-        source: 'vector_layer_',
-        'source-layer': el['id'],
-        interactive: true,
-        type: 'line',
-        paint: {'line-color': colorText}
-      });
-      var item = document.createElement('div');
-      item.innerHTML = '<div style="' +
-        'background:rgba(' + color[0] + ',' + color[1] + ',' + color[2] + ',1);' +
-        '"></div> ' + el['id'];
-      layerList.appendChild(item);
-    });
-    map.setStyle({
       version: 8,
       sources: {
         'vector_layer_': {
           type: 'vector',
-          tiles: data['tiles'],
+          url: '/data/{{id}}.json{{&key_query}}'
-          minzoom: data['minzoom'],
-          maxzoom: data['maxzoom']
         }
       },
-      layers: layers_
+      layers: []
-    });
-
-    return layer;
-  }
-
-  var xhttp = new XMLHttpRequest();
-  xhttp.onreadystatechange = function() {
-    if (xhttp.readyState == 4 && xhttp.status == 200) {
-      initLayer(xhttp.response);
     }
-  };
+  });
-  xhttp.responseType = 'json';
+  map.addControl(new mapboxgl.NavigationControl());
-  xhttp.open('GET', '/data/{{id}}.json{{&key_query}}', true);
+  var inspect = new MapboxInspect({
-  xhttp.send();
+    showInspectMap: true,
-
+    showInspectButton: false
-  var propertyList = document.getElementById('propertyList');
+  });
-  map.on('mousemove', function(e) {
+  map.addControl(inspect);
-    propertyList.innerHTML = '';
+  map.on('styledata', function() {
-    var width = 3, height = 3;
+    var layerList = document.getElementById('layerList');
-    var features = map.queryRenderedFeatures([
+    layerList.innerHTML = '';
-                     [e.point.x - width / 2, e.point.y - height / 2],
+    Object.keys(inspect.sources).forEach(function(sourceId) {
-                     [e.point.x + width / 2, e.point.y + height / 2]
+      var layerIds = inspect.sources[sourceId];
-                   ]);
+      layerIds.forEach(function(layerId) {
-    if (features) {
+        var item = document.createElement('div');
-      var html = '';
+        item.innerHTML = '<div style="' +
-      features.forEach(function(feature) {
+          'background:' + inspect.assignLayerColor(layerId) + ';' +
-        html += JSON.stringify(feature.properties, null, 2) + '\n';
+        '"></div> ' + layerId;
+        layerList.appendChild(item);
       });
-      propertyList.innerHTML = html;
+    })
-    }
   });
   </script>
   {{/is_vector}}
@@ -123,6 +75,10 @@
   <div id='map'></div>
   <script>
     var map = L.mapbox.map('map', '/data/{{id}}.json{{&key_query}}', { zoomControl: false });
+    map.eachLayer(function(layer) {
+      // do not add scale prefix even if retina display is detected
+      layer.scalePrefix = '.';
+    });
     new L.Control.Zoom({ position: 'topright' }).addTo(map);
     setTimeout(function() {
       new L.Hash(map);

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>
@@ -28,7 +29,7 @@
         style: '/styles/{{id}}.json{{&key_query}}',
         hash: true
       });
-      map.addControl(new mapboxgl.Navigation());
+      map.addControl(new mapboxgl.NavigationControl());
     } else {
       var map = L.mapbox.map('map', '/styles/{{id}}/rendered.json{{&key_query}}', { zoomControl: false });
       new L.Control.Zoom({ position: 'topright' }).addTo(map);

publish.js

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+
+'use strict';
+
+/*
+ * This script creates `tileserver-gl-light` version
+ * (without native dependencies) and publishes
+ * `tileserver-gl` and `tileserver-gl-light` to npm.
+ */
+
+/* CREATE tileserver-gl-light */
+
+// 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';
+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'];
+delete packageJson.dependencies['sharp'];
+
+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');
+fs.renameSync('light/Dockerfile_light', 'light/Dockerfile');
+
+/* PUBLISH */
+
+// tileserver-gl
+require('child_process').execSync('npm publish .', {
+  stdio: 'inherit'
+});
+
+// tileserver-gl-light
+require('child_process').execSync('npm publish light', {
+  stdio: 'inherit'
+});

run.sh

@@ -1,11 +1,3 @@
 #!/bin/bash
-if [ ! -f /data/config.json ]; then
+cd /data
-  echo "INFO: No config.json found! Downloading sample data..."
+xvfb-run -a -e /dev/stdout --server-args="-screen 0 1024x768x24" node /usr/src/app/ -p 80 "$@"
-  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/main.js

@@ -2,27 +2,194 @@
 
 'use strict';
 
+var fs = require('fs'),
+    path = require('path'),
+    request = require('request');
+
+var mbtiles = require('mbtiles');
+
+var packageJson = require('../package');
+
 var opts = require('nomnom')
+  .option('mbtiles', {
+    default: undefined,
+    help: 'MBTiles file (uses demo configuration);\n' +
+          '\t    ignored if the configuration file is also specified',
+    position: 0
+  })
   .option('config', {
     abbr: 'c',
     default: 'config.json',
     help: 'Configuration file'
   })
+  .option('bind', {
+    abbr: 'b',
+    default: undefined,
+    help: 'Bind address'
+  })
   .option('port', {
     abbr: 'p',
     default: 8080,
     help: 'Port'
   })
+  .option('verbose', {
+    abbr: 'V',
+    flag: true,
+    help: 'More verbose output'
+  })
   .option('version', {
     abbr: 'v',
     flag: true,
     help: 'Version info',
     callback: function() {
-      return 'version ' + require('../package.json').version;
+      return packageJson.name + ' v' + packageJson.version;
     }
   }).parse();
 
-return require('./server')({
+
-  config: opts.config,
+console.log('Starting ' + packageJson.name + ' v' + packageJson.version);
-  port: opts.port
+
+var startServer = function(configPath, config) {
+  return require('./server')({
+    configPath: configPath,
+    config: config,
+    bind: opts.bind,
+    port: opts.port
+  });
+};
+
+var startWithMBTiles = function(mbtilesFile) {
+  console.log('Automatically creating config file for ' + mbtilesFile);
+
+  mbtilesFile = path.resolve(process.cwd(), mbtilesFile);
+
+  var mbtilesStats = fs.statSync(mbtilesFile);
+  if (!mbtilesStats.isFile() || mbtilesStats.size === 0) {
+    console.log('ERROR: Not valid MBTiles file: ' + mbtilesFile);
+    process.exit(1);
+  }
+  var instance = new mbtiles(mbtilesFile, function(err) {
+    instance.getInfo(function(err, info) {
+      var bounds = info.bounds;
+
+      var styleDir = path.resolve(__dirname, "../node_modules/tileserver-gl-styles/");
+
+      var config = {
+        "options": {
+          "paths": {
+            "root": styleDir,
+            "fonts": "fonts",
+            "styles": "styles",
+            "mbtiles": path.dirname(mbtilesFile)
+          }
+        },
+        "styles": {},
+        "data": {}
+      };
+
+      if (info.format == 'pbf' &&
+          info.name.toLowerCase().indexOf('openmaptiles') > -1) {
+        config['data']['openmaptiles'] = {
+          "mbtiles": path.basename(mbtilesFile)
+        };
+
+        var omtV = (info.version || '').split('.');
+
+        var styles = fs.readdirSync(path.resolve(styleDir, 'styles'));
+        for (var i = 0; i < styles.length; i++) {
+          var styleName = styles[i];
+          var styleFileRel = styleName + '/style.json';
+          var styleFile = path.resolve(styleDir, 'styles', styleFileRel);
+          if (fs.existsSync(styleFile)) {
+            var styleJSON = require(styleFile);
+            var omtVersionCompatibility =
+              ((styleJSON || {}).metadata || {})['openmaptiles:version'] || 'x';
+            var m = omtVersionCompatibility.toLowerCase().split('.');
+
+            var isCompatible = !(
+              m[0] != 'x' && (
+                m[0] != omtV[0] || (
+                  (m[1] || 'x') != 'x' && (
+                    m[1] != omtV[1] || (
+                      (m[2] || 'x') != 'x' &&
+                      m[2] != omtV[2]
+                    )
+                  )
+                )
+              )
+            );
+
+            if (isCompatible) {
+              var styleObject = {
+                "style": styleFileRel,
+                "tilejson": {
+                  "bounds": bounds
+                }
+              };
+              config['styles'][styleName] = styleObject;
+            } else {
+              console.log('Style', styleName, 'requires OpenMapTiles version',
+              omtVersionCompatibility, 'but mbtiles is version', info.version);
+            }
+          }
+        }
+      } else {
+        console.log('WARN: MBTiles not in "openmaptiles" format. ' +
+                    'Serving raw data only...');
+        config['data'][(info.id || 'mbtiles')
+                           .replace(/\//g, '_')
+                           .replace(/\:/g, '_')
+                           .replace(/\?/g, '_')] = {
+          "mbtiles": path.basename(mbtilesFile)
+        };
+      }
+
+      if (opts.verbose) {
+        console.log(JSON.stringify(config, undefined, 2));
+      } else {
+        console.log('Run with --verbose to see the config file here.');
+      }
+
+      return startServer(null, config);
+    });
+  });
+};
+
+fs.stat(path.resolve(opts.config), function(err, stats) {
+  if (err || !stats.isFile() || stats.size === 0) {
+    var mbtiles = opts.mbtiles;
+    if (!mbtiles) {
+      // try to find in the cwd
+      var files = fs.readdirSync(process.cwd());
+      for (var i=0; i < files.length; i++) {
+        var filename = files[i];
+        if (filename.endsWith('.mbtiles')) {
+          var mbTilesStats = fs.statSync(filename);
+          if (mbTilesStats.isFile() && mbTilesStats.size > 0) {
+            mbtiles = filename;
+            break;
+          }
+        }
+      }
+      if (mbtiles) {
+        console.log('No MBTiles specified, using ' + mbtiles);
+        return startWithMBTiles(mbtiles);
+      } else {
+        var url = 'https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles';
+        var filename = 'zurich_switzerland.mbtiles';
+        var stream = fs.createWriteStream(filename);
+        console.log('Downloading sample data (' + filename + ') from ' + url);
+        stream.on('finish', function() {
+          return startWithMBTiles(filename);
+        });
+        return request.get(url).pipe(stream);
+      }
+    }
+    if (mbtiles) {
+      return startWithMBTiles(mbtiles);
+    }
+  } else {
+    console.log('Using specified config file from ' + opts.config);
+    return startServer(opts.config, null);
+  }
 });

src/serve_data.js

@@ -1,24 +1,38 @@
 'use strict';
 
 var fs = require('fs'),
-    path = require('path');
+    path = require('path'),
+    zlib = require('zlib');
 
 var clone = require('clone'),
     express = require('express'),
-    mbtiles = require('mbtiles');
+    mbtiles = require('mbtiles'),
+    pbf = require('pbf'),
+    VectorTile = require('vector-tile').VectorTile;
+
+var tileshrinkGl;
+try {
+  tileshrinkGl = require('tileshrink-gl');
+} catch (e) {}
 
 var utils = require('./utils');
 
-module.exports = function(options, repo, params, id) {
+module.exports = function(options, repo, params, id, styles) {
   var app = express().disable('x-powered-by');
 
-  var mbtilesFile = path.join(options.paths.mbtiles, params.mbtiles);
+  var mbtilesFile = path.resolve(options.paths.mbtiles, params.mbtiles);
   var tileJSON = {
     'tiles': params.domains || options.domains
   };
 
+  var shrinkers = {};
+
   repo[id] = tileJSON;
 
+  var mbtilesFileStats = fs.statSync(mbtilesFile);
+  if (!mbtilesFileStats.isFile() || mbtilesFileStats.size == 0) {
+    throw Error('Not valid MBTiles file: ' + mbtilesFile);
+  }
   var source = new mbtiles(mbtilesFile, function(err) {
     source.getInfo(function(err, info) {
       tileJSON['name'] = id;
@@ -27,8 +41,8 @@ module.exports = function(options, repo, params, id) {
       Object.assign(tileJSON, info);
 
       tileJSON['tilejson'] = '2.0.0';
-      tileJSON['basename'] = id;
+      delete tileJSON['filesize'];
-      tileJSON['filesize'] = fs.statSync(mbtilesFile)['size'];
+      delete tileJSON['mtime'];
       delete tileJSON['scheme'];
 
       Object.assign(tileJSON, params.tilejson || {});
@@ -42,7 +56,8 @@ module.exports = function(options, repo, params, id) {
     var z = req.params.z | 0,
         x = req.params.x | 0,
         y = req.params.y | 0;
-    if (req.params.format != tileJSON.format) {
+    if (req.params.format != tileJSON.format &&
+        !(req.params.format == 'geojson' && tileJSON.format == 'pbf')) {
       return res.status(404).send('Invalid format');
     }
     if (z < tileJSON.minzoom || 0 || x < 0 || y < 0 ||
@@ -58,16 +73,74 @@ module.exports = function(options, repo, params, id) {
           return res.status(500).send(err.message);
         }
       } else {
-        if (tileJSON['format'] == 'pbf') {
-          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) {
           return res.status(404).send('Not found');
         } else {
+          if (tileJSON['format'] == 'pbf') {
+            var isGzipped = data.slice(0,2).indexOf(
+                new Buffer([0x1f, 0x8b])) === 0;
+            var style = req.query.style;
+            if (style && tileshrinkGl) {
+              if (!shrinkers[style]) {
+                var styleJSON = styles[style];
+                if (styleJSON) {
+                  var sourceName = null;
+                  for (var sourceName_ in styleJSON.sources) {
+                    var source = styleJSON.sources[sourceName_];
+                    if (source &&
+                        source.type == 'vector' &&
+                        source.url.endsWith('/' + id + '.json')) {
+                      sourceName = sourceName_;
+                    }
+                  }
+                  shrinkers[style] = tileshrinkGl.createPBFShrinker(styleJSON, sourceName);
+                }
+              }
+              if (shrinkers[style]) {
+                if (isGzipped) {
+                  data = zlib.unzipSync(data);
+                  isGzipped = false;
+                }
+                data = shrinkers[style](data, z, tileJSON.maxzoom);
+                //console.log(shrinkers[style].getStats());
+              }
+            }
+          }
+          if (req.params.format == 'pbf') {
+            headers['Content-Type'] = 'application/x-protobuf';
+          } else if (req.params.format == 'geojson') {
+            headers['Content-Type'] = 'application/json';
+
+            if (isGzipped) {
+              data = zlib.unzipSync(data);
+              isGzipped = false;
+            }
+
+            var tile = new VectorTile(new pbf(data));
+            var geojson = {
+              "type": "FeatureCollection",
+              "features": []
+            };
+            for (var layerName in tile.layers) {
+              var layer = tile.layers[layerName];
+              for (var i = 0; i < layer.length; i++) {
+                var feature = layer.feature(i);
+                var featureGeoJSON = feature.toGeoJSON(x, y, z);
+                featureGeoJSON.properties.layer = layerName;
+                geojson.features.push(featureGeoJSON);
+              }
+            }
+            data = JSON.stringify(geojson);
+          }
+          delete headers['ETag']; // do not trust the tile ETag -- regenerate
+          headers['Content-Encoding'] = 'gzip';
+          res.set(headers);
+
+          if (!isGzipped) {
+            data = zlib.gzipSync(data);
+            isGzipped = true;
+          }
+
           return res.status(200).send(data);
         }
       }

src/serve_font.js

@@ -1,60 +1,59 @@
 'use strict';
 
-var async = require('async'),
-    path = require('path'),
-    fs = require('fs');
-
 var clone = require('clone'),
-    express = require('express');
+    express = require('express'),
+    fs = require('fs'),
+    path = require('path');
 
+var utils = require('./utils');
 
 module.exports = function(options, allowedFonts) {
   var app = express().disable('x-powered-by');
 
+  var lastModified = new Date().toUTCString();
+
   var fontPath = options.paths.fonts;
 
-  var getFontPbf = function(name, range, callback) {
+  var existingFonts = {};
-    // if some of the files failed to load (does not exist or not allowed),
+  fs.readdir(options.paths.fonts, function(err, files) {
-    // return empty buffer so the other fonts can still work
+    files.forEach(function(file) {
-    if (allowedFonts[name]) {
+      fs.stat(path.join(fontPath, file), function(err, stats) {
-      var filename = path.join(fontPath, name, range + '.pbf');
+        if (!err) {
-      return fs.readFile(filename, function(err, data) {
+          if (stats.isDirectory() &&
-        if (err) {
+              fs.existsSync(path.join(fontPath, file, '0-255.pbf'))) {
-          console.log('Font load error:', filename);
+            existingFonts[path.basename(file)] = true;
-          return callback(null, new Buffer([]));
+          }
-        } else {
-          return callback(null, data);
         }
       });
-    } else {
+    });
-      return callback(null, new Buffer([]));
+  });
-    }
-  };
 
-  app.get('/:fontstack/:range([\\d]+-[\\d]+).pbf',
+  app.get('/fonts/: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(options.serveAllFonts ? null : allowedFonts,
-
+      fontPath, fontstack, range, existingFonts,
-    var queue = [];
+        function(err, concated) {
-    fonts.forEach(function(font) {
+      if (err || concated.length === 0) {
-      queue.push(function(callback) {
+        console.log(err);
-        getFontPbf(font, range, callback);
+        console.log(concated.length);
-      });
-    });
-
-    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);
       }
     });
   });
 
+  app.get('/fontstacks.json', function(req, res, next) {
+    res.header('Content-type', 'application/json');
+    return res.send(
+      Object.keys(options.serveAllFonts ? existingFonts : allowedFonts).sort()
+    );
+  });
+
   return app;
 };

src/serve_rendered.js

@@ -15,15 +15,16 @@ var Canvas = require('canvas'),
     clone = require('clone'),
     Color = require('color'),
     express = require('express'),
-    mercator = new (require('sphericalmercator'))(),
+    mercator = new (require('@mapbox/sphericalmercator'))(),
     mbgl = require('mapbox-gl-native'),
     mbtiles = require('mbtiles'),
+    pngquant = require('node-pngquant-native'),
     request = require('request');
 
 var utils = require('./utils');
 
 var FLOAT_PATTERN = '[+-]?(?:\\d+|\\d+\.?\\d+)';
-var SCALE_PATTERN = '@[23]x';
+var SCALE_PATTERN = '@[234]x';
 
 var getScale = function(scale) {
   return (scale || '@1x').slice(1, 2) | 0;
@@ -35,9 +36,11 @@ mbgl.on('message', function(e) {
   }
 });
 
-module.exports = function(options, repo, params, id) {
+module.exports = function(options, repo, params, id, dataResolver) {
   var app = express().disable('x-powered-by');
 
+  var lastModified = new Date().toUTCString();
+
   var rootPath = options.paths.root;
 
   var styleFile = params.style;
@@ -46,6 +49,19 @@ module.exports = function(options, repo, params, id) {
     sources: {}
   };
 
+  var existingFonts = {};
+  fs.readdir(options.paths.fonts, function(err, files) {
+    files.forEach(function(file) {
+      fs.stat(path.join(options.paths.fonts, file), function(err, stats) {
+        if (!err) {
+          if (stats.isDirectory()) {
+            existingFonts[path.basename(file)] = true;
+          }
+        }
+      });
+    });
+  });
+
   var styleJSON;
   var createPool = function(ratio, min, max) {
     var createRenderer = function(ratio, createCallback) {
@@ -54,12 +70,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, existingFonts,
+                function(err, concated) {
+              callback(err, {data: concated});
+            });
           } else if (protocol == 'mbtiles') {
             var parts = req.url.split('/');
             var source = map.sources[parts[2]];
@@ -133,15 +157,24 @@ module.exports = function(options, repo, params, id) {
     });
   };
 
-  styleJSON = clone(require(path.join(options.paths.styles, styleFile)));
+  var styleJSONPath = path.join(options.paths.styles, styleFile);
-  styleJSON.sprite = 'sprites://' + path.basename(styleFile, '.json');
+  styleJSON = clone(require(styleJSONPath));
-  styleJSON.glyphs = 'fonts://{fontstack}/{range}.pbf';
+
+  var httpTester = /^(http(s)?:)?\/\//;
+  if (styleJSON.sprite && !httpTester.test(styleJSON.sprite)) {
+    styleJSON.sprite = 'sprites://' +
+        styleJSON.sprite
+            .replace('{style}', path.basename(styleFile, '.json'))
+            .replace('{styleJsonFolder}', path.relative(options.paths.sprites, path.dirname(styleJSONPath)));
+  }
+  if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) {
+    styleJSON.glyphs = 'fonts://' + styleJSON.glyphs;
+  }
 
   var tileJSON = {
     'tilejson': '2.0.0',
     'name': styleJSON.name,
     'attribution': '',
-    'basename': id,
     'minzoom': 0,
     'maxzoom': 20,
     'bounds': [-180, -85.0511, 180, 85.0511],
@@ -157,36 +190,58 @@ module.exports = function(options, repo, params, id) {
   Object.keys(styleJSON.sources).forEach(function(name) {
     var source = styleJSON.sources[name];
     var url = source.url;
-    if (url.lastIndexOf('mbtiles:', 0) === 0) {
+
+    if (url && url.lastIndexOf('mbtiles:', 0) === 0) {
       // found mbtiles source, replace with info from local file
       delete source.url;
 
+      var mbtilesFile = url.substring('mbtiles://'.length);
+      var fromData = mbtilesFile[0] == '{' &&
+                     mbtilesFile[mbtilesFile.length - 1] == '}';
+
+      if (fromData) {
+        mbtilesFile = dataResolver(
+          mbtilesFile.substr(1, mbtilesFile.length - 2));
+        if (!mbtilesFile) {
+          console.log('ERROR: data "' + mbtilesFile + '" not found!');
+          process.exit(1);
+        }
+      }
+
       queue.push(function(callback) {
-        var mbtilesFile = url.substring('mbtiles://'.length);
+        mbtilesFile = path.resolve(options.paths.mbtiles, mbtilesFile);
-        map.sources[name] = new mbtiles(
+        var mbtilesFileStats = fs.statSync(mbtilesFile);
-          path.join(options.paths.mbtiles, mbtilesFile), function(err) {
+        if (!mbtilesFileStats.isFile() || mbtilesFileStats.size == 0) {
+          throw Error('Not valid MBTiles file: ' + mbtilesFile);
+        }
+        map.sources[name] = new mbtiles(mbtilesFile, function(err) {
           map.sources[name].getInfo(function(err, info) {
+            if (err) {
+              console.error(err);
+            }
             var type = source.type;
             Object.assign(source, info);
             source.type = type;
-            source.basename = name;
             source.tiles = [
               // meta url which will be detected when requested
               'mbtiles://' + name + '/{z}/{x}/{y}.' + (info.format || 'pbf')
             ];
+            delete source.scheme;
             if (source.format == 'pbf') {
               map.sources[name].emptyTile = new Buffer(0);
             } else {
-              var color = new Color(source.color || '#fff');
+              var color = new Color(source.color || 'rgba(255,255,255,0)');
               var format = source.format;
               if (format == 'jpg') {
                 format = 'jpeg';
               }
-              sharp(new Buffer(color.rgbArray()), {
+              var array = color.array();
+              var channels = array.length == 4 && format != 'jpeg' ? 4 : 3;
+              sharp(new Buffer(array), {
                 raw: {
                   width: 1,
                   height: 1,
-                  channels: 3
+                  channels: channels
                 }
               }).toFormat(format).toBuffer(function(err, buffer, info) {
                 map.sources[name].emptyTile = buffer;
@@ -211,6 +266,7 @@ module.exports = function(options, repo, params, id) {
     map.renderers[1] = createPool(1, 4, 16);
     map.renderers[2] = createPool(2, 2, 8);
     map.renderers[3] = createPool(3, 2, 4);
+    map.renderers[4] = createPool(4, 2, 4);
   });
 
   repo[id] = tileJSON;
@@ -225,7 +281,7 @@ module.exports = function(options, repo, params, id) {
       return res.status(400).send('Invalid center');
     }
     if (Math.min(width, height) <= 0 ||
-        Math.max(width, height) * scale > 2048) {
+        Math.max(width, height) * scale > (options.maxSize || 2048)) {
       return res.status(400).send('Invalid size');
     }
     if (format == 'png' || format == 'webp') {
@@ -273,22 +329,32 @@ module.exports = function(options, repo, params, id) {
 
         image.toFormat(format);
 
-        var formatEncoding = (params.formatEncoding || {})[format] ||
+        var formatQuality = (params.formatQuality || {})[format] ||
-                             (options.formatEncoding || {})[format];
+                            (options.formatQuality || {})[format];
         if (format == 'png') {
-          image.compressionLevel(formatEncoding || 6)
+          image.withoutAdaptiveFiltering();
-               .withoutAdaptiveFiltering();
         } else if (format == 'jpeg') {
-          image.quality(formatEncoding || 80);
+          image.quality(formatQuality || 80);
         } else if (format == 'webp') {
-          image.quality(formatEncoding || 90);
+          image.quality(formatQuality || 90);
         }
         image.toBuffer(function(err, buffer, info) {
           if (!buffer) {
             return res.status(404).send('Not found');
           }
 
+          if (format == 'png') {
+            var usePngQuant =
+                (options.formatQuality || {}).pngQuantization === true;
+            if (usePngQuant) {
+              buffer = pngquant.compress(buffer, {
+                quality: [0, formatQuality || 90]
+              });
+            }
+          }
+
           res.set({
+            'Last-Modified': lastModified,
             'Content-Type': 'image/' + format
           });
           return res.status(200).send(buffer);
@@ -298,6 +364,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,
@@ -385,30 +458,33 @@ module.exports = function(options, repo, params, id) {
 
     var minCorner = mercator.px([bbox[0], bbox[3]], z),
         maxCorner = mercator.px([bbox[2], bbox[1]], z);
-    while ((((maxCorner[0] - minCorner[0]) * (1 + 2 * padding) > w) ||
+    var w_ = w / (1 + 2 * padding);
-            ((maxCorner[1] - minCorner[1]) * (1 + 2 * padding) > h)) && z > 0) {
+    var h_ = h / (1 + 2 * padding);
-      z--;
+
-      minCorner[0] /= 2;
+    z -= Math.max(
-      minCorner[1] /= 2;
+      Math.log((maxCorner[0] - minCorner[0]) / w_),
-      maxCorner[0] /= 2;
+      Math.log((maxCorner[1] - minCorner[1]) / h_)
-      maxCorner[1] /= 2;
+    ) / Math.LN2;
-    }
+
+    z = Math.max(Math.log(Math.max(w, h) / 256) / Math.LN2, Math.min(25, z));
 
     return z;
   };
 
   var staticPattern =
-      '/static/%s/:width(\\d+)x:height(\\d+)' +
+      '/static/:raw(raw)?/%s/:width(\\d+)x:height(\\d+)' +
       ':scale(' + SCALE_PATTERN + ')?\.:format([\\w]+)';
 
   var centerPattern =
-      util.format(':lon(%s),:lat(%s),:z(\\d+)(@:bearing(%s)(,:pitch(%s))?)?',
+      util.format(':x(%s),:y(%s),:z(%s)(@:bearing(%s)(,:pitch(%s))?)?',
-                  FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN);
+                  FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN,
+                  FLOAT_PATTERN, FLOAT_PATTERN);
 
   app.get(util.format(staticPattern, centerPattern), function(req, res, next) {
-    var z = req.params.z | 0,
+    var raw = req.params.raw;
-        x = +req.params.lon,
+    var z = +req.params.z,
-        y = +req.params.lat,
+        x = +req.params.x,
+        y = +req.params.y,
         bearing = +(req.params.bearing || '0'),
         pitch = +(req.params.pitch || '0'),
         w = req.params.width | 0,
@@ -416,6 +492,16 @@ module.exports = function(options, repo, params, id) {
         scale = getScale(req.params.scale),
         format = req.params.format;
 
+    if (z < 0) {
+      return res.status(404).send('Invalid zoom');
+    }
+
+    if (raw) {
+      var ll = mercator.inverse([x, y]);
+      x = ll[0];
+      y = ll[1];
+    }
+
     var path = extractPathFromQuery(req.query);
     var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
                                 path, req.query);
@@ -429,8 +515,19 @@ module.exports = function(options, repo, params, id) {
                   FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN);
 
   app.get(util.format(staticPattern, boundsPattern), function(req, res, next) {
+    var raw = req.params.raw;
     var bbox = [+req.params.minx, +req.params.miny,
                 +req.params.maxx, +req.params.maxy];
+
+    if (raw) {
+      var minCorner = mercator.inverse(bbox.slice(0, 2));
+      var maxCorner = mercator.inverse(bbox.slice(2));
+      bbox[0] = minCorner[0];
+      bbox[1] = minCorner[1];
+      bbox[2] = maxCorner[0];
+      bbox[3] = maxCorner[1];
+    }
+
     var w = req.params.width | 0,
         h = req.params.height | 0,
         scale = getScale(req.params.scale),
@@ -457,6 +554,7 @@ module.exports = function(options, repo, params, id) {
       return res.status(400).send('Invalid path');
     }
 
+    var raw = req.params.raw;
     var w = req.params.width | 0,
         h = req.params.height | 0,
         bearing = 0,
@@ -476,6 +574,12 @@ module.exports = function(options, repo, params, id) {
         x = (bbox[0] + bbox[2]) / 2,
         y = (bbox[1] + bbox[3]) / 2;
 
+    if (raw) {
+      var ll = mercator.inverse([x, y]);
+      x = ll[0];
+      y = ll[1];
+    }
+
     var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
                                 path, req.query);
 

src/serve_style.js

@@ -16,40 +16,60 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
   Object.keys(styleJSON.sources).forEach(function(name) {
     var source = styleJSON.sources[name];
     var url = source.url;
-    if (url.lastIndexOf('mbtiles:', 0) === 0) {
+    if (url && url.lastIndexOf('mbtiles:', 0) === 0) {
-      var mbtiles = url.substring('mbtiles://'.length);
+      var mbtilesFile = url.substring('mbtiles://'.length);
-      var identifier = reportTiles(mbtiles);
+      var fromData = mbtilesFile[0] == '{' &&
+                     mbtilesFile[mbtilesFile.length - 1] == '}';
+
+      if (fromData) {
+        mbtilesFile = mbtilesFile.substr(1, mbtilesFile.length - 2);
+      }
+      var identifier = reportTiles(mbtilesFile, fromData);
       source.url = 'local://data/' + identifier + '.json';
     }
   });
 
-  var findFontReferences = function(obj) {
+  styleJSON.layers.forEach(function(obj) {
-    Object.keys(obj).forEach(function(key) {
+    if (obj['type'] == 'symbol') {
-      var value = obj[key];
+      var fonts = (obj['layout'] || {})['text-font'];
-      if (key == 'text-font') {
+      if (fonts && fonts.length) {
-        if (value && value.length > 0) {
+        fonts.forEach(reportFont);
-          value.forEach(reportFont);
+      } else {
-        }
+        reportFont('Open Sans Regular');
-      } else if (value && typeof value == 'object') {
+        reportFont('Arial Unicode MS Regular');
-        findFontReferences(value);
       }
-    });
+    }
-  };
+  });
-  styleJSON.layers.forEach(findFontReferences);
 
-  var spritePath = path.join(options.paths.sprites,
+  var spritePath;
-                             path.basename(styleFile, '.json'));
 
-  styleJSON.sprite = 'local://styles/' + id + '/sprite';
+  var httpTester = /^(http(s)?:)?\/\//;
-  styleJSON.glyphs = 'local://fonts/{fontstack}/{range}.pbf';
+  if (styleJSON.sprite && !httpTester.test(styleJSON.sprite)) {
+    spritePath = path.join(options.paths.sprites,
+        styleJSON.sprite
+            .replace('{style}', path.basename(styleFile, '.json'))
+            .replace('{styleJsonFolder}', path.relative(options.paths.sprites, path.dirname(styleFile)))
+            );
+    styleJSON.sprite = 'local://styles/' + id + '/sprite';
+  }
+  if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) {
+    styleJSON.glyphs = 'local://fonts/{fontstack}/{range}.pbf';
+  }
 
   repo[id] = styleJSON;
 
   app.get('/' + id + '.json', function(req, res, next) {
-    var fixUrl = function(url, opt_nokey) {
+    var fixUrl = function(url, opt_nokey, opt_nostyle) {
-      var query = '';
+      var queryParams = [];
+      if (!opt_nostyle) {
+        queryParams.push('style=' + id);
+      }
       if (!opt_nokey && req.query.key) {
-        query = '?key=' + req.query.key;
+        queryParams.unshift('key=' + req.query.key);
+      }
+      var query = '';
+      if (queryParams.length) {
+        query = '?' + queryParams.join('&');
       }
       return url.replace(
           'local://', req.protocol + '://' + req.headers.host + '/') + query;
@@ -61,13 +81,20 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
       source.url = fixUrl(source.url);
     });
     // mapbox-gl-js viewer cannot handle sprite urls with query
-    styleJSON_.sprite = fixUrl(styleJSON_.sprite, true);
+    if (styleJSON_.sprite) {
-    styleJSON_.glyphs = fixUrl(styleJSON_.glyphs);
+      styleJSON_.sprite = fixUrl(styleJSON_.sprite, true, true);
+    }
+    if (styleJSON_.glyphs) {
+      styleJSON_.glyphs = fixUrl(styleJSON_.glyphs, false, true);
+    }
     return res.send(styleJSON_);
   });
 
   app.get('/' + id + '/sprite:scale(@[23]x)?\.:format([\\w]+)',
       function(req, res, next) {
+    if (!spritePath) {
+      return res.status(404).send('File not found');
+    }
     var scale = req.params.scale,
         format = req.params.format;
     var filename = spritePath + (scale || '') + '.' + format;

src/server.js

@@ -12,28 +12,31 @@ var base64url = require('base64url'),
     cors = require('cors'),
     express = require('express'),
     handlebars = require('handlebars'),
-    mercator = new (require('sphericalmercator'))(),
+    mercator = new (require('@mapbox/sphericalmercator'))(),
     morgan = require('morgan');
 
 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');
 
+var isLight = packageJson.name.slice(-6) == '-light';
+if (!isLight) {
+  // 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 server');
 
   var app = express().disable('x-powered-by'),
       serving = {
         styles: {},
         rendered: {},
         data: {},
-        fonts: { // default fonts, always expose these (if they exist)
+        fonts: {}
-          'Open Sans Regular': true,
-          'Arial Unicode MS Regular': true
-        }
       };
 
   app.enable('trust proxy');
@@ -45,21 +48,29 @@ module.exports = function(opts, callback) {
     app.use(morgan('dev'));
   }
 
-  var configPath = path.resolve(opts.config);
+  var config = opts.config || null;
-
+  var configPath = null;
-  var config;
+  if (opts.configPath) {
-  try {
+    configPath = path.resolve(opts.configPath);
-    config = clone(require(configPath));
+    try {
-  } catch (e) {
+      config = clone(require(configPath));
-    console.log('ERROR: Config file not found or invalid!');
+    } catch (e) {
-    console.log('       See README.md for instructions and sample data.');
+      console.log('ERROR: Config file not found or invalid!');
+      console.log('       See README.md for instructions and sample data.');
+      process.exit(1);
+    }
+  }
+  if (!config) {
+    console.log('ERROR: No config file not specified!');
     process.exit(1);
   }
 
   var options = config.options || {};
   var paths = options.paths || {};
   options.paths = paths;
-  paths.root = path.resolve(process.cwd(), paths.root || '');
+  paths.root = path.resolve(
+    configPath ? path.dirname(configPath) : process.cwd(),
+    paths.root || '');
   paths.styles = path.resolve(paths.root, paths.styles || '');
   paths.fonts = path.resolve(paths.root, paths.fonts || '');
   paths.sprites = path.resolve(paths.root, paths.sprites || '');
@@ -78,15 +89,24 @@ module.exports = function(opts, callback) {
 
     if (item.serve_data !== false) {
       app.use('/styles/', serve_style(options, serving.styles, item, id,
-        function(mbtiles) {
+        function(mbtiles, fromData) {
           var dataItemId;
           Object.keys(data).forEach(function(id) {
-            if (data[id].mbtiles == mbtiles) {
+            if (fromData) {
-              dataItemId = id;
+              if (id == mbtiles) {
+                dataItemId = id;
+              }
+            } else {
+              if (data[id].mbtiles == mbtiles) {
+                dataItemId = id;
+              }
             }
           });
           if (dataItemId) { // mbtiles exist in the data config
             return dataItemId;
+          } else if (fromData) {
+            console.log('ERROR: data "' + mbtiles + '" not found!');
+            process.exit(1);
           } else {
             var id = mbtiles.substr(0, mbtiles.lastIndexOf('.')) || mbtiles;
             while (data[id]) id += '_';
@@ -100,15 +120,25 @@ 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,
+        function(mbtiles) {
+          var mbtilesFile;
+          Object.keys(data).forEach(function(id) {
+            if (id == mbtiles) {
+              mbtilesFile = data[id].mbtiles;
+            }
+          });
+          return mbtilesFile;
+        }));
+      } else {
+        item.serve_rendered = false;
+      }
     }
   });
 
-  if (Object.keys(serving.styles).length > 0) {
+  app.use('/', serve_font(options, serving.fonts));
-    // serve fonts only if serving some styles
-    app.use('/fonts/', serve_font(options, serving.fonts));
-  }
 
   Object.keys(data).forEach(function(id) {
     var item = data[id];
@@ -117,7 +147,7 @@ module.exports = function(opts, callback) {
       return;
     }
 
-    app.use('/data/', serve_data(options, serving.data, item, id));
+    app.use('/data/', serve_data(options, serving.data, item, id, serving.styles));
   });
 
   app.get('/styles.json', function(req, res, next) {
@@ -139,8 +169,13 @@ module.exports = function(opts, callback) {
   var addTileJSONs = function(arr, req, type) {
     Object.keys(serving[type]).forEach(function(id) {
       var info = clone(serving[type][id]);
-      info.tiles = utils.getTileUrls(req, info.tiles,
+      var path = '';
-                                     type + '/' + id, info.format);
+      if (type == 'rendered') {
+        path = 'styles/' + id + '/rendered';
+      } else {
+        path = type + '/' + id;
+      }
+      info.tiles = utils.getTileUrls(req, info.tiles, path, info.format);
       arr.push(info);
     });
     return arr;
@@ -176,7 +211,8 @@ 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['is_light'] = isLight;
         data['key_query_part'] =
             req.query.key ? 'key=' + req.query.key + '&' : '';
         data['key_query'] = req.query.key ? '?key=' + req.query.key : '';
@@ -209,6 +245,11 @@ module.exports = function(opts, callback) {
         style.wmts_link = 'http://wmts.maptiler.com/' +
           base64url('http://' + req.headers.host +
             '/styles/' + id + '/rendered.json' + query) + '/wmts';
+
+        var tiles = utils.getTileUrls(
+            req, style.serving_rendered.tiles,
+            'styles/' + id + '/rendered', style.serving_rendered.format);
+        style.xyz_link = tiles[0];
       }
     });
     var data = clone(serving.data || {});
@@ -233,6 +274,10 @@ module.exports = function(opts, callback) {
         data_.wmts_link = 'http://wmts.maptiler.com/' +
           base64url('http://' + req.headers.host +
             '/data/' + id + '.json' + query) + '/wmts';
+
+        var tiles = utils.getTileUrls(
+            req, data_.tiles, 'data/' + id, data_.format);
+        data_.xyz_link = tiles[0];
       }
       if (data_.filesize) {
         var suffix = 'kB';
@@ -284,13 +329,17 @@ module.exports = function(opts, callback) {
     return data;
   });
 
-  var server = app.listen(process.env.PORT || opts.port, function() {
+  var server = app.listen(process.env.PORT || opts.port, process.env.BIND || opts.bind, function() {
     console.log('Listening at http://%s:%d/',
                 this.address().address, this.address().port);
 
     return callback();
   });
 
+  process.on('SIGINT', function() {
+      process.exit();
+  });
+
   setTimeout(callback, 1000);
   return {
     app: app,

src/utils.js

@@ -1,5 +1,12 @@
 'use strict';
 
+var async = require('async'),
+    path = require('path'),
+    fs = require('fs');
+
+var clone = require('clone'),
+    glyphCompose = require('glyph-pbf-composite');
+
 module.exports.getTileUrls = function(req, domains, path, format) {
 
   if (domains) {
@@ -12,7 +19,14 @@ module.exports.getTileUrls = function(req, domains, path, format) {
   }
 
   var key = req.query.key;
-  var query = (key && key.length > 0) ? ('?key=' + key) : '';
+  var queryParams = [];
+  if (req.query.key) {
+    queryParams.push('key=' + req.query.key);
+  }
+  if (req.query.style) {
+    queryParams.push('style=' + req.query.style);
+  }
+  var query = queryParams.length > 0 ? ('?' + queryParams.join('&')) : '';
 
   var uris = [];
   domains.forEach(function(domain) {
@@ -37,3 +51,48 @@ module.exports.fixTileJSONCenter = function(tileJSON) {
     ];
   }
 };
+
+module.exports.getFontsPbf = function(allowedFonts, fontPath, names, range, fallbacks, callback) {
+  var getFontPbf = function(allowedFonts, name, range, callback, fallbacks) {
+    if (!allowedFonts || (allowedFonts[name] && fallbacks)) {
+      var filename = path.join(fontPath, name, range + '.pbf');
+      if (!fallbacks) {
+        fallbacks = clone(allowedFonts || {});
+      }
+      delete fallbacks[name];
+      return fs.readFile(filename, function(err, data) {
+        if (err) {
+          console.error('ERROR: Font not found:', name);
+          if (fallbacks && Object.keys(fallbacks).length) {
+            var fallbackName = Object.keys(fallbacks)[0];
+            console.error('ERROR: Trying to use', fallbackName, 'as a fallback');
+            delete fallbacks[fallbackName];
+            return getFontPbf(null, fallbackName, range, callback, fallbacks);
+          } else {
+            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(allowedFonts, font, range, callback, clone(allowedFonts || fallbacks));
+    });
+  });
+
+  return async.parallel(queue, function(err, results) {
+    if (err) {
+      callback(err, new Buffer([]));
+    } else {
+      callback(err, glyphCompose.combine(results));
+    }
+  });
+};

test/metadata.js

@@ -18,7 +18,7 @@ var testTileJSONArray = function(url) {
   });
 };
 
-var testTileJSON = function(url, basename) {
+var testTileJSON = function(url) {
   describe(url + ' is TileJSON', function() {
     it('is json', function(done) {
       supertest(app)
@@ -27,11 +27,10 @@ var testTileJSON = function(url, basename) {
         .expect('Content-Type', /application\/json/, done);
     });
 
-    it('has valid basename and tiles', function(done) {
+    it('has valid tiles', function(done) {
       supertest(app)
         .get(url)
         .expect(function(res) {
-          res.body.basename.should.equal(basename);
           res.body.tiles.length.should.be.greaterThan(0);
         }).end(done);
     });
@@ -64,6 +63,6 @@ describe('Metadata', function() {
     });
   });
 
-  testTileJSON('/styles/test/rendered.json', 'test');
+  testTileJSON('/styles/test-style/rendered.json');
-  testTileJSON('/data/zurich-vector.json', 'zurich-vector');
+  testTileJSON('/data/openmaptiles.json');
 });

test/setup.js

@@ -7,7 +7,7 @@ before(function() {
   console.log('global setup');
   process.chdir('test_data');
   var running = require('../src/server')({
-    config: 'config.json',
+    configPath: 'config.json',
     port: 8888
   });
   global.app = running.app;

test/static.js

@@ -12,88 +12,91 @@ var testStatic = function(prefix, q, format, status, scale, type, query) {
   });
 };
 
+var prefix = 'test-style';
+
 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, '0,0,1.5/256x256', 'png', 200);
-        testStatic('test', '8.5,40.5,20/300x150', 'png', 200, 3);
-        testStatic('test', '-8.5,-40.5,20/300x150', 'png', 200, 3);
 
-        testStatic('test', '8,40,2@0,0/300x150', 'png', 200);
+        testStatic(prefix, '80,40,20/600x300', 'png', 200, 3);
-        testStatic('test', '8,40,2@180,45/300x150', 'png', 200, 2);
+        testStatic(prefix, '8.5,40.5,20/300x150', 'png', 200, 3);
-        testStatic('test', '8,40,2@10/300x150', 'png', 200, 3);
+        testStatic(prefix, '-8.5,-40.5,20/300x150', 'png', 200, 3);
-        testStatic('test', '8,40,2@10.3,20.4/300x300', 'png', 200);
+
-        testStatic('test', '0,0,2@390,120/300x300', 'png', 200);
+        testStatic(prefix, '8,40,2@0,0/300x150', 'png', 200);
+        testStatic(prefix, '8,40,2@180,45/300x150', 'png', 200, 2);
+        testStatic(prefix, '8,40,2@10/300x150', 'png', 200, 3);
+        testStatic(prefix, '8,40,2@10.3,20.4/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,0/256.5x256.5', 'png', 404);
-      testStatic('test', '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 = 'test-style';
+
 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_data.js

@@ -8,7 +8,7 @@ var testTile = function(prefix, z, x, y, status) {
   });
 };
 
-var prefix = 'zurich-vector';
+var prefix = 'openmaptiles';
 
 describe('Vector tiles', function() {
   describe('existing tiles', function() {

test/tiles_rendered.js

@@ -9,35 +9,38 @@ var testTile = function(prefix, z, x, y, format, status, scale, type) {
   });
 };
 
+var prefix = 'test-style';
+
 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);
+      testTile(prefix, 0, 0, 0, 'png', 200, 4);
     });
   });
 
   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, 5);
 
     //testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this
   });