Autodetect target mapnik version and let config override it

Closes #40
2012-10-11 11:23:23 +02:00
parent 8d5c52ce1b
commit 9ad574efdc
7 changed files with 17 additions and 8 deletions
@@ -1,14 +1,17 @@
 var   _          = require('underscore')
    , Step       = require('step')
    , cartoData  = require('./carto_data')
-    , Cache = require('./cache_validator');
+    , Cache = require('./cache_validator')
+    , mapnik     = require('mapnik')
+  ;

 module.exports = function(){
    var me = {
        base_url: '/tiles/:table',
        grainstore: {
          datasource: global.environment.postgres,
-          cachedir: global.environment.millstone.cache_basedir
+          cachedir: global.environment.millstone.cache_basedir,
+          mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik
        },
        redis: global.environment.redis,
        enable_cors: global.environment.enable_cors,