From 170fcc1973643ec85fe20eaa8627cef5a3e2760e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 18 Dec 2017 17:38:16 +0100
Subject: [PATCH] Move static methods

---
 .../models/aggregation/aggregation-map-config.js  | 15 +++++++++++++--
 lib/cartodb/models/aggregation/aggregation.js     | 15 ++-------------
 .../adapter/aggregation-mapconfig-adapter.js      |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/cartodb/models/aggregation/aggregation-map-config.js b/lib/cartodb/models/aggregation/aggregation-map-config.js
index 284ee2a2..d0e5bffb 100644
--- a/lib/cartodb/models/aggregation/aggregation-map-config.js
+++ b/lib/cartodb/models/aggregation/aggregation-map-config.js
@@ -1,7 +1,18 @@
 const MapConfig = require('windshaft').model.MapConfig;
-const Aggregation = require('./aggregation');
 
 module.exports = class AggregationMapConfig extends MapConfig {
+    static get THRESHOLD () {
+        return 1e5; // 100K
+    }
+
+    static get PLACEMENTS () {
+        return [
+            'centroid',
+            'point-grid',
+            'point-sample'
+        ];
+    }
+
     constructor (config, datasource) {
         super(config, datasource);
 
@@ -52,7 +63,7 @@ module.exports = class AggregationMapConfig extends MapConfig {
     validate () {
         const validate = aggregationValidator(this);
         const numberValidator = createNumberValidator(this);
-        const includesValidPlacementsValidator = createIncludesValueValidator(this, Aggregation.PLACEMENTS);
+        const includesValidPlacementsValidator = createIncludesValueValidator(this, AggregationMapConfig.PLACEMENTS);
 
         validate('resolution', numberValidator);
         validate('placement', includesValidPlacementsValidator);
diff --git a/lib/cartodb/models/aggregation/aggregation.js b/lib/cartodb/models/aggregation/aggregation.js
index b916ffa2..e6c0f9a8 100644
--- a/lib/cartodb/models/aggregation/aggregation.js
+++ b/lib/cartodb/models/aggregation/aggregation.js
@@ -1,21 +1,10 @@
 const aggregationQuery = require('./aggregation-query');
+const AggregationMapConfig = require('./aggregation-map-config');
 
 module.exports = class Aggregation {
-    static get THRESHOLD() {
-        return 1e5; // 100K
-    }
-
-    static get PLACEMENTS() {
-        return [
-            'centroid',
-            'point-grid',
-            'point-sample'
-        ];
-    }
-
     constructor (mapconfig, query, {
         resolution = 1,
-        threshold = Aggregation.THRESHOLD,
+        threshold = AggregationMapConfig.THRESHOLD,
         placement = 'centroid',
         columns = {},
         dimensions = {}
diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index cbbcd50f..73247b42 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -123,7 +123,7 @@ module.exports = class AggregationMapConfigAdapter {
 
             const threshold = layer.options.aggregation && layer.options.aggregation.threshold ?
                 layer.options.aggregation.threshold :
-                Aggregation.THRESHOLD;
+                AggregationMapConfig.THRESHOLD;
 
             if (estimatedFeatureCount < threshold) {
                 return callback(null, shouldAdapt);