From 7cf433eb68532d07220ce0c9fc22c5329ad81da7 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Mar 2016 09:03:49 -0700 Subject: [PATCH 1/6] Remove unused ol.color.blend() --- src/ol/color/color.js | 42 -------------------------------------- test/spec/ol/color.test.js | 27 ------------------------ 2 files changed, 69 deletions(-) diff --git a/src/ol/color/color.js b/src/ol/color/color.js index 183cf2339f..cd64a0cefb 100644 --- a/src/ol/color/color.js +++ b/src/ol/color/color.js @@ -54,48 +54,6 @@ ol.color.rgbaColorRe_ = /^(?:rgba)?\((0|[1-9]\d{0,2}),\s?(0|[1-9]\d{0,2}),\s?(0|[1-9]\d{0,2}),\s?(0|1|0\.\d{0,10})\)$/i; -/** - * @param {ol.Color} dst Destination. - * @param {ol.Color} src Source. - * @param {ol.Color=} opt_color Color. - * @return {ol.Color} Color. - */ -ol.color.blend = function(dst, src, opt_color) { - // http://en.wikipedia.org/wiki/Alpha_compositing - // FIXME do we need to scale by 255? - var out = opt_color ? opt_color : []; - var dstA = dst[3]; - var srcA = src[3]; - if (dstA == 1) { - out[0] = (src[0] * srcA + dst[0] * (1 - srcA) + 0.5) | 0; - out[1] = (src[1] * srcA + dst[1] * (1 - srcA) + 0.5) | 0; - out[2] = (src[2] * srcA + dst[2] * (1 - srcA) + 0.5) | 0; - out[3] = 1; - } else if (srcA === 0) { - out[0] = dst[0]; - out[1] = dst[1]; - out[2] = dst[2]; - out[3] = dstA; - } else { - var outA = srcA + dstA * (1 - srcA); - if (outA === 0) { - out[0] = 0; - out[1] = 0; - out[2] = 0; - out[3] = 0; - } else { - out[0] = ((src[0] * srcA + dst[0] * dstA * (1 - srcA)) / outA + 0.5) | 0; - out[1] = ((src[1] * srcA + dst[1] * dstA * (1 - srcA)) / outA + 0.5) | 0; - out[2] = ((src[2] * srcA + dst[2] * dstA * (1 - srcA)) / outA + 0.5) | 0; - out[3] = outA; - } - } - goog.asserts.assert(ol.color.isValid(out), - 'Output color of blend should be a valid color'); - return out; -}; - - /** * Return the color as an array. This function maintains a cache of calculated * arrays which means the result should not be modified. diff --git a/test/spec/ol/color.test.js b/test/spec/ol/color.test.js index 66c1845f3c..b0403f3fb2 100644 --- a/test/spec/ol/color.test.js +++ b/test/spec/ol/color.test.js @@ -3,33 +3,6 @@ goog.provide('ol.test.color'); describe('ol.color', function() { - describe('ol.color.blend', function() { - it('blends red (a=1) and blue (a=1) to blue (a=1)', function() { - var red = [255, 0, 0, 1]; - var blue = [0, 0, 255, 1]; - var blended = ol.color.blend(red, blue); - expect(blended).to.eql([0, 0, 255, 1]); - }); - it('blends red (a=1) and blue (a=0) to red (a=1)', function() { - var red = [255, 0, 0, 1]; - var blue = [0, 0, 255, 0]; - var blended = ol.color.blend(red, blue); - expect(blended).to.eql([255, 0, 0, 1]); - }); - it('blends red (a=0.5) and blue (a=0.5) to purple (a=0.75)', function() { - var red = [255, 0, 0, 0.5]; - var blue = [0, 0, 255, 0.5]; - var blended = ol.color.blend(red, blue); - expect(blended).to.eql([85, 0, 170, 0.75]); - }); - it('blends red (a=0.5) and blue (a=0) to red (a=0.5)', function() { - var red = [255, 0, 0, 0.5]; - var blue = [0, 0, 255, 0]; - var blended = ol.color.blend(red, blue); - expect(blended).to.eql([255, 0, 0, 0.5]); - }); - }); - describe('ol.color.fromString', function() { before(function() { From 8b1ad633befaa129b3322236274f6e74748a9747 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Mar 2016 09:05:22 -0700 Subject: [PATCH 2/6] Remove unused ol.color.stringOrColorEquals() --- src/ol/color/color.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/ol/color/color.js b/src/ol/color/color.js index cd64a0cefb..45da070f13 100644 --- a/src/ol/color/color.js +++ b/src/ol/color/color.js @@ -270,22 +270,3 @@ ol.color.transform = function(color, transform, opt_color) { result[3] = color[3]; return ol.color.normalize(result, result); }; - - -/** - * @param {ol.Color|string} color1 Color2. - * @param {ol.Color|string} color2 Color2. - * @return {boolean} Equals. - */ -ol.color.stringOrColorEquals = function(color1, color2) { - if (color1 === color2 || color1 == color2) { - return true; - } - if (typeof color1 === 'string') { - color1 = ol.color.fromString(color1); - } - if (typeof color2 === 'string') { - color2 = ol.color.fromString(color2); - } - return ol.color.equals(color1, color2); -}; From 9ea9b29a699199d3ab6eea1ccb46ccf7063ce41e Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Mar 2016 09:06:43 -0700 Subject: [PATCH 3/6] Remove unused ol.color.transform() --- src/ol/color/color.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/ol/color/color.js b/src/ol/color/color.js index 45da070f13..fa755028e7 100644 --- a/src/ol/color/color.js +++ b/src/ol/color/color.js @@ -9,7 +9,6 @@ goog.provide('ol.color'); goog.require('goog.asserts'); goog.require('goog.color'); goog.require('goog.color.names'); -goog.require('goog.vec.Mat4'); goog.require('ol'); goog.require('ol.math'); @@ -255,18 +254,3 @@ ol.color.toString = function(color) { var a = color[3] === undefined ? 1 : color[3]; return 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; }; - - -/** - * @param {!ol.Color} color Color. - * @param {goog.vec.Mat4.Number} transform Transform. - * @param {!ol.Color=} opt_color Color. - * @return {ol.Color} Transformed color. - */ -ol.color.transform = function(color, transform, opt_color) { - var result = opt_color ? opt_color : []; - result = goog.vec.Mat4.multVec3(transform, color, result); - goog.asserts.assert(goog.isArray(result), 'result should be an array'); - result[3] = color[3]; - return ol.color.normalize(result, result); -}; From 47a18d41f05ec1b04c2086adaeb6072a7e854b8c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Mar 2016 09:08:06 -0700 Subject: [PATCH 4/6] Remove unused ol.color.equals() --- src/ol/color/color.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/ol/color/color.js b/src/ol/color/color.js index fa755028e7..9f6d631573 100644 --- a/src/ol/color/color.js +++ b/src/ol/color/color.js @@ -86,18 +86,6 @@ ol.color.asString = function(color) { }; -/** - * @param {ol.Color} color1 Color1. - * @param {ol.Color} color2 Color2. - * @return {boolean} Equals. - */ -ol.color.equals = function(color1, color2) { - return color1 === color2 || ( - color1[0] == color2[0] && color1[1] == color2[1] && - color1[2] == color2[2] && color1[3] == color2[3]); -}; - - /** * @param {string} s String. * @return {ol.Color} Color. From 40397aa39e31657da69607afebc030e9325b1236 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Mar 2016 10:00:22 -0700 Subject: [PATCH 5/6] Tests for ol.color.asArray() --- test/spec/ol/color.test.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/spec/ol/color.test.js b/test/spec/ol/color.test.js index b0403f3fb2..d15272e739 100644 --- a/test/spec/ol/color.test.js +++ b/test/spec/ol/color.test.js @@ -3,6 +3,31 @@ goog.provide('ol.test.color'); describe('ol.color', function() { + describe('ol.color.asArray()', function() { + + it('returns the same for an array', function() { + var color = [1, 2, 3, 0.4]; + var got = ol.color.asArray(color); + expect(got).to.be(color); + }); + + it('returns an array given an rgba string', function() { + var color = ol.color.asArray('rgba(1,2,3,0.4)'); + expect(color).to.eql([1, 2, 3, 0.4]); + }); + + it('returns an array given an rgb string', function() { + var color = ol.color.asArray('rgb(1,2,3)'); + expect(color).to.eql([1, 2, 3, 1]); + }); + + it('returns an array given a hex string', function() { + var color = ol.color.asArray('#00ccff'); + expect(color).to.eql([0, 204, 255, 1]); + }); + + }); + describe('ol.color.fromString', function() { before(function() { From 249f3b2e47c39847a267f1c5324eeb3b45a7ed71 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Mar 2016 10:05:38 -0700 Subject: [PATCH 6/6] Tests for ol.color.asString() --- test/spec/ol/color.test.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/spec/ol/color.test.js b/test/spec/ol/color.test.js index d15272e739..d15e761d15 100644 --- a/test/spec/ol/color.test.js +++ b/test/spec/ol/color.test.js @@ -28,6 +28,26 @@ describe('ol.color', function() { }); + describe('ol.color.asString()', function() { + + it('returns the same for a string', function() { + var color = 'rgba(0,1,2,0.3)'; + var got = ol.color.asString(color); + expect(got).to.be(color); + }); + + it('returns a string given an rgba array', function() { + var color = ol.color.asString([1, 2, 3, 0.4]); + expect(color).to.eql('rgba(1,2,3,0.4)'); + }); + + it('returns a string given an rgb array', function() { + var color = ol.color.asString([1, 2, 3]); + expect(color).to.eql('rgba(1,2,3,1)'); + }); + + }); + describe('ol.color.fromString', function() { before(function() {