Update package version to 1.3.2

.dockerignore

@@ -1,4 +1,7 @@
 .git
+docs/_build
 node_modules
 test_data
-test
+light
+config.json
+*.mbtiles

docs/installation.rst

@@ -41,7 +41,7 @@ Alternatively, you can use ``tileserver-gl-light`` package instead, which is pur
 From source
 ===========
 
-Make sure you have Node v4 or higher (nvm install 4) and run::
+Make sure you have Node v4 (nvm install 4) and run::
 
   npm install
   node .
@@ -50,6 +50,9 @@ Make sure you have Node v4 or higher (nvm install 4) and run::
 On OSX
 ======
 
-Make sure to have ``pkg-config`` and ``cairo`` installed::
+Make sure to have dependencies of canvas_ package installed::
 
-  brew install pkg-config cairo
+  brew install pkg-config cairo libpng jpeg giflib
+
+
+.. _canvas: https://www.npmjs.com/package/canvas

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "1.3.0-beta.2",
+  "version": "1.3.2",
   "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -15,7 +15,6 @@
   "engines": {
     "node": ">=4.2.1 <5"
   },
-  "engineStrict": true,
   "scripts": {
     "test": "mocha test/**.js"
   },
@@ -38,9 +37,9 @@
     "pbf": "3.0.5",
     "request": "2.79.0",
     "sharp": "0.16.2",
-    "sphericalmercator": "1.0.5",
+    "tileserver-gl-styles": "1.1.0",
-    "tileserver-gl-styles": "1.0.0",
+    "vector-tile": "1.3.0",
-    "vector-tile": "1.3.0"
+    "@mapbox/sphericalmercator": "1.0.5"
   },
   "optionalDependencies": {
     "tileshrink-gl": "./plugins/tileshrink-gl"

public/templates/data.tmpl

@@ -10,10 +10,10 @@
   <script src="/mapbox-gl.js{{&key_query}}"></script>
   <script src="/mapbox-gl-inspect.min.js{{&key_query}}"></script>
   <style>
-    body {background:#fff;color:#333;}
+    body {background:#fff;color:#333;font-family:Arial, sans-serif;}
     #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 {position:absolute;top:35px;right:0;bottom:0;width:240px;overflow:auto;}
     #layerList div div {width:15px;height:15px;display:inline-block;}
   </style>
   {{/is_vector}}

publish.js

@@ -26,6 +26,7 @@ delete packageJson.dependencies['mapbox-gl-native'];
 delete packageJson.dependencies['node-pngquant-native'];
 delete packageJson.dependencies['sharp'];
 
+delete packageJson.optionalDependencies;
 delete packageJson.devDependencies;
 
 var str = JSON.stringify(packageJson, undefined, 2);

src/main.js

@@ -89,11 +89,12 @@ var startWithMBTiles = function(mbtilesFile) {
 
       if (info.format == 'pbf' &&
           info.name.toLowerCase().indexOf('openmaptiles') > -1) {
-        config['data']['openmaptiles'] = {
+        var omtV = (info.version || '').split('.');
+
+        config['data']['v' + omtV[0]] = {
           "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++) {

src/serve_rendered.js

@@ -15,7 +15,7 @@ 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'),

src/server.js

@@ -12,7 +12,7 @@ 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'),
@@ -138,10 +138,7 @@ module.exports = function(opts, callback) {
     }
   });
 
-  if (Object.keys(serving.styles).length > 0) {
-    // serve fonts only if serving some styles
   app.use('/', serve_font(options, serving.fonts));
-  }
 
   Object.keys(data).forEach(function(id) {
     var item = data[id];