From 5573db2bc1d016b26c84b175cd709904553eda1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 19 Oct 2018 11:57:54 +0200
Subject: [PATCH] Do not use Object.assign as _.defautls equivalent

---
 .../mapconfig/provider/map-store-provider.js  | 10 ++------
 .../mapconfig/provider/named-map-provider.js  | 23 ++++++++++---------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/lib/cartodb/models/mapconfig/provider/map-store-provider.js b/lib/cartodb/models/mapconfig/provider/map-store-provider.js
index abc9eca2..b3210298 100644
--- a/lib/cartodb/models/mapconfig/provider/map-store-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/map-store-provider.js
@@ -72,14 +72,8 @@ module.exports = class MapStoreMapConfigProvider extends BaseMapConfigProvider {
     }
 
     createKey (base) {
-        const tplValues = Object.assign({
-            dbname: '',
-            token: '',
-            dbuser: '',
-            format: '',
-            layer: '',
-            scale_factor: 1
-        }, this.params);
+        const { dbname = '', token = '', dbuser = '', format = '', layer = '', scale_factor = 1 } = this.params;
+        const tplValues = { dbname, token, dbuser, format, layer, scale_factor };
 
         return (base) ? baseKeyTpl(tplValues) : rendererKeyTpl(tplValues);
     }
diff --git a/lib/cartodb/models/mapconfig/provider/named-map-provider.js b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
index 12a41f43..ee0e0bd2 100644
--- a/lib/cartodb/models/mapconfig/provider/named-map-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
@@ -232,15 +232,16 @@ module.exports = class NamedMapMapConfigProvider extends BaseMapConfigProvider {
     }
 
     createKey (base) {
-        const tplValues = Object.assign({
-            dbname: '',
-            user: this.user,
-            templateName: this.templateName,
-            authToken: this.authToken || '',
-            configHash: configHash(this.config),
-            layer: '',
-            scale_factor: 1
-        }, this.params);
+        const {
+            dbname = '',
+            user = this.user,
+            templateName = this.templateName,
+            authToken = this.authToken || '',
+            configHash = createConfigHash(this.config),
+            layer = '',
+            scale_factor = 1
+        } = this.params;
+        const tplValues = { dbname, user, templateName, authToken, configHash, layer, scale_factor };
 
         return (base) ? baseKeyTpl(tplValues) : rendererKeyTpl(tplValues);
     }
@@ -268,7 +269,7 @@ module.exports = class NamedMapMapConfigProvider extends BaseMapConfigProvider {
     }
 };
 
-function configHash(config) {
+function createConfigHash(config) {
     if (!config) {
         return '';
     }
@@ -276,4 +277,4 @@ function configHash(config) {
     return crypto.createHash('md5').update(JSON.stringify(config)).digest('hex').substring(0,8);
 }
 
-module.exports.configHash = configHash;
+module.exports.configHash = createConfigHash;