From e8cd5e322fbbb42fe84f03a5d78817320f001c09 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 27 Feb 2016 09:00:17 -0700 Subject: [PATCH 1/7] Merge pull request #4809 from fperucic/multpolygon-clone Fix multipolygon clone. --- src/ol/geom/multipolygon.js | 2 +- test/spec/ol/geom/multipolygon.test.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js index c06abed26f..41e047c692 100644 --- a/src/ol/geom/multipolygon.js +++ b/src/ol/geom/multipolygon.js @@ -122,7 +122,7 @@ ol.geom.MultiPolygon.prototype.clone = function() { var len = this.endss_.length; var newEndss = new Array(len); for (var i = 0; i < len; ++i) { - newEndss[i] = this.endss_.slice(); + newEndss[i] = this.endss_[i].slice(); } multiPolygon.setFlatCoordinates( diff --git a/test/spec/ol/geom/multipolygon.test.js b/test/spec/ol/geom/multipolygon.test.js index 606b411c45..aa91d56db8 100644 --- a/test/spec/ol/geom/multipolygon.test.js +++ b/test/spec/ol/geom/multipolygon.test.js @@ -88,6 +88,15 @@ describe('ol.geom.MultiPolygon', function() { [[[3, 0], [4, 1], [5, 2], [5, 0]]]); }); + describe('#clone()', function() { + + it('has the expected endss_', function() { + var clone = multiPolygon.clone(); + expect(multiPolygon.endss_).to.eql(clone.endss_); + }); + + }); + describe('#getCoordinates()', function() { var cw = [[-180, -90], [-180, 90], [180, 90], [180, -90], [-180, -90]]; From bef31dc386e425c6d459a93bf887887d0fcbe40f Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Wed, 2 Mar 2016 19:09:42 +0100 Subject: [PATCH 2/7] Merge pull request #4956 from jonataswalker/fix-layout-examples Fix Examples layout page --- config/examples/example.html | 6 ++++-- examples/index.html | 15 +++++++-------- examples/resources/common.js | 4 ++-- examples/resources/layout.css | 11 +++++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/config/examples/example.html b/config/examples/example.html index 6e794f2bc9..bc77d0b560 100644 --- a/config/examples/example.html +++ b/config/examples/example.html @@ -18,8 +18,10 @@