Merge pull request #1427 from CartoDB/develop

Release v1.4.4
CartoDB · Jan 2, 2020 · 1bd06d0 · 1bd06d0
2 parents 3222c66 + f3270a0
commit 1bd06d0
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.4.4] 2020-02-01
+
+### Changed
+- Remove 'color' key in legend data
+
 ## [1.4.3] 2019-26-12
 
 ### Fixed

diff --git a/src/renderer/viz/expressions/color/CIELab.js b/src/renderer/viz/expressions/color/CIELab.js
@@ -62,7 +62,7 @@ export default class CIELab extends BaseExpression {
     getLegendData () {
         const name = 'color';
         const value = this.value;
-        const key = 'color';
+        const key = '';
         const data = [{ key, value }];
 
         return { name, data };

diff --git a/src/renderer/viz/expressions/color/NamedColor.js b/src/renderer/viz/expressions/color/NamedColor.js
@@ -56,7 +56,7 @@ export default class NamedColor extends BaseExpression {
     getLegendData () {
         const name = 'color';
         const value = this.color;
-        const key = 'color';
+        const key = '';
         const data = [{ key, value }];
 
         return { name, data };

diff --git a/src/renderer/viz/expressions/color/hex.js b/src/renderer/viz/expressions/color/hex.js
@@ -59,7 +59,7 @@ export default class Hex extends BaseExpression {
     getLegendData () {
         const name = 'color';
         const value = this.value;
-        const key = 'color';
+        const key = '';
         const data = [{ key, value }];
 
         return { name, data };

diff --git a/src/renderer/viz/expressions/color/hsl.js b/src/renderer/viz/expressions/color/hsl.js
@@ -96,7 +96,7 @@ function genHSL (name, alpha = null) {
         getLegendData () {
             const name = 'color';
             const value = this.value;
-            const key = 'color';
+            const key = '';
             const data = [{ key, value }];
 
             return { name, data };

diff --git a/src/renderer/viz/expressions/color/hsv.js b/src/renderer/viz/expressions/color/hsv.js
@@ -122,7 +122,7 @@ function genHSV (name, alpha) {
         getLegendData () {
             const name = 'color';
             const value = this.value;
-            const key = 'color';
+            const key = '';
             const data = [{ key, value }];
 
             return { name, data };

diff --git a/src/renderer/viz/expressions/color/rgb.js b/src/renderer/viz/expressions/color/rgb.js
@@ -92,7 +92,7 @@ function genRGB (name, alpha) {
         getLegendData () {
             const name = 'color';
             const value = this.value;
-            const key = 'color';
+            const key = '';
             const data = [{ key, value }];
 
             return { name, data };

diff --git a/test/unit/renderer/viz/expressions/color/Opacity.test.js b/test/unit/renderer/viz/expressions/color/Opacity.test.js
@@ -34,7 +34,7 @@ describe('src/renderer/viz/expressions/opacity', () => {
             const expected = {
                 name: 'color',
                 data: [{
-                    key: 'color',
+                    key: '',
                     value: {
                         r: 0,
                         g: 0,
@@ -52,7 +52,7 @@ describe('src/renderer/viz/expressions/opacity', () => {
             const expected = {
                 name: 'color',
                 data: [{
-                    key: 'color',
+                    key: '',
                     value: {
                         r: 255,
                         g: 1,
@@ -70,7 +70,7 @@ describe('src/renderer/viz/expressions/opacity', () => {
             const expected = {
                 name: 'color',
                 data: [{
-                    key: 'color',
+                    key: '',
                     value: {
                         r: 0,
                         g: 0.9999316244751483,
@@ -88,7 +88,7 @@ describe('src/renderer/viz/expressions/opacity', () => {
             const expected = {
                 name: 'color',
                 data: [{
-                    key: 'color',
+                    key: '',
                     value: {
                         r: 0,
                         g: 10.20000000000001,
@@ -106,7 +106,7 @@ describe('src/renderer/viz/expressions/opacity', () => {
             const expected = {
                 name: 'color',
                 data: [{
-                    key: 'color',
+                    key: '',
                     value: {
                         r: 255,
                         g: 255,
@@ -124,7 +124,7 @@ describe('src/renderer/viz/expressions/opacity', () => {
             const expected = {
                 name: 'color',
                 data: [{
-                    key: 'color',
+                    key: '',
                     value: {
                         r: 250,
                         g: 186,