Changing extent structure back to single array: [minX, minY, maxX, maxY]

This means we'll have to have a new structure and new methods for 3D envelopes.

src/ol/extent.js

@@ -8,7 +8,7 @@ goog.require('ol.TransformFunction');
 
 
 /**
- * @typedef {Array.<ol.Coordinate>}
+ * @typedef {Array.<number>}
  */
 ol.Extent;
 
@@ -55,7 +55,7 @@ ol.extent.boundingExtentXYs_ = function(xs, ys, opt_extent) {
  * @return {ol.Extent} The clone.
  */
 ol.extent.clone = function(extent) {
-  return [[extent[0][0], extent[0][1]], [extent[1][0], extent[1][1]]];
+  return extent.slice();
 };
 
 
@@ -67,8 +67,8 @@ ol.extent.clone = function(extent) {
  * @return {boolean} Contains.
  */
 ol.extent.containsCoordinate = function(extent, coordinate) {
-  return extent[0][0] <= coordinate[0] && coordinate[0] <= extent[1][0] &&
-      extent[0][1] <= coordinate[1] && coordinate[1] <= extent[1][1];
+  return extent[0] <= coordinate[0] && coordinate[0] <= extent[2] &&
+      extent[1] <= coordinate[1] && coordinate[1] <= extent[3];
 };
 
 
@@ -80,8 +80,8 @@ ol.extent.containsCoordinate = function(extent, coordinate) {
  * @return {boolean} Contains.
  */
 ol.extent.containsExtent = function(extent1, extent2) {
-  return extent1[0][0] <= extent2[0][0] && extent2[1][0] <= extent1[1][0] &&
-      extent1[0][1] <= extent2[0][1] && extent2[1][1] <= extent1[1][1];
+  return extent1[0] <= extent2[0] && extent2[2] <= extent1[2] &&
+      extent1[1] <= extent2[1] && extent2[3] <= extent1[3];
 };
 
 
@@ -89,7 +89,7 @@ ol.extent.containsExtent = function(extent1, extent2) {
  * @return {ol.Extent} Empty extent.
  */
 ol.extent.createEmpty = function() {
-  return [[Infinity, Infinity], [-Infinity, -Infinity]];
+  return [Infinity, Infinity, -Infinity, -Infinity];
 };
 
 
@@ -103,13 +103,13 @@ ol.extent.createEmpty = function() {
  */
 ol.extent.createOrUpdate = function(minX, maxX, minY, maxY, opt_extent) {
   if (goog.isDef(opt_extent)) {
-    opt_extent[0][0] = minX;
-    opt_extent[1][0] = maxX;
-    opt_extent[0][1] = minY;
-    opt_extent[1][1] = maxY;
+    opt_extent[0] = minX;
+    opt_extent[2] = maxX;
+    opt_extent[1] = minY;
+    opt_extent[3] = maxY;
     return opt_extent;
   } else {
-    return [[minX, minY], [maxX, maxY]];
+    return [minX, minY, maxX, maxY];
   }
 };
 
@@ -120,8 +120,8 @@ ol.extent.createOrUpdate = function(minX, maxX, minY, maxY, opt_extent) {
  * @return {ol.Extent} Extent.
  */
 ol.extent.empty = function(extent) {
-  extent[0][0] = extent[0][1] = Infinity;
-  extent[1][0] = extent[1][1] = -Infinity;
+  extent[0] = extent[1] = Infinity;
+  extent[2] = extent[3] = -Infinity;
   return extent;
 };
 
@@ -132,8 +132,8 @@ ol.extent.empty = function(extent) {
  * @return {boolean} Equals.
  */
 ol.extent.equals = function(extent1, extent2) {
-  return extent1[0][0] == extent2[0][0] && extent1[1][0] == extent2[1][0] &&
-      extent1[0][1] == extent2[0][1] && extent1[1][1] == extent2[1][1];
+  return extent1[0] == extent2[0] && extent1[2] == extent2[2] &&
+      extent1[1] == extent2[1] && extent1[3] == extent2[3];
 };
 
 
@@ -142,17 +142,17 @@ ol.extent.equals = function(extent1, extent2) {
  * @param {ol.Extent} extent2 Extent 2.
  */
 ol.extent.extend = function(extent1, extent2) {
-  if (extent2[0][0] < extent1[0][0]) {
-    extent1[0][0] = extent2[0][0];
+  if (extent2[0] < extent1[0]) {
+    extent1[0] = extent2[0];
   }
-  if (extent2[1][0] > extent1[1][0]) {
-    extent1[1][0] = extent2[1][0];
+  if (extent2[2] > extent1[2]) {
+    extent1[2] = extent2[2];
   }
-  if (extent2[0][1] < extent1[0][1]) {
-    extent1[0][1] = extent2[0][1];
+  if (extent2[1] < extent1[1]) {
+    extent1[1] = extent2[1];
   }
-  if (extent2[1][1] > extent1[1][1]) {
-    extent1[1][1] = extent2[1][1];
+  if (extent2[3] > extent1[3]) {
+    extent1[3] = extent2[3];
   }
 };
 
@@ -162,17 +162,17 @@ ol.extent.extend = function(extent1, extent2) {
  * @param {ol.Coordinate} coordinate Coordinate.
  */
 ol.extent.extendCoordinate = function(extent, coordinate) {
-  if (coordinate[0] < extent[0][0]) {
-    extent[0][0] = coordinate[0];
+  if (coordinate[0] < extent[0]) {
+    extent[0] = coordinate[0];
   }
-  if (coordinate[0] > extent[1][0]) {
-    extent[1][0] = coordinate[0];
+  if (coordinate[0] > extent[2]) {
+    extent[2] = coordinate[0];
   }
-  if (coordinate[1] < extent[0][1]) {
-    extent[0][1] = coordinate[1];
+  if (coordinate[1] < extent[1]) {
+    extent[1] = coordinate[1];
   }
-  if (coordinate[1] > extent[1][1]) {
-    extent[1][1] = coordinate[1];
+  if (coordinate[1] > extent[3]) {
+    extent[3] = coordinate[1];
   }
 };
 
@@ -182,7 +182,7 @@ ol.extent.extendCoordinate = function(extent, coordinate) {
  * @return {ol.Coordinate} Bottom left coordinate.
  */
 ol.extent.getBottomLeft = function(extent) {
-  return [extent[0][0], extent[0][1]];
+  return [extent[0], extent[1]];
 };
 
 
@@ -191,7 +191,7 @@ ol.extent.getBottomLeft = function(extent) {
  * @return {ol.Coordinate} Bottom right coordinate.
  */
 ol.extent.getBottomRight = function(extent) {
-  return [extent[1][0], extent[0][1]];
+  return [extent[2], extent[1]];
 };
 
 
@@ -200,7 +200,7 @@ ol.extent.getBottomRight = function(extent) {
  * @return {ol.Coordinate} Center.
  */
 ol.extent.getCenter = function(extent) {
-  return [(extent[0][0] + extent[1][0]) / 2, (extent[0][1] + extent[1][1]) / 2];
+  return [(extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2];
 };
 
 
@@ -238,7 +238,7 @@ ol.extent.getForView2DAndSize =
  * @return {number} Height.
  */
 ol.extent.getHeight = function(extent) {
-  return extent[1][1] - extent[0][1];
+  return extent[3] - extent[1];
 };
 
 
@@ -247,7 +247,7 @@ ol.extent.getHeight = function(extent) {
  * @return {ol.Size} Size.
  */
 ol.extent.getSize = function(extent) {
-  return [extent[1][0] - extent[0][0], extent[1][1] - extent[0][1]];
+  return [extent[2] - extent[0], extent[3] - extent[1]];
 };
 
 
@@ -256,7 +256,7 @@ ol.extent.getSize = function(extent) {
  * @return {ol.Coordinate} Top left coordinate.
  */
 ol.extent.getTopLeft = function(extent) {
-  return [extent[0][0], extent[1][1]];
+  return [extent[0], extent[3]];
 };
 
 
@@ -265,7 +265,7 @@ ol.extent.getTopLeft = function(extent) {
  * @return {ol.Coordinate} Top right coordinate.
  */
 ol.extent.getTopRight = function(extent) {
-  return [extent[1][0], extent[1][1]];
+  return [extent[2], extent[3]];
 };
 
 
@@ -274,7 +274,7 @@ ol.extent.getTopRight = function(extent) {
  * @return {number} Width.
  */
 ol.extent.getWidth = function(extent) {
-  return extent[1][0] - extent[0][0];
+  return extent[2] - extent[0];
 };
 
 
@@ -284,10 +284,10 @@ ol.extent.getWidth = function(extent) {
  * @return {boolean} Intersects.
  */
 ol.extent.intersects = function(extent1, extent2) {
-  return extent1[0][0] <= extent2[1][0] &&
-      extent1[1][0] >= extent2[0][0] &&
-      extent1[0][1] <= extent2[1][1] &&
-      extent1[1][1] >= extent2[0][1];
+  return extent1[0] <= extent2[2] &&
+      extent1[2] >= extent2[0] &&
+      extent1[1] <= extent2[3] &&
+      extent1[3] >= extent2[1];
 };
 
 
@@ -296,7 +296,7 @@ ol.extent.intersects = function(extent1, extent2) {
  * @return {boolean} Is empty.
  */
 ol.extent.isEmpty = function(extent) {
-  return extent[1][0] < extent[0][0] || extent[1][1] < extent[0][1];
+  return extent[2] < extent[0] || extent[3] < extent[1];
 };
 
 
@@ -307,8 +307,8 @@ ol.extent.isEmpty = function(extent) {
  */
 ol.extent.normalize = function(extent, coordinate) {
   return [
-    (coordinate[0] - extent[0][0]) / (extent[1][0] - extent[0][0]),
-    (coordinate[1] - extent[0][1]) / (extent[1][1] - extent[0][1])
+    (coordinate[0] - extent[0]) / (extent[2] - extent[0]),
+    (coordinate[1] - extent[1]) / (extent[3] - extent[1])
   ];
 };
 
@@ -318,12 +318,12 @@ ol.extent.normalize = function(extent, coordinate) {
  * @param {number} value Value.
  */
 ol.extent.scaleFromCenter = function(extent, value) {
-  var deltaX = ((extent[1][0] - extent[0][0]) / 2) * (value - 1);
-  var deltaY = ((extent[1][1] - extent[0][1]) / 2) * (value - 1);
-  extent[0][0] -= deltaX;
-  extent[1][0] += deltaX;
-  extent[0][1] -= deltaY;
-  extent[1][1] += deltaY;
+  var deltaX = ((extent[2] - extent[0]) / 2) * (value - 1);
+  var deltaY = ((extent[3] - extent[1]) / 2) * (value - 1);
+  extent[0] -= deltaX;
+  extent[2] += deltaX;
+  extent[1] -= deltaY;
+  extent[3] += deltaY;
 };
 
 
@@ -332,8 +332,8 @@ ol.extent.scaleFromCenter = function(extent, value) {
  * @return {string} String.
  */
 ol.extent.toString = function(extent) {
-  return '(' + [extent[0][0], extent[1][0], extent[0][1],
-    extent[1][1]].join(', ') + ')';
+  return '(' + [extent[0], extent[2], extent[1],
+    extent[3]].join(', ') + ')';
 };
 
 
@@ -345,10 +345,10 @@ ol.extent.toString = function(extent) {
  */
 ol.extent.transform = function(extent, transformFn, opt_extent) {
   var coordinates = [
-    extent[0][0], extent[0][1],
-    extent[0][0], extent[1][1],
-    extent[1][0], extent[0][1],
-    extent[1][0], extent[1][1]
+    extent[0], extent[1],
+    extent[0], extent[3],
+    extent[2], extent[1],
+    extent[2], extent[3]
   ];
   transformFn(coordinates, coordinates, 2);
   var xs = [coordinates[0], coordinates[2], coordinates[4], coordinates[6]];