Update version to 1.1.0

new feature: command line option for bind address

.gitignore

@@ -1,5 +1,7 @@
+docs/_build
 node_modules
 test_data
 data
 light
 config.json
+*.mbtiles

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

@@ -3,57 +3,16 @@
 [![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/)
 
 
-## Installation
+## Quickstart
+Use `npm install -g tileserver-gl` to install the package from npm.
 
-### Docker
- - `docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl`
+Then you can simply run `tileserver-gl zurich_switzerland.mbtiles` to start the server for the given mbtiles.
 
-### Without docker
- - Make sure you have Node v4 or higher (`nvm install 4`)
- - `npm install`
- - `node src/main.js`
+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.
 
-## Sample data
-Sample data can be downloaded at https://github.com/klokantech/tileserver-gl-data/archive/master.zip
+Or you can use `docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl` to run the server inside a docker container.
 
-#### Usage
-- unpack somewhere and `cd` to the directory
-- `docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl`
-  - (or `node path/to/repo/src/main.js`)
+Prepared vector tiles can be downloaded from [OSM2VectorTiles](http://osm2vectortiles.org/).
 
-## Configuration
-
-Create `config.json` file in the root directory.
-The config file can contain definition of several paths where the tiles will be served.
-
-### Example configuration file
-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`)
-
-## Available URLs
-
-- If you visit the server on the configured port (default 8080) you should see your maps appearing in the browser.
-- Style is 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 are at `/styles/{id}/rendered/{z}/{x}/{y}[@2x].{format}`
-  - The optional `@2x` (or `@3x`) part can be used to render HiDPI (retina) tiles
-  - Available formats: `png`, `jpg` (`jpeg`), `webp`
-  - TileJSON at `/styles/{id}/rendered.json`
-- Static images are rendered at:
-  - `/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)
-  - 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`)
+## Documentation
+You can read full documentation of this project at http://tileserver.readthedocs.io/.

docs/config.rst

@@ -0,0 +1,121 @@
+==================
+Configuration file
+==================
+
+The configuration file defines the behavior of the application. It's a regular JSON file.
+
+Example::
+
+  {
+    "options": {
+      "paths": {
+        "root": "",
+        "fonts": "glyphs",
+        "sprites": "sprites",
+        "styles": "styles",
+        "mbtiles": ""
+      },
+      "domains": [
+        "localhost:8080",
+        "127.0.0.1:8080"
+      ],
+      "formatQuality": {
+        "jpeg": 80,
+        "webp": 90,
+        "pngQuantization": false,
+        "png": 90
+      },
+      "maxSize": 2048
+    },
+    "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 mbtiles from style
+====================================
+
+You can link various data sources from the style JSON (for example even remote TileJSONs).
+
+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``.

docs/deployment.rst

@@ -0,0 +1,15 @@
+==========
+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.

docs/endpoints.rst

@@ -0,0 +1,56 @@
+===================
+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"
+
+* 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}``
+
+  * TileJSON at ``/data/{mbtiles}.json``
+
+TileJSON arrays
+===============
+Array of all TileJSONs is at ``/index.json`` (``/rendered.json``; ``/data.json``)

docs/index.rst

@@ -11,6 +11,12 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
+   installation
+   usage
+   config
+   deployment
+   endpoints
+
 
 
 Indices and tables

docs/installation.rst

@@ -0,0 +1,29 @@
+============
+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``.
+
+npm
+===
+
+Just run ``npm install -g tileserver-gl``.
+
+``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 or higher (nvm install 4) and run::
+
+  npm install
+  node .

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,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "0.9.1",
+  "version": "1.1.0",
   "description": "Map tile server for JSON GL styles - serverside generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -22,17 +22,19 @@
     "canvas": "1.4.0",
     "clone": "1.0.2",
     "color": "0.11.3",
-    "cors": "2.7.1",
+    "cors": "2.8.0",
     "express": "4.14.0",
     "glyph-pbf-composite": "0.0.2",
     "handlebars": "4.0.5",
-    "mapbox-gl-native": "3.2.1",
+    "mapbox-gl-native": "3.3.2",
     "mbtiles": "0.9.0",
     "morgan": "1.7.0",
+    "node-pngquant-native": "1.0.4",
     "nomnom": "1.8.1",
     "request": "2.74.0",
-    "sharp": "0.15.1",
-    "sphericalmercator": "1.0.5"
+    "sharp": "0.16.0",
+    "sphericalmercator": "1.0.5",
+    "tileserver-gl-styles": "0.3.0"
   },
   "devDependencies": {
     "should": "^10.0.0",

public/resources/index.css

@@ -36,6 +36,16 @@ a:hover{
   font-size: 32px;
   text-align:center;
   margin:90px 0 0 0;
+  position:relative;
+}
+.title.light:after {
+  content: "light";
+  display: block;
+  position: absolute;
+  left: 50%;
+  bottom: -5px;
+  color: #499DCE;
+  font-size:.8em;
 }
 section{
   margin: 15px auto;
@@ -78,7 +88,6 @@ section{
 }
 .details {
   float:left;
-  width:180px;
   height: 128px;
   padding: 20px 30px 20px 188px;
 }
@@ -170,6 +179,9 @@ body {
   .title{
     margin: 25px 0 0 0;
   }
+  .title.light:after {
+    font-size:.6em;
+  }
   .title img{
     width: 200px;
   }

public/resources/mapbox-gl.css

@@ -229,6 +229,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/index.tmpl

@@ -3,13 +3,22 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>TileServerGL</title>
+  <title>TileServer GL - Server for vector and raster maps with GL styles</title>
   <link rel="stylesheet" type="text/css" href="/index.css{{&key_query}}" />
+  <script>
+    function toggle_xyz(id) {
+      var el = document.getElementById(id);
+      var s = el.style;
+      s.display = s.display == 'none' ? 'inline-block' : 'none';
+      el.setSelectionRange(0, el.value.length);
+      return false;
+    }
+  </script>
 </head>
 <body>
   <section>
-    <h1 class="title"><img src="/images/logo.png" alt="TileServerGL" /></h1>
-    <h2 class="subtitle">Map Layers for web and mobile applications.</h2>
+    <h1 class="title {{#if is_light}}light{{/if}}"><img src="/images/logo.png" alt="TileServer GL" /></h1>
+    <h2 class="subtitle">Vector {{#if is_light}}<s>and raster</s>{{else}}and raster{{/if}} maps with GL styles</h2>
     <h2 class="box-header">Styles</h2>
     <div class="box">
     {{#each styles}}
@@ -25,9 +34,13 @@
           <p class="services">
             {{#if serving_rendered}}
               services: <a href="/styles/{{@key}}/rendered.json{{&../key_query}}">TileJSON</a>
-              {{#if wmts_link}}
-                | <a href="{{&wmts_link}}">WMTS</a>
-              {{/if}}
+            {{/if}}
+            {{#if wmts_link}}
+              | <a href="{{&wmts_link}}">WMTS</a>
+            {{/if}}
+            {{#if xyz_link}}
+              | <a href="#" onclick="return toggle_xyz('xyz_style_{{@key}}');">XYZ</a>
+                <input id="xyz_style_{{@key}}" type="text" value="{{&xyz_link}}" style="display:none;" />
             {{/if}}
           </p>
         </div>
@@ -64,6 +77,10 @@
             {{#if wmts_link}}
               | <a href="{{&wmts_link}}">WMTS</a>
             {{/if}}
+            {{#if xyz_link}}
+              | <a href="#" onclick="return toggle_xyz('xyz_data_{{@key}}');">XYZ</a>
+                <input id="xyz_data_{{@key}}" type="text" value="{{&xyz_link}}" style="display:none;" />
+            {{/if}}
           </p>
         </div>
         <div class="viewers">
@@ -81,7 +98,7 @@
   <footer>
     <a href="https://www.klokantech.com/" target="_blank"><img src="/images/klokantech.png" /></a>
     <p>
-      <a href="https://github.com/klokantech/tileserver-gl" target="_blank">Powered by TileServer-GL ({{server_version}})</a> – <a href="https://www.klokantech.com/" target="_blank">open-source project from Klokan Technologies GmbH.</a>
+      <a href="https://github.com/klokantech/tileserver-gl" target="_blank">Powered by TileServer GL ({{server_version}})</a> – <a href="https://www.klokantech.com/" target="_blank">open-source project from Klokan Technologies GmbH.</a>
     </p>
   </footer>
 </body>

publish.js

@@ -2,6 +2,14 @@
 
 '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'
@@ -14,6 +22,7 @@ var packageJson = require('./package');
 packageJson.name += '-light';
 delete packageJson.dependencies['canvas'];
 delete packageJson.dependencies['mapbox-gl-native'];
+delete packageJson.dependencies['node-pngquant-native'];
 delete packageJson.dependencies['sharp'];
 
 delete packageJson.devDependencies;
@@ -21,7 +30,14 @@ delete packageJson.devDependencies;
 var str = JSON.stringify(packageJson, undefined, 2);
 fs.writeFileSync('light/package.json', str);
 
-// PUBLISH
+/* 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
-  echo "INFO: No config.json found! Downloading sample data..."
-  echo "--------------------------------------------------------------------------------"
-  curl -L -o sample_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.8.0.zip
-  unzip -q sample_data.zip -d sample_data
-  mv sample_data/tileserver-gl-data-*/* -t /data
-  rm sample_data.zip
-  rm -r sample_data
-fi
-xvfb-run -a -e /dev/stdout --server-args="-screen 0 1024x768x24" node /usr/src/app/src/main.js -p 80 -c /data/config.json
+cd /data
+xvfb-run -a -e /dev/stdout --server-args="-screen 0 1024x768x24" node /usr/src/app/ -p 80

src/main.js

@@ -2,27 +2,161 @@
 
 '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,
-  port: opts.port
+
+console.log('Starting ' + packageJson.name + ' v' + packageJson.version);
+
+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) {
+      if (info.format != 'pbf') {
+        console.log('ERROR: MBTiles format is not "pbf".');
+        process.exit(1);
+      }
+      var bounds = info.bounds;
+
+      var styleDir = path.resolve(__dirname, "../node_modules/tileserver-gl-styles/");
+
+      var config = {
+        "options": {
+          "paths": {
+            "root": styleDir,
+            "fonts": "glyphs",
+            "sprites": "sprites",
+            "styles": "styles",
+            "mbtiles": path.dirname(mbtilesFile)
+          }
+        },
+        "styles": {},
+        "data": {
+          "osm2vectortiles": {
+            "mbtiles": path.basename(mbtilesFile)
+          }
+        }
+      };
+
+      var styles = fs.readdirSync(path.resolve(styleDir, 'styles'));
+      for (var i=0; i < styles.length; i++) {
+        var styleFilename = styles[i];
+        if (styleFilename.endsWith('.json')) {
+          var styleObject = {
+            "style": path.basename(styleFilename),
+            "tilejson": {
+              "bounds": bounds
+            }
+          };
+          config['styles'][path.basename(styleFilename, '.json')] =
+              styleObject;
+        }
+      }
+
+      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-styles/releases/download/v0.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

@@ -12,13 +12,17 @@ var utils = require('./utils');
 module.exports = function(options, repo, params, id) {
   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
   };
 
   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;
@@ -28,7 +32,7 @@ module.exports = function(options, repo, params, id) {
 
       tileJSON['tilejson'] = '2.0.0';
       tileJSON['basename'] = id;
-      tileJSON['filesize'] = fs.statSync(mbtilesFile)['size'];
+      tileJSON['filesize'] = mbtilesFileStats['size'];
       delete tileJSON['scheme'];
 
       Object.assign(tileJSON, params.tilejson || {});

src/serve_rendered.js

@@ -18,12 +18,13 @@ var Canvas = require('canvas'),
     mercator = new (require('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,7 +36,7 @@ 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();
@@ -167,14 +168,31 @@ 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) {
       // 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);
-        map.sources[name] = new mbtiles(
-          path.join(options.paths.mbtiles, mbtilesFile), function(err) {
+        mbtilesFile = path.resolve(options.paths.mbtiles, mbtilesFile);
+        var mbtilesFileStats = fs.statSync(mbtilesFile);
+        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) {
             var type = source.type;
             Object.assign(source, info);
@@ -221,6 +239,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;
@@ -235,7 +254,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') {
@@ -283,21 +302,30 @@ module.exports = function(options, repo, params, id) {
 
         image.toFormat(format);
 
-        var formatEncoding = (params.formatEncoding || {})[format] ||
-                             (options.formatEncoding || {})[format];
+        var formatQuality = (params.formatQuality || {})[format] ||
+                            (options.formatQuality || {})[format];
         if (format == 'png') {
-          image.compressionLevel(formatEncoding || 6)
-               .withoutAdaptiveFiltering();
+          image.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
@@ -403,14 +431,13 @@ 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) ||
-            ((maxCorner[1] - minCorner[1]) * (1 + 2 * padding) > h)) && z > 0) {
-      z--;
-      minCorner[0] /= 2;
-      minCorner[1] /= 2;
-      maxCorner[0] /= 2;
-      maxCorner[1] /= 2;
-    }
+    w /= (1 + 2 * padding);
+    h /= (1 + 2 * padding);
+
+    z -= Math.max(
+      Math.log((maxCorner[0] - minCorner[0]) / w),
+      Math.log((maxCorner[1] - minCorner[1]) / h)
+    ) / Math.LN2;
 
     return z;
   };
@@ -420,11 +447,12 @@ module.exports = function(options, repo, params, id) {
       ':scale(' + SCALE_PATTERN + ')?\.:format([\\w]+)';
 
   var centerPattern =
-      util.format(':lon(%s),:lat(%s),:z(\\d+)(@:bearing(%s)(,:pitch(%s))?)?',
-                  FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN);
+      util.format(':lon(%s),:lat(%s),:z(%s)(@:bearing(%s)(,:pitch(%s))?)?',
+                  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 z = +req.params.z,
         x = +req.params.lon,
         y = +req.params.lat,
         bearing = +(req.params.bearing || '0'),

src/serve_style.js

@@ -17,8 +17,14 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
     var source = styleJSON.sources[name];
     var url = source.url;
     if (url.lastIndexOf('mbtiles:', 0) === 0) {
-      var mbtiles = url.substring('mbtiles://'.length);
-      var identifier = reportTiles(mbtiles);
+      var mbtilesFile = url.substring('mbtiles://'.length);
+      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';
     }
   });

src/server.js

@@ -22,13 +22,14 @@ var packageJson = require('../package'),
     serve_data = require('./serve_data'),
     utils = require('./utils');
 
-if (packageJson.name.slice(-6) !== '-light') {
+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 ' + packageJson.name + ' v' + packageJson.version);
+  console.log('Starting server');
 
   var app = express().disable('x-powered-by'),
       serving = {
@@ -50,21 +51,29 @@ module.exports = function(opts, callback) {
     app.use(morgan('dev'));
   }
 
-  var configPath = path.resolve(opts.config);
-
-  var config;
-  try {
-    config = clone(require(configPath));
-  } catch (e) {
-    console.log('ERROR: Config file not found or invalid!');
-    console.log('       See README.md for instructions and sample data.');
+  var config = opts.config || null;
+  var configPath = null;
+  if (opts.configPath) {
+    configPath = path.resolve(opts.configPath);
+    try {
+      config = clone(require(configPath));
+    } catch (e) {
+      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 || '');
@@ -83,15 +92,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) {
-              dataItemId = id;
+            if (fromData) {
+              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 += '_';
@@ -107,7 +125,16 @@ module.exports = function(opts, callback) {
     if (item.serve_rendered !== false) {
       if (serve_rendered) {
         app.use('/styles/' + id + '/',
-                serve_rendered(options, serving.rendered, item, 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;
       }
@@ -186,6 +213,7 @@ module.exports = function(opts, callback) {
           }
         }
         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 : '';
@@ -218,6 +246,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, style.serving_rendered.format);
+        style.xyz_link = tiles[0];
       }
     });
     var data = clone(serving.data || {});
@@ -242,6 +275,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';
@@ -293,7 +330,7 @@ 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);
 

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;