diff --git a/src/ol/extent.js b/src/ol/extent.js index 2e666cf201..57b6a86ae2 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -474,7 +474,7 @@ ol.extent.getEnlargedArea = function(extent1, extent2) { * @param {ol.Extent=} opt_extent Destination extent. * @return {ol.Extent} Extent. */ -ol.extent.getForView2DAndSize = +ol.extent.getForViewAndSize = function(center, resolution, rotation, size, opt_extent) { var dx = resolution * size[0] / 2; var dy = resolution * size[1] / 2; diff --git a/src/ol/map.js b/src/ol/map.js index 6ba189eb27..b611cf3e65 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -1231,7 +1231,7 @@ ol.Map.prototype.renderFrame_ = function(time) { preRenderFunctions.length = n; if (!goog.isNull(frameState)) { - frameState.extent = ol.extent.getForView2DAndSize(viewState.center, + frameState.extent = ol.extent.getForViewAndSize(viewState.center, viewState.resolution, viewState.rotation, frameState.size); } diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index c6852bfe94..0cd350e733 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -189,7 +189,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = var extent; if (tileResolution == viewState.resolution) { center = this.snapCenterToPixel(center, tileResolution, frameState.size); - extent = ol.extent.getForView2DAndSize( + extent = ol.extent.getForViewAndSize( center, tileResolution, viewState.rotation, frameState.size); } else { extent = frameState.extent; diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 367f24b1bc..bfb7be4c35 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -105,7 +105,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = var extent; if (tileResolution == viewState.resolution) { center = this.snapCenterToPixel(center, tileResolution, frameState.size); - extent = ol.extent.getForView2DAndSize( + extent = ol.extent.getForViewAndSize( center, tileResolution, viewState.rotation, frameState.size); } else { extent = frameState.extent; diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index f31412e686..df15184175 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -135,7 +135,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = var extent; if (tileResolution == viewState.resolution) { center = this.snapCenterToPixel(center, tileResolution, frameState.size); - extent = ol.extent.getForView2DAndSize( + extent = ol.extent.getForViewAndSize( center, tileResolution, viewState.rotation, frameState.size); } else { extent = frameState.extent; diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index 0be6ffa937..a8dfcc5e37 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -153,10 +153,10 @@ describe('ol.extent', function() { }); }); - describe('getForView2DAndSize', function() { + describe('getForViewAndSize', function() { it('works for a unit square', function() { - var extent = ol.extent.getForView2DAndSize( + var extent = ol.extent.getForViewAndSize( [0, 0], 1, 0, [1, 1]); expect(extent[0]).to.be(-0.5); expect(extent[2]).to.be(0.5); @@ -165,7 +165,7 @@ describe('ol.extent', function() { }); it('works for center', function() { - var extent = ol.extent.getForView2DAndSize( + var extent = ol.extent.getForViewAndSize( [5, 10], 1, 0, [1, 1]); expect(extent[0]).to.be(4.5); expect(extent[2]).to.be(5.5); @@ -174,7 +174,7 @@ describe('ol.extent', function() { }); it('works for rotation', function() { - var extent = ol.extent.getForView2DAndSize( + var extent = ol.extent.getForViewAndSize( [0, 0], 1, Math.PI / 4, [1, 1]); expect(extent[0]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9); expect(extent[2]).to.roughlyEqual(Math.sqrt(0.5), 1e-9); @@ -183,7 +183,7 @@ describe('ol.extent', function() { }); it('works for resolution', function() { - var extent = ol.extent.getForView2DAndSize( + var extent = ol.extent.getForViewAndSize( [0, 0], 2, 0, [1, 1]); expect(extent[0]).to.be(-1); expect(extent[2]).to.be(1); @@ -192,7 +192,7 @@ describe('ol.extent', function() { }); it('works for size', function() { - var extent = ol.extent.getForView2DAndSize( + var extent = ol.extent.getForViewAndSize( [0, 0], 1, 0, [10, 5]); expect(extent[0]).to.be(-5); expect(extent[2]).to.be(5);