Update package version to 1.6.0

It broke travis (to be further investigated)

Dockerfile

@@ -26,5 +26,7 @@ RUN cd /usr/src/app && npm install --production
 VOLUME /data
 WORKDIR /data
 
+ENV NODE_ENV="production"
+
 EXPOSE 80
 ENTRYPOINT ["/usr/src/app/run.sh"]

Dockerfile_light

@@ -8,5 +8,7 @@ RUN cd /usr/src/app && npm install --production
 VOLUME /data
 WORKDIR /data
 
+ENV NODE_ENV="production"
+
 EXPOSE 80
 ENTRYPOINT ["node", "/usr/src/app/", "-p", "80"]

docs/config.rst

@@ -25,9 +25,11 @@ Example::
         "pngQuantization": false,
         "png": 90
       },
+      "maxScaleFactor": 3,
       "maxSize": 2048,
       "pbfAlias": "pbf",
-      "serveAllFonts": false
+      "serveAllFonts": false,
+      "serveStaticMaps": true
     },
     "styles": {
       "basic": {
@@ -68,6 +70,14 @@ The value of ``root`` is used as prefix for all data types.
 
 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.
 
+``frontPage``
+-----------------
+
+Path to the html (relative to ``root`` path) to use as a front page.
+
+Use ``true`` (or nothing) to serve the default TileServer GL front page with list of styles and data.
+Use ``false`` to disable the front page altogether (404).
+
 ``formatQuality``
 -----------------
 
@@ -75,10 +85,26 @@ Quality of the compression of individual image formats. [0-100]
 
 The value for ``png`` is only used when ``pngQuantization`` is ``true``.
 
+``maxScaleFactor``
+-----------
+
+Maximum scale factor to allow in raster tile and static maps requests (e.g. ``@3x`` suffix).
+Also see ``maxSize`` below.
+Default value is ``3``, maximum ``9``.
+
 ``maxSize``
 -----------
 
-Maximum image side length to be allowed to be rendered (including scale factor). Default is ``2048``.
+Maximum image side length to be allowed to be rendered (including scale factor).
+Be careful when changing this value since there are hardware limits that need to be considered.
+Default is ``2048``.
+
+``watermark``
+-----------
+
+Optional string to be rendered into the raster tiles (and static maps) as watermark (bottom-left corner).
+Can be used for hard-coding attributions etc. (can also be specified per-style).
+Not used by default.
 
 ``styles``
 ==========

docs/deployment.rst

@@ -17,4 +17,4 @@ Nginx can be used to add protection via https, password, referrer, IP address re
 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.
+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-Forwarded-Proto``) to ensures the URLs generated inside TileJSON etc. are using the desired domain and protocol.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -19,30 +19,29 @@
     "test": "mocha test/**.js"
   },
   "dependencies": {
-    "async": "2.1.4",
+    "@mapbox/mapbox-gl-native": "3.4.4",
+    "@mapbox/sphericalmercator": "1.0.5",
     "advanced-pool": "0.3.2",
+    "async": "2.4.0",
     "base64url": "2.0.0",
-    "canvas": "1.6.2",
+    "canvas": "1.6.5",
-    "clone": "2.1.0",
+    "clone": "2.1.1",
     "color": "1.0.3",
-    "cors": "2.8.1",
+    "cors": "2.8.3",
-    "express": "4.14.1",
+    "express": "4.15.2",
     "glyph-pbf-composite": "0.0.2",
-    "handlebars": "4.0.6",
+    "handlebars": "4.0.8",
+    "http-shutdown": "^1.2.0",
     "mbtiles": "0.9.0",
-    "morgan": "1.7.0",
+    "morgan": "1.8.1",
     "node-pngquant-native": "1.0.4",
     "nomnom": "1.8.1",
     "pbf": "3.0.5",
-    "request": "2.79.0",
+    "proj4": "2.4.3",
-    "sharp": "0.17.1",
+    "request": "2.81.0",
-    "tileserver-gl-styles": "1.1.0",
+    "sharp": "0.17.3",
-    "vector-tile": "1.3.0",
+    "tileserver-gl-styles": "1.1.1",
-    "@mapbox/mapbox-gl-native": "3.4.4",
+    "vector-tile": "1.3.0"
-    "@mapbox/sphericalmercator": "1.0.5"
-  },
-  "optionalDependencies": {
-    "tileshrink-gl": "./plugins/tileshrink-gl"
   },
   "devDependencies": {
     "should": "^11.2.0",

public/templates/index.tmpl

@@ -19,85 +19,89 @@
   <section>
     <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>
+    {{#if styles}}
-    <div class="box">
+      <h2 class="box-header">Styles</h2>
-    {{#each styles}}
+      <div class="box">
-      <div class="item">
+      {{#each styles}}
-        {{#if thumbnail}}
+        <div class="item">
-          <img src="/styles/{{@key}}/rendered/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
+          {{#if thumbnail}}
-        {{else}}
+            <img src="/styles/{{@key}}/rendered/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
-          <img src="/images/placeholder.png" alt="{{name}} preview" />
+          {{else}}
-        {{/if}}
+            <img src="/images/placeholder.png" alt="{{name}} preview" />
-        <div class="details">
+          {{/if}}
-          <h3>{{name}}</h3>
+          <div class="details">
-          <p class="identifier">identifier: {{@key}}</p>
+            <h3>{{name}}</h3>
-          <p class="services">
+            <p class="identifier">identifier: {{@key}}</p>
-            services:
+            <p class="services">
+              services:
+              {{#if serving_data}}
+                <a href="/styles/{{@key}}.json{{&../key_query}}">GL Style</a>
+              {{/if}}
+              {{#if serving_rendered}}
+                {{#if serving_data}}| {{/if}}<a href="/styles/{{@key}}/rendered.json{{&../key_query}}">TileJSON</a>
+              {{/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>
+          <div class="viewers">
             {{#if serving_data}}
-              <a href="/styles/{{@key}}.json{{&../key_query}}">GL Style</a>
+              {{#if serving_rendered}}
+                <a class="btn" href="/styles/{{@key}}/{{&../key_query}}{{viewer_hash}}">Viewer</a>
+              {{/if}}
             {{/if}}
             {{#if serving_rendered}}
-              {{#if serving_data}}| {{/if}}<a href="/styles/{{@key}}/rendered.json{{&../key_query}}">TileJSON</a>
+              <a class="btn" href="/styles/{{@key}}/?{{&../key_query_part}}raster{{viewer_hash}}">Raster</a>
             {{/if}}
-            {{#if wmts_link}}
+            {{#if serving_data}}
-              | <a href="{{&wmts_link}}">WMTS</a>
+              <a class="btn" href="/styles/{{@key}}/?{{&../key_query_part}}vector{{viewer_hash}}">Vector</a>
             {{/if}}
-            {{#if xyz_link}}
+          </div>
-              | <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>
-        <div class="viewers">
-          {{#if serving_data}}
-            {{#if serving_rendered}}
-              <a class="btn" href="/styles/{{@key}}/{{&../key_query}}{{viewer_hash}}">Viewer</a>
-            {{/if}}
-          {{/if}}
-          {{#if serving_rendered}}
-            <a class="btn" href="/styles/{{@key}}/?{{&../key_query_part}}raster{{viewer_hash}}">Raster</a>
-          {{/if}}
-          {{#if serving_data}}
-            <a class="btn" href="/styles/{{@key}}/?{{&../key_query_part}}vector{{viewer_hash}}">Vector</a>
-          {{/if}}
         </div>
+      {{/each}}
       </div>
-    {{/each}}
+    {{/if}}
-    </div>
+    {{#if data}}
-    <h2 class="box-header">Data</h2>
+      <h2 class="box-header">Data</h2>
-    <div class="box">
+      <div class="box">
-    {{#each data}}
+      {{#each data}}
-      <div class="item">
+        <div class="item">
-        {{#if thumbnail}}
+          {{#if thumbnail}}
-          <img src="/data/{{@key}}/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
+            <img src="/data/{{@key}}/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
-        {{else}}
+          {{else}}
-          <img src="/images/placeholder.png" alt="{{name}} preview" />
+            <img src="/images/placeholder.png" alt="{{name}} preview" />
-        {{/if}}
+          {{/if}}
-        <div class="details">
+          <div class="details">
-          <h3>{{name}}</h3>
+            <h3>{{name}}</h3>
-          <p class="identifier">identifier: {{@key}}{{#if formatted_filesize}} | size: {{formatted_filesize}}{{/if}} | type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data</p>
+            <p class="identifier">identifier: {{@key}}{{#if formatted_filesize}} | size: {{formatted_filesize}}{{/if}} | type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data</p>
-          <p class="services">
+            <p class="services">
-            services: <a href="/data/{{@key}}.json{{&../key_query}}">TileJSON</a>
+              services: <a href="/data/{{@key}}.json{{&../key_query}}">TileJSON</a>
-            {{#if wmts_link}}
+              {{#if wmts_link}}
-              | <a href="{{&wmts_link}}">WMTS</a>
+                | <a href="{{&wmts_link}}">WMTS</a>
-            {{/if}}
+              {{/if}}
-            {{#if xyz_link}}
+              {{#if xyz_link}}
-              | <a href="#" onclick="return toggle_xyz('xyz_data_{{@key}}');">XYZ</a>
+                | <a href="#" onclick="return toggle_xyz('xyz_data_{{@key}}');">XYZ</a>
-                <input id="xyz_data_{{@key}}" type="text" value="{{&xyz_link}}" style="display:none;" />
+                  <input id="xyz_data_{{@key}}" type="text" value="{{&xyz_link}}" style="display:none;" />
-            {{/if}}
+              {{/if}}
-          </p>
+            </p>
-        </div>
+          </div>
-        <div class="viewers">
+          <div class="viewers">
-          {{#is_vector}}
+            {{#is_vector}}
-          <a class="btn" href="/data/{{@key}}/{{&../key_query}}{{viewer_hash}}">Inspect</a>
+            <a class="btn" href="/data/{{@key}}/{{&../key_query}}{{viewer_hash}}">Inspect</a>
-          {{/is_vector}}
+            {{/is_vector}}
-          {{^is_vector}}
+            {{^is_vector}}
-          <a class="btn" href="/data/{{@key}}/{{&../key_query}}{{viewer_hash}}">View</a>
+            <a class="btn" href="/data/{{@key}}/{{&../key_query}}{{viewer_hash}}">View</a>
-          {{/is_vector}}
+            {{/is_vector}}
+          </div>
         </div>
+      {{/each}}
       </div>
-    {{/each}}
+    {{/if}}
-    </div>
   </section>
   <footer>
     <a href="https://www.klokantech.com/" target="_blank"><img src="/images/klokantech.png" /></a>

src/main.js

@@ -32,6 +32,10 @@ var opts = require('nomnom')
     default: 8080,
     help: 'Port'
   })
+  .option('cors', {
+    default: true,
+    help: 'Enable Cross-origin resource sharing headers'
+  })
   .option('verbose', {
     abbr: 'V',
     flag: true,
@@ -54,7 +58,8 @@ var startServer = function(configPath, config) {
     configPath: configPath,
     config: config,
     bind: opts.bind,
-    port: opts.port
+    port: opts.port,
+    cors: opts.cors
   });
 };
 
@@ -70,6 +75,12 @@ var startWithMBTiles = function(mbtilesFile) {
   }
   var instance = new mbtiles(mbtilesFile, function(err) {
     instance.getInfo(function(err, info) {
+      if (err || !info) {
+        console.log('ERROR: Metadata missing in the MBTiles.');
+        console.log('       Make sure ' + path.basename(mbtilesFile) +
+                    ' is valid MBTiles.');
+        process.exit(1);
+      }
       var bounds = info.bounds;
 
       var styleDir = path.resolve(__dirname, "../node_modules/tileserver-gl-styles/");

src/serve_data.js

@@ -13,6 +13,7 @@ var clone = require('clone'),
 var tileshrinkGl;
 try {
   tileshrinkGl = require('tileshrink-gl');
+  global.addStyleParam = true;
 } catch (e) {}
 
 var utils = require('./utils');

src/serve_rendered.js

@@ -19,12 +19,12 @@ var Canvas = require('canvas'),
     mbgl = require('@mapbox/mapbox-gl-native'),
     mbtiles = require('mbtiles'),
     pngquant = require('node-pngquant-native'),
+    proj4 = require('proj4'),
     request = require('request');
 
 var utils = require('./utils');
 
 var FLOAT_PATTERN = '[+-]?(?:\\d+|\\d+\.?\\d+)';
-var SCALE_PATTERN = '@[234]x';
 
 var getScale = function(scale) {
   return (scale || '@1x').slice(1, 2) | 0;
@@ -39,10 +39,19 @@ mbgl.on('message', function(e) {
 module.exports = function(options, repo, params, id, dataResolver) {
   var app = express().disable('x-powered-by');
 
+  var maxScaleFactor = Math.min(Math.floor(options.maxScaleFactor || 3), 9);
+  var scalePattern = '';
+  for (var i = 2; i <= maxScaleFactor; i++) {
+    scalePattern += i.toFixed();
+  }
+  scalePattern = '@[' + scalePattern + ']x';
+
   var lastModified = new Date().toUTCString();
 
   var rootPath = options.paths.root;
 
+  var watermark = params.watermark || options.watermark;
+
   var styleFile = params.style;
   var map = {
     renderers: [],
@@ -157,7 +166,7 @@ module.exports = function(options, repo, params, id, dataResolver) {
     });
   };
 
-  var styleJSONPath = path.join(options.paths.styles, styleFile);
+  var styleJSONPath = path.resolve(options.paths.styles, styleFile);
   styleJSON = clone(require(styleJSONPath));
 
   var httpTester = /^(http(s)?:)?\/\//;
@@ -186,6 +195,8 @@ module.exports = function(options, repo, params, id, dataResolver) {
   tileJSON.tiles = params.domains || options.domains;
   utils.fixTileJSONCenter(tileJSON);
 
+  var dataProjWGStoInternalWGS = null;
+
   var queue = [];
   Object.keys(styleJSON.sources).forEach(function(name) {
     var source = styleJSON.sources[name];
@@ -223,6 +234,16 @@ module.exports = function(options, repo, params, id, dataResolver) {
             if (err) {
               console.error(err);
             }
+
+            if (!dataProjWGStoInternalWGS && info.proj4) {
+              // how to do this for multiple sources with different proj4 defs?
+              var to3857 = proj4('EPSG:3857');
+              var toDataProj = proj4(info.proj4);
+              dataProjWGStoInternalWGS = function(xy) {
+                return to3857.inverse(toDataProj.forward(xy));
+              };
+            }
+
             var type = source.type;
             Object.assign(source, info);
             source.type = type;
@@ -267,16 +288,24 @@ module.exports = function(options, repo, params, id, dataResolver) {
 
   async.parallel(queue, function(err, results) {
     // TODO: make pool sizes configurable
-    map.renderers[1] = createPool(1, 4, 16);
+    for (var s = 1; s <= maxScaleFactor; s++) {
-    map.renderers[2] = createPool(2, 2, 8);
+      var minPoolSize = 2;
-    map.renderers[3] = createPool(3, 2, 4);
+
-    map.renderers[4] = createPool(4, 2, 4);
+      // standard and @2x tiles are much more usual -> create larger pools
+      if (s <= 2) {
+        minPoolSize *= 2;
+        if (s <= 1) {
+          minPoolSize *= 2;
+        }
+      }
+      map.renderers[s] = createPool(s, minPoolSize, 2 * minPoolSize);
+    }
   });
 
   repo[id] = tileJSON;
 
   var tilePattern = '/rendered/:z(\\d+)/:x(\\d+)/:y(\\d+)' +
-                    ':scale(' + SCALE_PATTERN + ')?\.:format([\\w]+)';
+                    ':scale(' + scalePattern + ')?\.:format([\\w]+)';
 
   var respondImage = function(z, lon, lat, bearing, pitch,
                               width, height, scale, format, res, next,
@@ -330,6 +359,19 @@ module.exports = function(options, repo, params, id, dataResolver) {
         if (opt_overlay) {
           image.overlayWith(opt_overlay);
         }
+        if (watermark) {
+          var canvas = new Canvas(scale * width, scale * height);
+          var ctx = canvas.getContext('2d');
+          ctx.scale(scale, scale);
+          ctx.font = '10px sans-serif';
+          ctx.strokeWidth = '1px';
+          ctx.strokeStyle = 'rgba(255,255,255,.4)';
+          ctx.strokeText(watermark, 5, height - 5);
+          ctx.fillStyle = 'rgba(0,0,0,.4)';
+          ctx.fillText(watermark, 5, height - 5);
+
+          image.overlayWith(canvas.toBuffer());
+        }
 
         var formatQuality = (params.formatQuality || {})[format] ||
                             (options.formatQuality || {})[format];
@@ -392,17 +434,22 @@ module.exports = function(options, repo, params, id, dataResolver) {
                         tileSize, tileSize, scale, format, res, next);
   });
 
-  var extractPathFromQuery = function(query) {
+  var extractPathFromQuery = function(query, transformer) {
     var pathParts = (query.path || '').split('|');
     var path = [];
     pathParts.forEach(function(pair) {
       var pairParts = pair.split(',');
       if (pairParts.length == 2) {
+        var pair;
         if (query.latlng == '1' || query.latlng == 'true') {
-          path.push([+(pairParts[1]), +(pairParts[0])]);
+          pair = [+(pairParts[1]), +(pairParts[0])];
         } else {
-          path.push([+(pairParts[0]), +(pairParts[1])]);
+          pair = [+(pairParts[0]), +(pairParts[1])];
         }
+        if (transformer) {
+          pair = transformer(pair);
+        }
+        path.push(pair);
       }
     });
     return path;
@@ -474,121 +521,152 @@ module.exports = function(options, repo, params, id, dataResolver) {
     return z;
   };
 
-  var staticPattern =
+  if (options.serveStaticMaps !== false) {
-      '/static/:raw(raw)?/%s/:width(\\d+)x:height(\\d+)' +
+    var staticPattern =
-      ':scale(' + SCALE_PATTERN + ')?\.:format([\\w]+)';
+        '/static/:raw(raw)?/%s/:width(\\d+)x:height(\\d+)' +
+        ':scale(' + scalePattern + ')?\.:format([\\w]+)';
 
-  var centerPattern =
+    var centerPattern =
-      util.format(':x(%s),:y(%s),:z(%s)(@: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, FLOAT_PATTERN);
 
-  app.get(util.format(staticPattern, centerPattern), function(req, res, next) {
+    app.get(util.format(staticPattern, centerPattern), function(req, res, next) {
-    var raw = req.params.raw;
+      var raw = req.params.raw;
-    var z = +req.params.z,
+      var z = +req.params.z,
-        x = +req.params.x,
+          x = +req.params.x,
-        y = +req.params.y,
+          y = +req.params.y,
-        bearing = +(req.params.bearing || '0'),
+          bearing = +(req.params.bearing || '0'),
-        pitch = +(req.params.pitch || '0'),
+          pitch = +(req.params.pitch || '0'),
-        w = req.params.width | 0,
+          w = req.params.width | 0,
-        h = req.params.height | 0,
+          h = req.params.height | 0,
-        scale = getScale(req.params.scale),
+          scale = getScale(req.params.scale),
-        format = req.params.format;
+          format = req.params.format;
 
-    if (z < 0) {
+      if (z < 0) {
-      return res.status(404).send('Invalid zoom');
+        return res.status(404).send('Invalid zoom');
-    }
+      }
 
-    if (raw) {
+      var transformer = raw ?
-      var ll = mercator.inverse([x, y]);
+        mercator.inverse.bind(mercator) : dataProjWGStoInternalWGS;
-      x = ll[0];
-      y = ll[1];
-    }
 
-    var path = extractPathFromQuery(req.query);
+      if (transformer) {
-    var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
+        var ll = transformer([x, y]);
-                                path, req.query);
+        x = ll[0];
+        y = ll[1];
+      }
 
-    return respondImage(z, x, y, bearing, pitch, w, h, scale, format,
+      var path = extractPathFromQuery(req.query, transformer);
-                        res, next, overlay);
+      var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
-  });
+                                  path, req.query);
 
-  var boundsPattern =
+      return respondImage(z, x, y, bearing, pitch, w, h, scale, format,
-      util.format(':minx(%s),:miny(%s),:maxx(%s),:maxy(%s)',
+                          res, next, overlay);
-                  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),
-        format = req.params.format;
-
-    var z = calcZForBBox(bbox, w, h, req.query),
-        x = (bbox[0] + bbox[2]) / 2,
-        y = (bbox[1] + bbox[3]) / 2,
-        bearing = 0,
-        pitch = 0;
-
-    var path = extractPathFromQuery(req.query);
-    var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
-                                path, req.query);
-    return respondImage(z, x, y, bearing, pitch, w, h, scale, format,
-                        res, next, overlay);
-  });
-
-  var autoPattern = 'auto';
-
-  app.get(util.format(staticPattern, autoPattern), function(req, res, next) {
-    var path = extractPathFromQuery(req.query);
-    if (path.length < 2) {
-      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,
-        pitch = 0,
-        scale = getScale(req.params.scale),
-        format = req.params.format;
-
-    var bbox = [Infinity, Infinity, -Infinity, -Infinity];
-    path.forEach(function(pair) {
-      bbox[0] = Math.min(bbox[0], pair[0]);
-      bbox[1] = Math.min(bbox[1], pair[1]);
-      bbox[2] = Math.max(bbox[2], pair[0]);
-      bbox[3] = Math.max(bbox[3], pair[1]);
     });
 
-    var z = calcZForBBox(bbox, w, h, req.query),
+    var serveBounds = function(req, res, next) {
-        x = (bbox[0] + bbox[2]) / 2,
+      var raw = req.params.raw;
-        y = (bbox[1] + bbox[3]) / 2;
+      var bbox = [+req.params.minx, +req.params.miny,
+                  +req.params.maxx, +req.params.maxy];
+      var center = [(bbox[0] + bbox[2]) / 2, (bbox[1] + bbox[3]) / 2];
 
-    if (raw) {
+      var transformer = raw ?
-      var ll = mercator.inverse([x, y]);
+        mercator.inverse.bind(mercator) : dataProjWGStoInternalWGS;
-      x = ll[0];
-      y = ll[1];
-    }
 
-    var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
+      if (transformer) {
-                                path, req.query);
+        var minCorner = transformer(bbox.slice(0, 2));
+        var maxCorner = transformer(bbox.slice(2));
+        bbox[0] = minCorner[0];
+        bbox[1] = minCorner[1];
+        bbox[2] = maxCorner[0];
+        bbox[3] = maxCorner[1];
+        center = transformer(center);
+      }
 
-    return respondImage(z, x, y, bearing, pitch, w, h, scale, format,
+      var w = req.params.width | 0,
-                        res, next, overlay);
+          h = req.params.height | 0,
-  });
+          scale = getScale(req.params.scale),
+          format = req.params.format;
+
+      var z = calcZForBBox(bbox, w, h, req.query),
+          x = center[0],
+          y = center[1],
+          bearing = 0,
+          pitch = 0;
+
+      var path = extractPathFromQuery(req.query, transformer);
+      var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
+                                  path, req.query);
+      return respondImage(z, x, y, bearing, pitch, w, h, scale, format,
+                          res, next, overlay);
+    };
+
+    var boundsPattern =
+        util.format(':minx(%s),:miny(%s),:maxx(%s),:maxy(%s)',
+                    FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN, FLOAT_PATTERN);
+
+    app.get(util.format(staticPattern, boundsPattern), serveBounds);
+
+    app.get('/static/', function(req, res, next) {
+      for (var key in req.query) {
+        req.query[key.toLowerCase()] = req.query[key];
+      }
+      req.params.raw = true;
+      req.params.format = (req.query.format || 'image/png').split('/').pop();
+      var bbox = (req.query.bbox || '').split(',');
+      req.params.minx = bbox[0];
+      req.params.miny = bbox[1];
+      req.params.maxx = bbox[2];
+      req.params.maxy = bbox[3];
+      req.params.width = req.query.width || '256';
+      req.params.height = req.query.height || '256';
+      if (req.query.scale) {
+        req.params.width /= req.query.scale;
+        req.params.height /= req.query.scale;
+        req.params.scale = '@' + req.query.scale;
+      }
+
+      return serveBounds(req, res, next);
+    });
+
+    var autoPattern = 'auto';
+
+    app.get(util.format(staticPattern, autoPattern), function(req, res, next) {
+      var raw = req.params.raw;
+      var w = req.params.width | 0,
+          h = req.params.height | 0,
+          bearing = 0,
+          pitch = 0,
+          scale = getScale(req.params.scale),
+          format = req.params.format;
+
+      var transformer = raw ?
+        mercator.inverse.bind(mercator) : dataProjWGStoInternalWGS;
+
+      var path = extractPathFromQuery(req.query, transformer);
+      if (path.length < 2) {
+        return res.status(400).send('Invalid path');
+      }
+
+      var bbox = [Infinity, Infinity, -Infinity, -Infinity];
+      path.forEach(function(pair) {
+        bbox[0] = Math.min(bbox[0], pair[0]);
+        bbox[1] = Math.min(bbox[1], pair[1]);
+        bbox[2] = Math.max(bbox[2], pair[0]);
+        bbox[3] = Math.max(bbox[3], pair[1]);
+      });
+
+      var z = calcZForBBox(bbox, w, h, req.query),
+          x = (bbox[0] + bbox[2]) / 2,
+          y = (bbox[1] + bbox[3]) / 2;
+
+      var overlay = renderOverlay(z, x, y, bearing, pitch, w, h, scale,
+                                  path, req.query);
+
+      return respondImage(z, x, y, bearing, pitch, w, h, scale, format,
+                          res, next, overlay);
+    });
+  }
 
   app.get('/rendered.json', function(req, res, next) {
     var info = clone(tileJSON);

src/serve_style.js

@@ -10,7 +10,7 @@ var clone = require('clone'),
 module.exports = function(options, repo, params, id, reportTiles, reportFont) {
   var app = express().disable('x-powered-by');
 
-  var styleFile = path.join(options.paths.styles, params.style);
+  var styleFile = path.resolve(options.paths.styles, params.style);
 
   var styleJSON = clone(require(styleFile));
   Object.keys(styleJSON.sources).forEach(function(name) {
@@ -68,7 +68,7 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
         return url;
       }
       var queryParams = [];
-      if (!opt_nostyle) {
+      if (!opt_nostyle && global.addStyleParam) {
         queryParams.push('style=' + id);
       }
       if (!opt_nokey && req.query.key) {

src/server.js

@@ -10,6 +10,7 @@ var fs = require('fs'),
 var base64url = require('base64url'),
     clone = require('clone'),
     cors = require('cors'),
+    enableShutdown = require('http-shutdown'),
     express = require('express'),
     handlebars = require('handlebars'),
     mercator = new (require('@mapbox/sphericalmercator'))(),
@@ -28,7 +29,7 @@ if (!isLight) {
   serve_rendered = require('./serve_rendered');
 }
 
-module.exports = function(opts, callback) {
+function start(opts) {
   console.log('Starting server');
 
   var app = express().disable('x-powered-by'),
@@ -41,10 +42,9 @@ module.exports = function(opts, callback) {
 
   app.enable('trust proxy');
 
-  callback = callback || function() {};
+  if (process.env.NODE_ENV == 'production') {
-
+    app.use(morgan('tiny'));
-  if (process.env.NODE_ENV !== 'production' &&
+  } else if (process.env.NODE_ENV !== 'test') {
-      process.env.NODE_ENV !== 'test') {
     app.use(morgan('dev'));
   }
 
@@ -89,7 +89,9 @@ module.exports = function(opts, callback) {
 
   var data = clone(config.data || {});
 
-  app.use(cors());
+  if (opts.cors) {
+    app.use(cors());
+  }
 
   Object.keys(config.styles || {}).forEach(function(id) {
     var item = config.styles[id];
@@ -209,14 +211,23 @@ module.exports = function(opts, callback) {
   app.use('/', express.static(path.join(__dirname, '../public/resources')));
 
   var templates = path.join(__dirname, '../public/templates');
-  var serveTemplate = function(path, template, dataGetter) {
+  var serveTemplate = function(urlPath, template, dataGetter) {
-    fs.readFile(templates + '/' + template + '.tmpl', function(err, content) {
+    var templateFile = templates + '/' + template + '.tmpl';
+    if (template == 'index') {
+      if (options.frontPage === false) {
+        return;
+      } else if (options.frontPage &&
+                 options.frontPage.constructor === String) {
+        templateFile = path.resolve(paths.root, options.frontPage);
+      }
+    }
+    fs.readFile(templateFile, function(err, content) {
       if (err) {
-        console.log('Template not found:', err);
+        console.error('Template not found:', err);
       }
       var compiled = handlebars.compile(content.toString());
 
-      app.use(path, function(req, res, next) {
+      app.use(urlPath, function(req, res, next) {
         var data = {};
         if (dataGetter) {
           data = dataGetter(req);
@@ -309,8 +320,8 @@ module.exports = function(opts, callback) {
       }
     });
     return {
-      styles: styles,
+      styles: Object.keys(styles).length ? styles : null,
-      data: data
+      data: Object.keys(data).length ? data : null
     };
   });
 
@@ -345,19 +356,42 @@ module.exports = function(opts, callback) {
   });
 
   var server = app.listen(process.env.PORT || opts.port, process.env.BIND || opts.bind, function() {
-    console.log('Listening at http://%s:%d/',
+    var address = this.address().address;
-                this.address().address, this.address().port);
+    if (address.indexOf('::') === 0) {
-
+      address = '[' + address + ']'; // literal IPv6 address
-    return callback();
+    }
+    console.log('Listening at http://%s:%d/', address, this.address().port);
   });
 
-  process.on('SIGINT', function() {
+  // add server.shutdown() to gracefully stop serving
-      process.exit();
+  enableShutdown(server);
-  });
 
-  setTimeout(callback, 1000);
   return {
     app: app,
     server: server
   };
+}
+
+module.exports = function(opts) {
+  var running = start(opts);
+
+  process.on('SIGINT', function() {
+    process.exit();
+  });
+
+  process.on('SIGHUP', function() {
+    console.log('Stopping server and reloading config');
+
+    running.server.shutdown(function() {
+      for (var key in require.cache) {
+        delete require.cache[key];
+      }
+
+      var restarted = start(opts);
+      running.server = restarted.server;
+      running.app = restarted.app;
+    });
+  });
+
+  return running;
 };

src/utils.js

@@ -13,6 +13,23 @@ module.exports.getTileUrls = function(req, domains, path, format, aliases) {
     if (domains.constructor === String && domains.length > 0) {
       domains = domains.split(',');
     }
+    var host = req.headers.host;
+    var hostParts = host.split('.');
+    var relativeSubdomainsUsable = hostParts.length > 1 &&
+        !/^([0-9]{1,3}\.){3}[0-9]{1,3}(\:[0-9]+)?$/.test(host);
+    var newDomains = [];
+    domains.forEach(function(domain) {
+      if (domain.indexOf('*') !== -1) {
+        if (relativeSubdomainsUsable) {
+          var newParts = hostParts.slice(1);
+          newParts.unshift(domain.replace('*', hostParts[0]));
+          newDomains.push(newParts.join('.'));
+        }
+      } else {
+        newDomains.push(domain);
+      }
+    });
+    domains = newDomains;
   }
   if (!domains || domains.length == 0) {
     domains = [req.headers.host];

test/tiles_rendered.js

@@ -26,7 +26,6 @@ describe('Raster tiles', function() {
       testTile(prefix, 0, 0, 0, 'png', 200, 2);
       testTile(prefix, 0, 0, 0, 'png', 200, 3);
       testTile(prefix, 2, 1, 1, 'png', 200, 3);
-      testTile(prefix, 0, 0, 0, 'png', 200, 4);
     });
   });