From 18aa1b8ae51d034eef91574b1870b0e64d8ab160 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Wed, 6 Nov 2013 17:46:14 +0100
Subject: [PATCH] Fix order of arguments to ol.extent.createOrUpdate

---
 src/ol/extent.js            | 10 +++++-----
 src/ol/tilegrid/tilegrid.js |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ol/extent.js b/src/ol/extent.js
index cf393fd61b..1bb73610d3 100644
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -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 {
diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js
index 59bf95fb61..e079159cd2 100644
--- a/src/ol/tilegrid/tilegrid.js
+++ b/src/ol/tilegrid/tilegrid.js
@@ -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);
 };