Updated config to use Windshaft's geojson renderer

This commit is contained in:
Daniel García Aubert 2016-02-01 17:12:50 +01:00
parent 6ee1f1a8bf
commit 640500a0e3
4 changed files with 79 additions and 12 deletions

View File

@ -13,7 +13,7 @@ var config = {
// Base URLs for the APIs // Base URLs for the APIs
// //
// See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API // See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API
// //
// Base url for the Templated Maps API // Base url for the Templated Maps API
// "/api/v1/map/named" is the new API, // "/api/v1/map/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x // "/tiles/template" is for compatibility with versions up to 1.6.x
@ -33,7 +33,7 @@ var config = {
// to be able to navigate the map without a reload ? // to be able to navigate the map without a reload ?
// Defaults to 7200 (2 hours) // Defaults to 7200 (2 hours)
,mapConfigTTL: 7200 ,mapConfigTTL: 7200
// idle socket timeout, in milliseconds // idle socket timeout, in milliseconds
,socket_timeout: 600000 ,socket_timeout: 600000
,enable_cors: true ,enable_cors: true
,cache_enabled: false ,cache_enabled: false
@ -147,7 +147,24 @@ var config = {
// memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the // memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the
// internal cache. // internal cache.
cacheOnTimeout: true cacheOnTimeout: true
},
geojson: {
dbPoolParams: {
// maximum number of resources to create at any given time
size: 16,
// max milliseconds a resource can go unused before it should be destroyed
idleTimeout: 3000,
// frequency to check for idle resources
reapInterval: 1000
},
// SQL queries will be wrapped with ST_ClipByBox2D
// Returning the portion of a geometry falling within a rectangle
// It will only work if snapToGrid is enabled
clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
} }
}, },
http: { http: {
timeout: 2000, // the timeout in ms for a http tile request timeout: 2000, // the timeout in ms for a http tile request
@ -232,7 +249,7 @@ var config = {
serviceId: 'wadus_service_id' serviceId: 'wadus_service_id'
} }
// If useProfiler is true every response will be served with an // If useProfiler is true every response will be served with an
// X-Tiler-Profile header containing elapsed timing for various // X-Tiler-Profile header containing elapsed timing for various
// steps taken for producing the response. // steps taken for producing the response.
,useProfiler:true ,useProfiler:true
// Settings for the health check available at /health // Settings for the health check available at /health

View File

@ -13,7 +13,7 @@ var config = {
// Base URLs for the APIs // Base URLs for the APIs
// //
// See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API // See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API
// //
// Base url for the Templated Maps API // Base url for the Templated Maps API
// "/api/v1/map/named" is the new API, // "/api/v1/map/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x // "/tiles/template" is for compatibility with versions up to 1.6.x
@ -34,7 +34,7 @@ var config = {
// Defaults to 7200 (2 hours) // Defaults to 7200 (2 hours)
,mapConfigTTL: 7200 ,mapConfigTTL: 7200
// idle socket timeout, in milliseconds // idle socket timeout, in milliseconds
,socket_timeout: 600000 ,socket_timeout: 600000
,enable_cors: true ,enable_cors: true
,cache_enabled: true ,cache_enabled: true
,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])' ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])'
@ -141,7 +141,24 @@ var config = {
// memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the // memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the
// internal cache. // internal cache.
cacheOnTimeout: true cacheOnTimeout: true
},
geojson: {
dbPoolParams: {
// maximum number of resources to create at any given time
size: 16,
// max milliseconds a resource can go unused before it should be destroyed
idleTimeout: 3000,
// frequency to check for idle resources
reapInterval: 1000
},
// SQL queries will be wrapped with ST_ClipByBox2D
// Returning the portion of a geometry falling within a rectangle
// It will only work if snapToGrid is enabled
clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
} }
}, },
http: { http: {
timeout: 2000, // the timeout in ms for a http tile request timeout: 2000, // the timeout in ms for a http tile request
@ -226,7 +243,7 @@ var config = {
serviceId: 'wadus_service_id' serviceId: 'wadus_service_id'
} }
// If useProfiler is true every response will be served with an // If useProfiler is true every response will be served with an
// X-Tiler-Profile header containing elapsed timing for various // X-Tiler-Profile header containing elapsed timing for various
// steps taken for producing the response. // steps taken for producing the response.
,useProfiler:false ,useProfiler:false
,serverMetadata: { ,serverMetadata: {

View File

@ -13,7 +13,7 @@ var config = {
// Base URLs for the APIs // Base URLs for the APIs
// //
// See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API // See http://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API
// //
// Base url for the Templated Maps API // Base url for the Templated Maps API
// "/api/v1/maps/named" is the new API, // "/api/v1/maps/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x // "/tiles/template" is for compatibility with versions up to 1.6.x
@ -34,7 +34,7 @@ var config = {
// Defaults to 7200 (2 hours) // Defaults to 7200 (2 hours)
,mapConfigTTL: 7200 ,mapConfigTTL: 7200
// idle socket timeout, in milliseconds // idle socket timeout, in milliseconds
,socket_timeout: 600000 ,socket_timeout: 600000
,enable_cors: true ,enable_cors: true
,cache_enabled: true ,cache_enabled: true
,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms (:res[X-Tiler-Profiler]) -> :res[Content-Type]' ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms (:res[X-Tiler-Profiler]) -> :res[Content-Type]'
@ -141,7 +141,24 @@ var config = {
// memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the // memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the
// internal cache. // internal cache.
cacheOnTimeout: true cacheOnTimeout: true
},
geojson: {
dbPoolParams: {
// maximum number of resources to create at any given time
size: 16,
// max milliseconds a resource can go unused before it should be destroyed
idleTimeout: 3000,
// frequency to check for idle resources
reapInterval: 1000
},
// SQL queries will be wrapped with ST_ClipByBox2D
// Returning the portion of a geometry falling within a rectangle
// It will only work if snapToGrid is enabled
clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
} }
}, },
http: { http: {
timeout: 2000, // the timeout in ms for a http tile request timeout: 2000, // the timeout in ms for a http tile request
@ -226,7 +243,7 @@ var config = {
serviceId: 'wadus_service_id' serviceId: 'wadus_service_id'
} }
// If useProfiler is true every response will be served with an // If useProfiler is true every response will be served with an
// X-Tiler-Profile header containing elapsed timing for various // X-Tiler-Profile header containing elapsed timing for various
// steps taken for producing the response. // steps taken for producing the response.
,useProfiler:true ,useProfiler:true
,serverMetadata: { ,serverMetadata: {

View File

@ -13,7 +13,7 @@ var config = {
// Base URLs for the APIs // Base URLs for the APIs
// //
// See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API // See https://github.com/CartoDB/Windshaft-cartodb/wiki/Unified-Map-API
// //
// Base url for the Templated Maps API // Base url for the Templated Maps API
// "/api/v1/map/named" is the new API, // "/api/v1/map/named" is the new API,
// "/tiles/template" is for compatibility with versions up to 1.6.x // "/tiles/template" is for compatibility with versions up to 1.6.x
@ -34,7 +34,7 @@ var config = {
// Defaults to 7200 (2 hours) // Defaults to 7200 (2 hours)
,mapConfigTTL: 7200 ,mapConfigTTL: 7200
// idle socket timeout, in milliseconds // idle socket timeout, in milliseconds
,socket_timeout: 600000 ,socket_timeout: 600000
,enable_cors: true ,enable_cors: true
,cache_enabled: false ,cache_enabled: false
,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])' ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])'
@ -141,6 +141,22 @@ var config = {
// memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the // memory. If we want to enforce this behaviour we have to implement a cache eviction policy for the
// internal cache. // internal cache.
cacheOnTimeout: true cacheOnTimeout: true
},
geojson: {
dbPoolParams: {
// maximum number of resources to create at any given time
size: 16,
// max milliseconds a resource can go unused before it should be destroyed
idleTimeout: 3000,
// frequency to check for idle resources
reapInterval: 1000
},
// SQL queries will be wrapped with ST_ClipByBox2D
// Returning the portion of a geometry falling within a rectangle
// It will only work if snapToGrid is enabled
clipByBox2d: false // this requires postgis >=2.2 and geos >=3.5
} }
}, },
http: { http: {
@ -228,7 +244,7 @@ var config = {
serviceId: 'wadus_service_id' serviceId: 'wadus_service_id'
} }
// If useProfiler is true every response will be served with an // If useProfiler is true every response will be served with an
// X-Tiler-Profile header containing elapsed timing for various // X-Tiler-Profile header containing elapsed timing for various
// steps taken for producing the response. // steps taken for producing the response.
,useProfiler:true ,useProfiler:true
// Settings for the health check available at /health // Settings for the health check available at /health