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

Fix order of arguments to ol.extent.createOrUpdate

Browse Source
This commit is contained in:
Tom Payne
2013-11-06 17:46:14 +01:00
committed by Tim Schaub
parent cf0fdff4e2
commit 9cbd8de188
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/extent.js
View File

@@ -43,10 +43,10 @@ ol.extent.boundingExtentXYs_ = function(xs, ys, opt_extent) {
goog.asserts.assert(xs.length > 0);
goog.asserts.assert(ys.length > 0);
var minX = Math.min.apply(null, xs);
var maxX = Math.max.apply(null, xs);
var minY = Math.min.apply(null, ys);
var maxX = Math.max.apply(null, xs);
var maxY = Math.max.apply(null, ys);
return ol.extent.createOrUpdate(minX, maxX, minY, maxY, opt_extent);
return ol.extent.createOrUpdate(minX, minY, maxX, maxY, opt_extent);
};
@@ -114,18 +114,18 @@ ol.extent.createEmpty = function() {
/**
* @param {number} minX Minimum X.
* @param {number} maxX Maximum X.
* @param {number} minY Minimum Y.
* @param {number} maxX Maximum X.
* @param {number} maxY Maximum Y.
* @param {ol.Extent=} opt_extent Destination extent.
* @return {ol.Extent} Extent.
* @todo stability experimental
*/
ol.extent.createOrUpdate = function(minX, maxX, minY, maxY, opt_extent) {
ol.extent.createOrUpdate = function(minX, minY, maxX, maxY, opt_extent) {
if (goog.isDef(opt_extent)) {
opt_extent[0] = minX;
opt_extent[2] = maxX;
opt_extent[1] = minY;
opt_extent[2] = maxX;
opt_extent[3] = maxY;
return opt_extent;
} else {

6
src/ol/tilegrid/tilegrid.js
View File

@@ -223,7 +223,7 @@ ol.tilegrid.TileGrid.prototype.getTileRangeExtent =
var maxX = origin[0] + (tileRange.maxX + 1) * tileSize[0] * resolution;
var minY = origin[1] + tileRange.minY * tileSize[1] * resolution;
var maxY = origin[1] + (tileRange.maxY + 1) * tileSize[1] * resolution;
return ol.extent.createOrUpdate(minX, maxX, minY, maxY, opt_extent);
return ol.extent.createOrUpdate(minX, minY, maxX, maxY, opt_extent);
};
@@ -287,10 +287,10 @@ ol.tilegrid.TileGrid.prototype.getTileCoordExtent =
var resolution = this.getResolution(tileCoord.z);
var tileSize = this.getTileSize(tileCoord.z);
var minX = origin[0] + tileCoord.x * tileSize[0] * resolution;
var maxX = minX + tileSize[0] * resolution;
var minY = origin[1] + tileCoord.y * tileSize[1] * resolution;
var maxX = minX + tileSize[0] * resolution;
var maxY = minY + tileSize[1] * resolution;
return ol.extent.createOrUpdate(minX, maxX, minY, maxY, opt_extent);
return ol.extent.createOrUpdate(minX, minY, maxX, maxY, opt_extent);
};