From a0e71ac39611d19d681ef536b678ea743b8736a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 15 Oct 2018 15:50:48 +0200
Subject: [PATCH] Upgrade windshaft to version 4.11.0

---
 NEWS.md      |  4 +++-
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 22e726b2..2b0ea646 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,10 +1,12 @@
 # Changelog
 
 ## 6.5.0
-Released 2018-10-dd
+Released 2018-mm-dd
 
 New features
 - Aggregation time dimensions
+- Use overviews query rewriter for mvt-renderer. Upgrades Windshaft to [4.11.0](https://github.com/CartoDB/Windshaft/blob/4.11.0/NEWS.md#version-4110)
+  - `pg-mvt`: Use `query-rewriter` to compose the query to render a MVT tile. If not defined, it will use a Default Query Rewriter..
 
 ## 6.4.0
 Released 2018-09-24
diff --git a/package.json b/package.json
index 764874e8..28680221 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "0.20.4",
     "underscore": "1.6.0",
-    "windshaft": "cartodb/windshaft#mvt-query-rewrite",
+    "windshaft": "4.11.0",
     "yargs": "11.1.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index c6d0e33a..8590f00a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,7 +14,7 @@
     nan "2.10.0"
     node-pre-gyp "0.10.0"
 
-"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb10":
+"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb10":
   version "2.5.1-cdb10"
   resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/118ac7e7f6582ac7be0fc0246ea2afd1a7795a43"
   dependencies:
@@ -26,7 +26,7 @@
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2"
 
-abaculus@cartodb/abaculus#2.0.3-cdb11:
+"abaculus@github:cartodb/abaculus#2.0.3-cdb11":
   version "2.0.3-cdb11"
   resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/b2d4dce48c50fefc5b06f21c6365d82ccf75358d"
   dependencies:
@@ -279,7 +279,7 @@ camshaft@0.62.3:
     dot "^1.0.3"
     request "2.85.0"
 
-canvas@cartodb/node-canvas#1.6.2-cdb2:
+"canvas@github:cartodb/node-canvas#1.6.2-cdb2":
   version "1.6.2-cdb2"
   resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766"
   dependencies:
@@ -297,7 +297,7 @@ carto@0.16.3:
     semver "^5.1.0"
     yargs "^4.2.0"
 
-carto@cartodb/carto#0.15.1-cdb3:
+"carto@github:cartodb/carto#0.15.1-cdb3":
   version "0.15.1-cdb3"
   resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
   dependencies:
@@ -2701,7 +2701,7 @@ through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb15:
+"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb15":
   version "0.6.18-cdb15"
   resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/b6c1404a9e37fc60e545d977081867a86eb42b2b"
   dependencies:
@@ -2891,9 +2891,9 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
-windshaft@cartodb/windshaft#mvt-query-rewrite:
-  version "4.10.1"
-  resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/f046ec73aa8d17e3d6b0b099151dec2da3c6878e"
+windshaft@4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.11.0.tgz#4ab6e3a83121a6cd655f1988a1246e049a8fbbd7"
   dependencies:
     "@carto/mapnik" "3.6.2-carto.11"
     "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb10