Merge branch 'master' into overviews-work

2016-02-09 17:14:08 +01:00
parent 56095926e0 f0af107ffa
commit 5b50e784cd
21 changed files with 1396 additions and 1048 deletions
@@ -68,7 +68,16 @@ module.exports = {
            statsInterval: rendererConfig.statsInterval
        },
        renderer: {
-            mapnik: rendererConfig.mapnik,
+            mapnik: _.defaults(rendererConfig.mapnik, {
+                geojson: {
+                    dbPoolParams: {
+                          size: 16,
+                          idleTimeout: 3000,
+                          reapInterval: 1000
+                    },
+                    clipByBox2d: false,
+                }
+            }),
            torque: rendererConfig.torque,
            http: rendererConfig.http
        },