From f95c310462a56e44e5761b6ae56cc60231aef4c5 Mon Sep 17 00:00:00 2001
From: Javier Goizueta <jgoizueta@gmail.com>
Date: Thu, 14 Dec 2017 17:03:49 +0100
Subject: [PATCH] Redefine aggregation torque to match Torque

Now the resolution aggregation parameter has the same meaning as in Torque (-torque-resolution in CartoCSS)
---
 lib/cartodb/models/aggregation/aggregation-query.js | 5 +++--
 lib/cartodb/models/aggregation/aggregation.js       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/cartodb/models/aggregation/aggregation-query.js b/lib/cartodb/models/aggregation/aggregation-query.js
index 332241d8..6dd5a165 100644
--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -19,13 +19,14 @@ const templateForOptions = (options) => {
 /**
  * Generates an aggregation query given the aggregation options:
  * - query
- * - resolution
+ * - resolution - defined as in torque:
+ *   aggregation cell is resolution*resolution pixels, where tiles are always 256x256 pixels
  * - columns
  * - placement
  */
 const queryForOptions = (options) => templateForOptions(options)({
     sourceQuery: options.query,
-    res: options.resolution,
+    res: 256/options.resolution,
     columns: options.columns
 });
 
diff --git a/lib/cartodb/models/aggregation/aggregation.js b/lib/cartodb/models/aggregation/aggregation.js
index 447740b4..d95b74cd 100644
--- a/lib/cartodb/models/aggregation/aggregation.js
+++ b/lib/cartodb/models/aggregation/aggregation.js
@@ -6,7 +6,7 @@ module.exports = class Aggregation {
     }
 
     constructor (mapconfig, query, {
-        resolution = 256,
+        resolution = 1,
         threshold = Aggregation.THRESHOLD,
         placement = 'centroid',
         columns = {}