Use good defaults

lib/api/api-router.js

@@ -87,14 +87,11 @@ module.exports = class ApiRouter {
                                 global.log4js.getLogger('[windshaft]') :
                                 null;
 
-        const mapStoreOptions = {
+        const mapStore = new windshaft.storage.MapStore({
             pool: redisPool,
+            expire_time: serverOptions.grainstore.default_layergroup_ttl,
             logger: windshaftLogger
-        };
-        if (Number.isFinite(serverOptions.grainstore.default_layergroup_ttl)) {
-            mapStoreOptions.expire_time = serverOptions.grainstore.default_layergroup_ttl;
-        }
-        const mapStore = new windshaft.storage.MapStore(mapStoreOptions);
+        });
 
         const rendererFactory = createRendererFactory({ redisPool, serverOptions, environmentOptions });
 

test/acceptance/ported/support/ported-server-options.js

@@ -16,7 +16,8 @@ module.exports = _.extend({}, serverOptions, {
         },
         cachedir: global.environment.millstone.cache_basedir,
         mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik,
-        gc_prob: 0 // run the garbage collector at each invocation
+        gc_prob: 0, // run the garbage collector at each invocation
+        default_layergroup_ttl: global.environment.mapConfigTTL || 7200
     },
     renderer: {
         mapnik: {