From f851423b688187c037d1b4268e3e459b215c7869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 1 Jun 2018 16:52:23 +0200
Subject: [PATCH 01/15] Unify app configuration among the different enviroments

---
 config/environments/development.js.example | 23 +++++++++----
 config/environments/production.js.example  | 20 ++++--------
 config/environments/staging.js.example     | 16 +++++----
 config/environments/test.js.example        | 38 ++++++++++++----------
 4 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index d6345b82..36bd3fe7 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -61,13 +61,13 @@ var config = {
 
     // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
     //
-    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // This URLs depend on how `routes` and `user_from_host` are configured: the application can be
     // configured to accept request with the {user} in the header host or in the request path.
     // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
     //
     // This template allows to make the endpoints generation more flexible, the template exposes the following params:
     //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
-    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `routes`.
     //  3. {{=it.port}}: will use the `port` from this very same configuration file.
     ,resources_url_templates: {
         http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
@@ -87,12 +87,12 @@ var config = {
     // idle socket timeout, in milliseconds
     ,socket_timeout: 600000
     ,enable_cors: true
-    ,cache_enabled: false
-    ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
+    ,cache_enabled: true
+    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
-    ,log_filename: undefined
+    ,log_filename: 'logs/node-windshaft.log'
     // Templated database username for authorized user
     // Supported labels: 'user_id' (read from redis)
     ,postgres_auth_user: 'development_cartodb_user_<%= user_id %>'
@@ -100,6 +100,9 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
+        // Parameters to pass to datasource plugin of mapnik
+        // See http://github.com/mapnik/mapnik/wiki/PostGIS
+        user: "test_windshaft_publicuser",
         user: "publicuser",
         password: "public",
         host: '127.0.0.1',
@@ -118,7 +121,7 @@ var config = {
     ,statsd: {
         host: 'localhost',
         port: 8125,
-        prefix: 'dev.',
+        prefix: 'dev.', // could be hostname, better not containing dots
         cacheDns: true
         // support all allowed node-statsd options
     }
@@ -267,7 +270,7 @@ var config = {
             // If filename is given logs comming from analysis client  will be written
             // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
             // Log file will be re-opened on receiving the HUP signal
-            filename: '/tmp/analysis.log'
+            filename: 'logs/node-windshaft-analysis.log'
         },
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
@@ -337,6 +340,12 @@ var config = {
     // X-Tiler-Profile header containing elapsed timing for various
     // steps taken for producing the response.
     ,useProfiler:true
+    ,serverMetadata: {
+      cdn_url: {
+        http: undefined,
+        https: undefined
+      }
+    }
     // Settings for the health check available at /health
     ,health: {
       enabled: false,
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index d601dbc5..a092ca03 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -61,13 +61,13 @@ var config = {
 
     // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
     //
-    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // This URLs depend on how `routes` and `user_from_host` are configured: the application can be
     // configured to accept request with the {user} in the header host or in the request path.
     // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
     //
     // This template allows to make the endpoints generation more flexible, the template exposes the following params:
     //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
-    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `routes`.
     //  3. {{=it.port}}: will use the `port` from this very same configuration file.
     ,resources_url_templates: {
         http: 'http://{{=it.cdn_url}}/{{=it.user}}/api/v1/map',
@@ -88,7 +88,7 @@ var config = {
     ,socket_timeout: 600000
     ,enable_cors: 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]) (:res[X-Tiler-Errors])'
+    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
@@ -100,6 +100,8 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
+        // Parameters to pass to datasource plugin of mapnik
+        // See http://github.com/mapnik/mapnik/wiki/PostGIS
         user: "publicuser",
         password: "public",
         host: '127.0.0.1',
@@ -130,15 +132,7 @@ var config = {
         //If enabled, MVTs will be generated with PostGIS directly, instead of using Mapnik,
         //PostGIS 2.4 is required for this to work
         //If disabled it will use Mapnik MVT generation
-        usePostGIS: false,
-        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
-          }
+        usePostGIS: false
       },
       mapnik: {
           // The size of the pool of internal mapnik backend
@@ -275,7 +269,7 @@ var config = {
             // If filename is given logs comming from analysis client  will be written
             // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
             // Log file will be re-opened on receiving the HUP signal
-            filename: 'logs/analysis.log'
+            filename: 'logs/node-windshaft-analysis.log'
         },
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 76260b8f..e6f7e5fa 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -61,16 +61,16 @@ var config = {
 
     // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
     //
-    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // This URLs depend on how `routes` and `user_from_host` are configured: the application can be
     // configured to accept request with the {user} in the header host or in the request path.
     // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
     //
     // This template allows to make the endpoints generation more flexible, the template exposes the following params:
     //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
-    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `routes`.
     //  3. {{=it.port}}: will use the `port` from this very same configuration file.
     ,resources_url_templates: {
-        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
+        http: 'http://{{=it.cdn_url}}/{{=it.user}}/api/v1/map',
         https: 'https://{{=it.cdn_url}}/{{=it.user}}/api/v1/map'
     }
 
@@ -88,7 +88,7 @@ var config = {
     ,socket_timeout: 600000
     ,enable_cors: 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] (:res[X-Tiler-Errors])'
+    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
@@ -100,6 +100,8 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
+        // Parameters to pass to datasource plugin of mapnik
+        // See http://github.com/mapnik/mapnik/wiki/PostGIS
         user: "publicuser",
         password: "public",
         host: '127.0.0.1',
@@ -118,7 +120,7 @@ var config = {
     ,statsd: {
         host: 'localhost',
         port: 8125,
-        prefix: 'stage.:host.',
+        prefix: 'stage.:host.', // could be hostname, better not containing dots
         cacheDns: true
         // support all allowed node-statsd options
     }
@@ -267,7 +269,7 @@ var config = {
             // If filename is given logs comming from analysis client  will be written
             // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
             // Log file will be re-opened on receiving the HUP signal
-            filename: 'logs/analysis.log'
+            filename: 'logs/node-windshaft-analysis.log'
         },
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
@@ -345,7 +347,7 @@ var config = {
     }
     // Settings for the health check available at /health
     ,health: {
-      enabled: false,
+      enabled: true,
       username: 'localhost',
       z: 0,
       x: 0,
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 0dd475fe..a3ee9aba 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -61,16 +61,17 @@ var config = {
 
     // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
     //
-    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // This URLs depend on how `routes` and `user_from_host` are configured: the application can be
     // configured to accept request with the {user} in the header host or in the request path.
     // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
     //
     // This template allows to make the endpoints generation more flexible, the template exposes the following params:
     //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
-    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `routes`.
     //  3. {{=it.port}}: will use the `port` from this very same configuration file.
     ,resources_url_templates: {
-        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map'
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
+        https: 'https://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map'
     }
 
     // Maximum number of connections for one process
@@ -91,7 +92,7 @@ var config = {
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
-    //,log_filename: 'logs/node-windshaft.log'
+    ,log_filename: 'logs/node-windshaft.log'
     // Templated database username for authorized user
     // Supported labels: 'user_id' (read from redis)
     ,postgres_auth_user: 'test_windshaft_cartodb_user_<%= user_id %>'
@@ -114,12 +115,12 @@ var config = {
             reapInterval: 1000
         }
     }
-    ,mapnik_version: ''
+    ,mapnik_version: undefined
     ,mapnik_tile_format: 'png8:m=h'
     ,statsd: {
         host: 'localhost',
         port: 8125,
-        prefix: 'test.:host.',
+        prefix: 'test.:host.', // could be hostname, better not containing dots
         cacheDns: true
         // support all allowed node-statsd options
     }
@@ -131,15 +132,7 @@ var config = {
         //If enabled, MVTs will be generated with PostGIS directly, instead of using Mapnik,
         //PostGIS 2.4 is required for this to work
         //If disabled it will use Mapnik MVT generation
-        usePostGIS: false,
-        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
-          }
+        usePostGIS: false
       },
       mapnik: {
           // The size of the pool of internal mapnik backend
@@ -234,7 +227,12 @@ var config = {
           'cache-features': true,
 
           // Require metrics to the renderer
-          metrics: false
+          metrics: false,
+
+          // Options for markers attributes, ellipses and images caches
+          markers_symbolizer_caches: {
+              disabled: false
+          }
       },
       http: {
           timeout: 2000, // the timeout in ms for a http tile request
@@ -273,7 +271,7 @@ var config = {
             // If filename is given logs comming from analysis client  will be written
             // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
             // Log file will be re-opened on receiving the HUP signal
-            filename: 'node-windshaft.log'
+            filename: 'logs/node-windshaft-analysis.log'
         },
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
@@ -343,6 +341,12 @@ var config = {
     // X-Tiler-Profile header containing elapsed timing for various
     // steps taken for producing the response.
     ,useProfiler:true
+    ,serverMetadata: {
+      cdn_url: {
+        http: undefined,
+        https: undefined
+      }
+    }
     // Settings for the health check available at /health
     ,health: {
       enabled: false,

From de3dbb8c1ee50d3b169c9cc0b4d079c3ff4700a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 4 Jun 2018 15:22:32 +0200
Subject: [PATCH 02/15] Missing attribute twkb_encoding set to true

---
 config/environments/development.js.example | 3 ++-
 config/environments/production.js.example  | 3 ++-
 config/environments/staging.js.example     | 3 ++-
 config/environments/test.js.example        | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 36bd3fe7..bc106248 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -207,7 +207,8 @@ var config = {
                persist_connection: false,
                simplify_geometries: true,
                use_overviews: true, // use overviews to retrieve raster
-               max_size: 500
+               max_size: 500,
+               twkb_encoding: true
           },
 
           limits: {
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index a092ca03..c423c9f9 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -206,7 +206,8 @@ var config = {
                persist_connection: false,
                simplify_geometries: true,
                use_overviews: true, // use overviews to retrieve raster
-               max_size: 500
+               max_size: 500,
+               twkb_encoding: true
           },
 
           limits: {
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index e6f7e5fa..9927bbc1 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -206,7 +206,8 @@ var config = {
                persist_connection: false,
                simplify_geometries: true,
                use_overviews: true, // use overviews to retrieve raster
-               max_size: 500
+               max_size: 500,
+               twkb_encoding: true
           },
 
           limits: {
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index a3ee9aba..0cbb63f8 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -206,7 +206,8 @@ var config = {
                persist_connection: false,
                simplify_geometries: true,
                use_overviews: true, // use overviews to retrieve raster
-               max_size: 500
+               max_size: 500,
+               twkb_encoding: true
           },
 
           limits: {

From 13b23d9ec949f8e64042eea4b767dbd1f6af2d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 11:14:13 +0200
Subject: [PATCH 03/15] Revert change, comment log file configuration again

---
 config/environments/test.js.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 0cbb63f8..fda3a5ce 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -92,7 +92,7 @@ var config = {
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
-    ,log_filename: 'logs/node-windshaft.log'
+    //,log_filename: 'logs/node-windshaft.log'
     // Templated database username for authorized user
     // Supported labels: 'user_id' (read from redis)
     ,postgres_auth_user: 'test_windshaft_cartodb_user_<%= user_id %>'

From 6e9871ba4ee628134dc9b60bf718abfbea843a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 11:24:34 +0200
Subject: [PATCH 04/15] Revert change: comment analysis logger filename

---
 config/environments/test.js.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index fda3a5ce..449db82c 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -272,7 +272,7 @@ var config = {
             // If filename is given logs comming from analysis client  will be written
             // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
             // Log file will be re-opened on receiving the HUP signal
-            filename: 'logs/node-windshaft-analysis.log'
+            // filename: 'logs/node-windshaft-analysis.log'
         },
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.

From 6d0c38371ad43d76c23c35e9a4c339681d1bcc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 11:28:42 +0200
Subject: [PATCH 05/15] Do not log date twice

---
 config/environments/development.js.example | 2 +-
 config/environments/production.js.example  | 2 +-
 config/environments/staging.js.example     | 2 +-
 config/environments/test.js.example        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index bc106248..8df9bf5d 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -88,7 +88,7 @@ var config = {
     ,socket_timeout: 600000
     ,enable_cors: true
     ,cache_enabled: true
-    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
+    ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index c423c9f9..6364d5af 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -88,7 +88,7 @@ var config = {
     ,socket_timeout: 600000
     ,enable_cors: true
     ,cache_enabled: true
-    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
+    ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 9927bbc1..2ecdcf17 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -88,7 +88,7 @@ var config = {
     ,socket_timeout: 600000
     ,enable_cors: true
     ,cache_enabled: true
-    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
+    ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 449db82c..88be5d80 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -88,7 +88,7 @@ var config = {
     ,socket_timeout: 600000
     ,enable_cors: true
     ,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]) (:res[X-Tiler-Errors])'
+    ,log_format: ':req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler]) (:res[X-Tiler-Errors])'
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal

From 22da5a1ff0a305099344632a45e3086832379f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 11:35:42 +0200
Subject: [PATCH 06/15] Mapnik renderer: do not cache features

---
 config/environments/test.js.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 88be5d80..489cd3c9 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -225,7 +225,7 @@ var config = {
 
           // If enabled Mapnik will reuse the features retrieved from the database
           // instead of requesting them once per style inside a layer
-          'cache-features': true,
+          'cache-features': false,
 
           // Require metrics to the renderer
           metrics: false,

From fcaab30fe748d607a9821f45652e73159158988c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 11:51:55 +0200
Subject: [PATCH 07/15] Enable cahce-features and disable twkb for test
 environment

---
 config/environments/test.js.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 489cd3c9..0e5c5a3e 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -207,7 +207,7 @@ var config = {
                simplify_geometries: true,
                use_overviews: true, // use overviews to retrieve raster
                max_size: 500,
-               twkb_encoding: true
+               twkb_encoding: false
           },
 
           limits: {
@@ -225,7 +225,7 @@ var config = {
 
           // If enabled Mapnik will reuse the features retrieved from the database
           // instead of requesting them once per style inside a layer
-          'cache-features': false,
+          'cache-features': true,
 
           // Require metrics to the renderer
           metrics: false,

From e0ab901600091deafa4bcd882a13a8974a0bb40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 12:03:26 +0200
Subject: [PATCH 08/15] Disable cache-features for test environment

---
 config/environments/test.js.example | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 0e5c5a3e..2a522002 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -92,7 +92,7 @@ var config = {
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
-    //,log_filename: 'logs/node-windshaft.log'
+    ,log_filename: '/tmp/node-windshaft.log'
     // Templated database username for authorized user
     // Supported labels: 'user_id' (read from redis)
     ,postgres_auth_user: 'test_windshaft_cartodb_user_<%= user_id %>'
@@ -225,7 +225,7 @@ var config = {
 
           // If enabled Mapnik will reuse the features retrieved from the database
           // instead of requesting them once per style inside a layer
-          'cache-features': true,
+          'cache-features': false,
 
           // Require metrics to the renderer
           metrics: false,
@@ -272,7 +272,7 @@ var config = {
             // If filename is given logs comming from analysis client  will be written
             // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
             // Log file will be re-opened on receiving the HUP signal
-            // filename: 'logs/node-windshaft-analysis.log'
+            filename: '/tmp/node-windshaft-analysis.log'
         },
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.

From 9ec3325cd00d9468cee9d4dc737ba2effbe034b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 5 Jun 2018 15:10:52 +0200
Subject: [PATCH 09/15] Remove duplicated comments

---
 config/environments/development.js.example | 2 --
 config/environments/production.js.example  | 2 --
 config/environments/staging.js.example     | 2 --
 config/environments/test.js.example        | 2 --
 4 files changed, 8 deletions(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 8df9bf5d..4d108ca8 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -100,8 +100,6 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
-        // Parameters to pass to datasource plugin of mapnik
-        // See http://github.com/mapnik/mapnik/wiki/PostGIS
         user: "test_windshaft_publicuser",
         user: "publicuser",
         password: "public",
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index 6364d5af..8e071acf 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -100,8 +100,6 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
-        // Parameters to pass to datasource plugin of mapnik
-        // See http://github.com/mapnik/mapnik/wiki/PostGIS
         user: "publicuser",
         password: "public",
         host: '127.0.0.1',
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 2ecdcf17..60301a94 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -100,8 +100,6 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
-        // Parameters to pass to datasource plugin of mapnik
-        // See http://github.com/mapnik/mapnik/wiki/PostGIS
         user: "publicuser",
         password: "public",
         host: '127.0.0.1',
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 2a522002..d106995e 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -100,8 +100,6 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: 'test_windshaft_cartodb_user_<%= user_id %>_pass'
     ,postgres: {
-        // Parameters to pass to datasource plugin of mapnik
-        // See http://github.com/mapnik/mapnik/wiki/PostGIS
         user: "test_windshaft_publicuser",
         password: "public",
         host: '127.0.0.1',

From db946b93ec6c8b8c9026f66cdc786cbe7050bb0a Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Wed, 6 Jun 2018 13:18:24 +0200
Subject: [PATCH 10/15] Test: Use cartodb-psql to reset connections instead of
 calling node-postgres directly

- Avoids an issue with newer npm not finding node-postgres during the tests
as it was required directly but not declared in package.json.
- Avoids an issue with the torque timeouts tests
---
 test/support/test-client.js | 6 +++---
 test/support/test_helper.js | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/test/support/test-client.js b/test/support/test-client.js
index 2a5840f5..db014c9a 100644
--- a/test/support/test-client.js
+++ b/test/support/test-client.js
@@ -1268,9 +1268,6 @@ TestClient.prototype.setUserDatabaseTimeoutLimit = function (timeoutLimit, callb
     const dbuser = _.template(global.environment.postgres_auth_user, { user_id: 1 });
     const publicuser = global.environment.postgres.user;
 
-    // we need to guarantee all new connections have the new settings
-    helper.cleanPGPoolConnections();
-
     const psql = new PSQL({
         user: 'postgres',
         dbname: dbname,
@@ -1278,6 +1275,9 @@ TestClient.prototype.setUserDatabaseTimeoutLimit = function (timeoutLimit, callb
         port: global.environment.postgres.port
     });
 
+    // we need to guarantee all new connections have the new settings
+    psql.end();
+
     step(
         function configureTimeouts () {
             const timeoutSQLs = [
diff --git a/test/support/test_helper.js b/test/support/test_helper.js
index 48c764a4..65569d78 100644
--- a/test/support/test_helper.js
+++ b/test/support/test_helper.js
@@ -13,7 +13,6 @@ var lzmaWorker = new LZMA();
 
 var redis = require('redis');
 var log4js = require('log4js');
-var pg = require('pg');
 const setICUEnvVariable = require('../../lib/cartodb/utils/icu_data_env_setter');
 
 // set environment specific variables
@@ -148,11 +147,6 @@ afterEach(function(done) {
     });
 });
 
-function cleanPGPoolConnections () {
-    // TODO: this method will be replaced by psql.end
-    pg.end();
-}
-
 function deleteRedisKeys(keysToDelete, callback) {
 
     if (Object.keys(keysToDelete).length === 0) {
@@ -215,6 +209,5 @@ module.exports = {
   checkSurrogateKey: checkSurrogateKey,
   checkCache: checkCache,
   rmdirRecursiveSync: rmdirRecursiveSync,
-  configureMetadata,
-  cleanPGPoolConnections
+  configureMetadata
 };

From 102244f46717b3616fb8e11a846b2bf5e1076752 Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Wed, 6 Jun 2018 13:50:11 +0200
Subject: [PATCH 11/15] Regression: Accept layer option in the static map urls

---
 docs/static_maps_api.md                       |  5 ++++-
 .../map-store-map-config-provider.js          |  5 +++--
 test/acceptance/analysis/named-maps.js        | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/docs/static_maps_api.md b/docs/static_maps_api.md
index 34e4e907..554f892d 100644
--- a/docs/static_maps_api.md
+++ b/docs/static_maps_api.md
@@ -11,7 +11,7 @@ Begin by instantiating either a Named or Anonymous Map using the `layergroupid t
 #### Definition
 
 ```bash
-GET /api/v1/map/static/center/{token}/{z}/{lat}/{lng}/{width}/{height}.{format}
+GET /api/v1/map/static/center/{token}/{z}/{lat}/{lng}/{width}/{height}.{format}{{?}extra_options}
 ```
 
 #### Params
@@ -58,6 +58,9 @@ Note: you can see this endpoint as
 GET /api/v1/map/static/bbox/{token}/{west},{south},{east},{north}/{width}/{height}.{format}`
 ```
 
+#### Extra options
+ * Layer: List of layers to be shown in the image (by default `all`), for example `?layer=0,1`.
+
 ### Named Map
 
 #### Definition
diff --git a/lib/cartodb/api/middlewares/map-store-map-config-provider.js b/lib/cartodb/api/middlewares/map-store-map-config-provider.js
index 58cdb79e..a5b4b1f6 100644
--- a/lib/cartodb/api/middlewares/map-store-map-config-provider.js
+++ b/lib/cartodb/api/middlewares/map-store-map-config-provider.js
@@ -10,12 +10,13 @@ module.exports = function createMapStoreMapConfigProvider (
     return function createMapStoreMapConfigProviderMiddleware (req, res, next) {
         const { user, token, cache_buster, api_key } = res.locals;
         const { dbuser, dbname, dbpassword, dbhost, dbport } = res.locals;
-        const { layer, z, x, y, scale_factor, format } = req.params;
+        const { layer: layerFromParams, z, x, y, scale_factor, format } = req.params;
+        const { layer: layerFromQuery } = req.query;
 
         const params = {
             user, token, cache_buster, api_key,
             dbuser, dbname, dbpassword, dbhost, dbport,
-            layer, z, x, y, scale_factor, format
+            layer: (layerFromQuery || layerFromParams), z, x, y, scale_factor, format
         };
 
         if (forcedFormat) {
diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js
index 98316d2d..5172b110 100644
--- a/test/acceptance/analysis/named-maps.js
+++ b/test/acceptance/analysis/named-maps.js
@@ -261,6 +261,27 @@ describe('named-maps analysis', function() {
             );
         });
 
+        it('should fail to retrieve static map preview via layergroup ' +
+           'when filtering by invalid layers', function(done) {
+            assert.response(
+                server,
+                {
+                    url: '/api/v1/map/static/center/' + layergroupid + '/4/42/-3/320/240.png?layer=1',
+                    method: 'GET',
+                    encoding: 'binary',
+                    headers: {
+                        host: username
+                    }
+                },
+                {
+                    status: 400
+                },
+                function(res, err) {
+                    done(err);
+                }
+            );
+        });
+
         it('should return and an error requesting unsupported image format', function(done) {
             assert.response(
                 server,

From 70e8ab8349d00eeaee5654c546de2877dbe6cf3d Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Wed, 6 Jun 2018 13:50:19 +0200
Subject: [PATCH 12/15] Update NEWs

---
 NEWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.md b/NEWS.md
index fb2d8ea2..2aa7f849 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -39,6 +39,7 @@ Bug Fixes:
 - Static maps fails for unsupported formats
 - Handling errors extracting the column type on dataviews
 - Fix `meta.stats.estimatedFeatureCount` for aggregations and queries with tokens
+- Static maps filters correctly if `layer` option is passed in the url.
 
 ## 6.1.0
 Released 2018-04-16

From fae6bdff055ae87cf3830d6a47225b7798844b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Thu, 7 Jun 2018 16:33:52 +0200
Subject: [PATCH 13/15] Remove duplicated property

---
 config/environments/development.js.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 4d108ca8..87c98032 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -100,7 +100,6 @@ var config = {
     // Supported labels: 'user_id', 'user_password' (both read from redis)
     ,postgres_auth_pass: '<%= user_password %>'
     ,postgres: {
-        user: "test_windshaft_publicuser",
         user: "publicuser",
         password: "public",
         host: '127.0.0.1',

From c6a74b66ce6946337b6031f607fee2fc4c0d965f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 8 Jun 2018 13:46:42 +0200
Subject: [PATCH 14/15] Use external module to get full qualified domain name
 properly

---
 lib/cartodb/server_options.js |  5 ++---
 package.json                  |  1 +
 yarn.lock                     | 26 +++++++++++++++-----------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index dff1280e..78036f0d 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -1,4 +1,4 @@
-var os = require('os');
+const fqdn = require('@carto/fqdn-sync');
 var _ = require('underscore');
 var OverviewsQueryRewriter = require('./utils/overviews_query_rewriter');
 
@@ -36,8 +36,7 @@ rendererConfig.mapnik.queryRewriter = overviewsQueryRewriter;
 // See https://github.com/CartoDB/Windshaft-cartodb/issues/153
 if (global.environment.statsd) {
     if (global.environment.statsd.prefix) {
-        var host_token = os.hostname().split('.').reverse().join('.');
-        global.environment.statsd.prefix = global.environment.statsd.prefix.replace(/:host/, host_token);
+        global.environment.statsd.prefix = global.environment.statsd.prefix.replace(/:host/, fqdn.reverse());
     }
 }
 
diff --git a/package.json b/package.json
index 488b59c3..38eb91d7 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "Simon Martin <simon@carto.com>"
   ],
   "dependencies": {
+    "@carto/fqdn-sync": "0.2.1",
     "basic-auth": "2.0.0",
     "body-parser": "1.18.3",
     "camshaft": "0.61.10",
diff --git a/yarn.lock b/yarn.lock
index 4f98787a..fd0224c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,10 @@
 # yarn lockfile v1
 
 
+"@carto/fqdn-sync@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@carto/fqdn-sync/-/fqdn-sync-0.2.1.tgz#cd7428380c4411d523ff8f228f77affb25a5d0be"
+
 "@carto/mapnik@3.6.2-carto.10":
   version "3.6.2-carto.10"
   resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.10.tgz#a97c951dcdac09d0eb35b3ea71e5eeaa206c1af6"
@@ -11,7 +15,7 @@
     node-pre-gyp "0.10.0"
     protozero "1.5.1"
 
-"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb9":
+"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb9":
   version "2.5.1-cdb9"
   resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/5129e43223cb55daed31373c7a36c98eb6178fc1"
   dependencies:
@@ -23,7 +27,7 @@
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2"
 
-"abaculus@github:cartodb/abaculus#2.0.3-cdb10":
+abaculus@cartodb/abaculus#2.0.3-cdb10:
   version "2.0.3-cdb10"
   resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/90d537028bb8af8a35e7a40c46493066dd8a76b3"
   dependencies:
@@ -272,7 +276,7 @@ camshaft@0.61.10:
     dot "^1.0.3"
     request "2.85.0"
 
-"canvas@github:cartodb/node-canvas#1.6.2-cdb2":
+canvas@cartodb/node-canvas#1.6.2-cdb2:
   version "1.6.2-cdb2"
   resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766"
   dependencies:
@@ -290,17 +294,17 @@ carto@0.16.3:
     semver "^5.1.0"
     yargs "^4.2.0"
 
-carto@cartodb/carto#master:
-  version "0.15.1"
-  resolved "https://codeload.github.com/cartodb/carto/tar.gz/31abb8bee02df605521247b0223d508320f7d4c8"
+carto@cartodb/carto#0.15.1-cdb3:
+  version "0.15.1-cdb3"
+  resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
   dependencies:
     mapnik-reference "~6.0.2"
     optimist "~0.6.0"
     underscore "1.8.3"
 
-"carto@github:cartodb/carto#0.15.1-cdb3":
-  version "0.15.1-cdb3"
-  resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
+carto@cartodb/carto#master:
+  version "0.15.1"
+  resolved "https://codeload.github.com/cartodb/carto/tar.gz/31abb8bee02df605521247b0223d508320f7d4c8"
   dependencies:
     mapnik-reference "~6.0.2"
     optimist "~0.6.0"
@@ -1885,7 +1889,7 @@ pg-types@1.*:
     postgres-date "~1.0.0"
     postgres-interval "^1.1.0"
 
-"pg@github:CartoDB/node-postgres#6.4.2-cdb1":
+pg@CartoDB/node-postgres#6.4.2-cdb1:
   version "6.4.2"
   resolved "https://codeload.github.com/CartoDB/node-postgres/tar.gz/449fac1d6da711ffcc6694ae3c89f85244f48bdc"
   dependencies:
@@ -2614,7 +2618,7 @@ through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb14":
+tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb14:
   version "0.6.18-cdb14"
   resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/6d06f728833d3e34d1adcd05567b3f4379f547bb"
   dependencies:

From 2bf8caf7fc2ae4caae1e903bb19a39d8f4275ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 8 Jun 2018 14:41:31 +0200
Subject: [PATCH 15/15] Update fqdn-sync to version 0.2.2

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 38eb91d7..e83da139 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "Simon Martin <simon@carto.com>"
   ],
   "dependencies": {
-    "@carto/fqdn-sync": "0.2.1",
+    "@carto/fqdn-sync": "0.2.2",
     "basic-auth": "2.0.0",
     "body-parser": "1.18.3",
     "camshaft": "0.61.10",
diff --git a/yarn.lock b/yarn.lock
index fd0224c4..2f715af0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@carto/fqdn-sync@0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@carto/fqdn-sync/-/fqdn-sync-0.2.1.tgz#cd7428380c4411d523ff8f228f77affb25a5d0be"
+"@carto/fqdn-sync@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@carto/fqdn-sync/-/fqdn-sync-0.2.2.tgz#cd7c645ed66690a09249b554d254a0f53963b2dc"
 
 "@carto/mapnik@3.6.2-carto.10":
   version "3.6.2-carto.10"