ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename ol.extent.getForView2DAndSize to ol.extent.getForViewAndSize

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:57:00 -04:00
parent 9565e17ee0
commit e802902f9b
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/extent.js
+1 -1
View File
@@ -474,7 +474,7 @@ ol.extent.getEnlargedArea = function(extent1, extent2) {
* @param {ol.Extent=} opt_extent Destination extent. * @param {ol.Extent=} opt_extent Destination extent.
* @return {ol.Extent} Extent. * @return {ol.Extent} Extent.
*/ */
ol.extent.getForView2DAndSize = ol.extent.getForViewAndSize =
function(center, resolution, rotation, size, opt_extent) { function(center, resolution, rotation, size, opt_extent) {
var dx = resolution * size[0] / 2; var dx = resolution * size[0] / 2;
var dy = resolution * size[1] / 2; var dy = resolution * size[1] / 2;
src/ol/map.js
+1 -1
View File
@@ -1231,7 +1231,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
preRenderFunctions.length = n; preRenderFunctions.length = n;
if (!goog.isNull(frameState)) { if (!goog.isNull(frameState)) {
frameState.extent = ol.extent.getForView2DAndSize(viewState.center, frameState.extent = ol.extent.getForViewAndSize(viewState.center,
viewState.resolution, viewState.rotation, frameState.size); viewState.resolution, viewState.rotation, frameState.size);
} }
src/ol/renderer/canvas/canvastilelayerrenderer.js
+1 -1
View File
@@ -189,7 +189,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
var extent; var extent;
if (tileResolution == viewState.resolution) { if (tileResolution == viewState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size); center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.extent.getForView2DAndSize( extent = ol.extent.getForViewAndSize(
center, tileResolution, viewState.rotation, frameState.size); center, tileResolution, viewState.rotation, frameState.size);
} else { } else {
extent = frameState.extent; extent = frameState.extent;
src/ol/renderer/dom/domtilelayerrenderer.js
+1 -1
View File
@@ -105,7 +105,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
var extent; var extent;
if (tileResolution == viewState.resolution) { if (tileResolution == viewState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size); center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.extent.getForView2DAndSize( extent = ol.extent.getForViewAndSize(
center, tileResolution, viewState.rotation, frameState.size); center, tileResolution, viewState.rotation, frameState.size);
} else { } else {
extent = frameState.extent; extent = frameState.extent;
src/ol/renderer/webgl/webgltilelayerrenderer.js
+1 -1
View File
@@ -135,7 +135,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
var extent; var extent;
if (tileResolution == viewState.resolution) { if (tileResolution == viewState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size); center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.extent.getForView2DAndSize( extent = ol.extent.getForViewAndSize(
center, tileResolution, viewState.rotation, frameState.size); center, tileResolution, viewState.rotation, frameState.size);
} else { } else {
extent = frameState.extent; extent = frameState.extent;
test/spec/ol/extent.test.js
+6 -6
View File
@@ -153,10 +153,10 @@ describe('ol.extent', function() {
}); });
}); });
describe('getForView2DAndSize', function() { describe('getForViewAndSize', function() {
it('works for a unit square', function() { it('works for a unit square', function() {
var extent = ol.extent.getForView2DAndSize( var extent = ol.extent.getForViewAndSize(
[0, 0], 1, 0, [1, 1]); [0, 0], 1, 0, [1, 1]);
expect(extent[0]).to.be(-0.5); expect(extent[0]).to.be(-0.5);
expect(extent[2]).to.be(0.5); expect(extent[2]).to.be(0.5);
@@ -165,7 +165,7 @@ describe('ol.extent', function() {
}); });
it('works for center', function() { it('works for center', function() {
var extent = ol.extent.getForView2DAndSize( var extent = ol.extent.getForViewAndSize(
[5, 10], 1, 0, [1, 1]); [5, 10], 1, 0, [1, 1]);
expect(extent[0]).to.be(4.5); expect(extent[0]).to.be(4.5);
expect(extent[2]).to.be(5.5); expect(extent[2]).to.be(5.5);
@@ -174,7 +174,7 @@ describe('ol.extent', function() {
}); });
it('works for rotation', function() { it('works for rotation', function() {
var extent = ol.extent.getForView2DAndSize( var extent = ol.extent.getForViewAndSize(
[0, 0], 1, Math.PI / 4, [1, 1]); [0, 0], 1, Math.PI / 4, [1, 1]);
expect(extent[0]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9); expect(extent[0]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9);
expect(extent[2]).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() { it('works for resolution', function() {
var extent = ol.extent.getForView2DAndSize( var extent = ol.extent.getForViewAndSize(
[0, 0], 2, 0, [1, 1]); [0, 0], 2, 0, [1, 1]);
expect(extent[0]).to.be(-1); expect(extent[0]).to.be(-1);
expect(extent[2]).to.be(1); expect(extent[2]).to.be(1);
@@ -192,7 +192,7 @@ describe('ol.extent', function() {
}); });
it('works for size', function() { it('works for size', function() {
var extent = ol.extent.getForView2DAndSize( var extent = ol.extent.getForViewAndSize(
[0, 0], 1, 0, [10, 5]); [0, 0], 1, 0, [10, 5]);
expect(extent[0]).to.be(-5); expect(extent[0]).to.be(-5);
expect(extent[2]).to.be(5); expect(extent[2]).to.be(5);