From 5627a467cd274cfa2bb16c70d6ec1d161d7cfaf0 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 21 Oct 2016 14:20:31 +0200 Subject: [PATCH 1/4] Remove unused ol.extent.normalize function --- src/ol/extent.js | 13 ------------- test/spec/ol/extent.test.js | 27 --------------------------- 2 files changed, 40 deletions(-) diff --git a/src/ol/extent.js b/src/ol/extent.js index c352b62b6f..304d9fc4d2 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -730,19 +730,6 @@ ol.extent.isInfinite = function(extent) { }; -/** - * @param {ol.Extent} extent Extent. - * @param {ol.Coordinate} coordinate Coordinate. - * @return {ol.Coordinate} Coordinate. - */ -ol.extent.normalize = function(extent, coordinate) { - return [ - (coordinate[0] - extent[0]) / (extent[2] - extent[0]), - (coordinate[1] - extent[1]) / (extent[3] - extent[1]) - ]; -}; - - /** * @param {ol.Extent} extent Extent. * @param {ol.Extent=} opt_extent Extent. diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index b8406104d8..469694cf7f 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -642,33 +642,6 @@ describe('ol.extent', function() { }); }); - describe('normalize', function() { - it('returns the expected coordinate', function() { - var extent = [0, 1, 2, 3]; - var coordinate; - - coordinate = ol.extent.normalize(extent, [1, 2]); - expect(coordinate[0]).to.eql(0.5); - expect(coordinate[1]).to.eql(0.5); - - coordinate = ol.extent.normalize(extent, [0, 3]); - expect(coordinate[0]).to.eql(0); - expect(coordinate[1]).to.eql(1); - - coordinate = ol.extent.normalize(extent, [2, 1]); - expect(coordinate[0]).to.eql(1); - expect(coordinate[1]).to.eql(0); - - coordinate = ol.extent.normalize(extent, [0, 0]); - expect(coordinate[0]).to.eql(0); - expect(coordinate[1]).to.eql(-0.5); - - coordinate = ol.extent.normalize(extent, [-1, 1]); - expect(coordinate[0]).to.eql(-0.5); - expect(coordinate[1]).to.eql(0); - }); - }); - describe('scaleFromCenter', function() { it('scales the extent from its center', function() { var extent = [1, 1, 3, 3]; From 2a1a9ec337be750b4fadf3f844c3882de4645e7c Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 21 Oct 2016 14:22:37 +0200 Subject: [PATCH 2/4] Remove unused ol.extent.isInfinite function --- src/ol/extent.js | 10 ---------- test/spec/ol/extent.test.js | 23 ----------------------- 2 files changed, 33 deletions(-) diff --git a/src/ol/extent.js b/src/ol/extent.js index 304d9fc4d2..5d98818581 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -720,16 +720,6 @@ ol.extent.isEmpty = function(extent) { }; -/** - * @param {ol.Extent} extent Extent. - * @return {boolean} Is infinite. - */ -ol.extent.isInfinite = function(extent) { - return extent[0] == -Infinity || extent[1] == -Infinity || - extent[2] == Infinity || extent[3] == Infinity; -}; - - /** * @param {ol.Extent} extent Extent. * @param {ol.Extent=} opt_extent Extent. diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index 469694cf7f..63b1976e65 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -602,29 +602,6 @@ describe('ol.extent', function() { }); }); - describe('isInfinite', function() { - it('returns true for infinite extents', function() { - var extents = [ - [-Infinity, 0, 0, 0], - [0, -Infinity, 0, 0], - [0, 0, +Infinity, 0], - [0, 0, 0, +Infinity] - ]; - expect(ol.extent.isInfinite(extents[0])).to.be(true); - expect(ol.extent.isInfinite(extents[1])).to.be(true); - expect(ol.extent.isInfinite(extents[2])).to.be(true); - expect(ol.extent.isInfinite(extents[3])).to.be(true); - }); - it('returns false for other extents', function() { - var extents = [ - ol.extent.createEmpty(), - [1, 2, 3, 4] - ]; - expect(ol.extent.isInfinite(extents[0])).to.be(false); - expect(ol.extent.isInfinite(extents[1])).to.be(false); - }); - }); - describe('touches', function() { it('returns the expected value', function() { From 0f8d26d82915335ed081137ec3013b69a13bbfbc Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 21 Oct 2016 14:23:31 +0200 Subject: [PATCH 3/4] Remove unused ol.extent.touches function --- src/ol/extent.js | 13 ------------- test/spec/ol/extent.test.js | 17 ----------------- 2 files changed, 30 deletions(-) diff --git a/src/ol/extent.js b/src/ol/extent.js index 5d98818581..ce025e29c8 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -808,19 +808,6 @@ ol.extent.intersectsSegment = function(extent, start, end) { }; -/** - * @param {ol.Extent} extent1 Extent 1. - * @param {ol.Extent} extent2 Extent 2. - * @return {boolean} Touches. - */ -ol.extent.touches = function(extent1, extent2) { - var intersects = ol.extent.intersects(extent1, extent2); - return intersects && - (extent1[0] == extent2[2] || extent1[2] == extent2[0] || - extent1[1] == extent2[3] || extent1[3] == extent2[1]); -}; - - /** * Apply a transform function to the extent. * @param {ol.Extent} extent Extent. diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index 63b1976e65..c158c660c3 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -602,23 +602,6 @@ describe('ol.extent', function() { }); }); - describe('touches', function() { - - it('returns the expected value', function() { - var touches = ol.extent.touches; - var extent = [50, 50, 100, 100]; - expect(touches(extent, [20, 20, 80, 80])).to.be(false); - expect(touches(extent, [20, 20, 50, 80])).to.be(true); - expect(touches(extent, [20, 20, 50, 40])).to.be(false); - expect(touches(extent, [100, 20, 140, 80])).to.be(true); - expect(touches(extent, [100, 20, 140, 40])).to.be(false); - expect(touches(extent, [20, 20, 80, 50])).to.be(true); - expect(touches(extent, [20, 20, 40, 50])).to.be(false); - expect(touches(extent, [20, 100, 80, 140])).to.be(true); - expect(touches(extent, [20, 100, 40, 140])).to.be(false); - }); - }); - describe('scaleFromCenter', function() { it('scales the extent from its center', function() { var extent = [1, 1, 3, 3]; From 0a2b145fd5c869dee424f6214a878700c66fcff6 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 21 Oct 2016 14:25:46 +0200 Subject: [PATCH 4/4] Remove unused ol.extent.empty function --- src/ol/extent.js | 12 ------------ test/spec/ol/extent.test.js | 18 ------------------ 2 files changed, 30 deletions(-) diff --git a/src/ol/extent.js b/src/ol/extent.js index ce025e29c8..2f118d5001 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -307,18 +307,6 @@ ol.extent.createOrUpdateFromRings = function(rings, opt_extent) { }; -/** - * Empty an extent in place. - * @param {ol.Extent} extent Extent. - * @return {ol.Extent} Extent. - */ -ol.extent.empty = function(extent) { - extent[0] = extent[1] = Infinity; - extent[2] = extent[3] = -Infinity; - return extent; -}; - - /** * Determine if two extents are equivalent. * @param {ol.Extent} extent1 Extent 1. diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index c158c660c3..e2483b7af5 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -167,24 +167,6 @@ describe('ol.extent', function() { }); - describe('empty', function() { - - it('returns the empty extent', function() { - var extent = [1, 2, 3, 4]; - var expected = [Infinity, Infinity, -Infinity, -Infinity]; - var got = ol.extent.empty(extent); - expect(got).to.eql(expected); - }); - - it('empties a passed extent in place', function() { - var extent = [1, 2, 3, 4]; - var expected = [Infinity, Infinity, -Infinity, -Infinity]; - ol.extent.empty(extent); - expect(extent).to.eql(expected); - }); - - }); - describe('forEachCorner', function() { var callbackFalse;