From 8ea665297f61bbe03da9baf1b2f6f860424f6134 Mon Sep 17 00:00:00 2001
From: Petr Sloup <slouppetr@gmail.com>
Date: Fri, 7 Apr 2017 18:53:11 +0200
Subject: [PATCH] Minor fix in style path handling (allow absolute paths)

---
 src/serve_rendered.js | 2 +-
 src/serve_style.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index 2b7e107..a916ad1 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -166,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)?:)?\/\//;
diff --git a/src/serve_style.js b/src/serve_style.js
index 232ed90..11ab57a 100644
--- a/src/serve_style.js
+++ b/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) {