From 43e1de31fa2c4c0031b10699651040189771be10 Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Tue, 30 Jan 2018 17:19:43 +0100
Subject: [PATCH] Add Mapnik 'cache-features' option

---
 NEWS.md                                    | 2 ++
 config/environments/development.js.example | 6 +++++-
 config/environments/production.js.example  | 6 +++++-
 config/environments/staging.js.example     | 6 +++++-
 config/environments/test.js.example        | 7 ++++++-
 package.json                               | 2 +-
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 07ce7c4b..86b0177b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,8 @@
 ## 5.1.1
 Released yyyy-mm-dd
 
+Announcements:
+ - Upgrade windshaft to [4.3.2](https://github.com/CartoDB/windshaft/releases/tag/4.3.2) adding support for cache-features' in Mapnik/CartoDB layers.
 
 ## 5.1.0
 Released 2018-01-30
diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 55cda5ba..644fea48 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -204,7 +204,11 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
 
       },
       http: {
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index 3904d46e..db18d93c 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -198,7 +198,11 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
 
       },
       http: {
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 15031991..b478ca80 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -198,7 +198,11 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
 
       },
       http: {
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 43ebf844..776166e5 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -197,7 +197,12 @@ var config = {
               // which cost is no more expensive than snapping and results are
               // much closer to the original geometry
               removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true
+
       },
       http: {
           timeout: 2000, // the timeout in ms for a http tile request
diff --git a/package.json b/package.json
index d1be2a7b..0dfeeea5 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "step-profiler": "~0.3.0",
     "turbo-carto": "0.20.2",
     "underscore": "~1.6.0",
-    "windshaft": "4.3.1",
+    "windshaft": "4.3.2",
     "yargs": "~5.0.0"
   },
   "devDependencies": {