From e806f51b3d5ea81c652c6d19ceb2064153501c23 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 15 Sep 2013 00:15:24 -0600 Subject: [PATCH] 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. --- examples/navigation-controls.js | 4 +- examples/wms-custom-proj.js | 4 +- examples/wms-image-custom-proj.js | 4 +- examples/wms-image.js | 2 +- examples/wms-tiled.js | 2 +- examples/wmts-ign.js | 4 +- examples/wmts.js | 2 +- src/ol/expr/expression.js | 2 +- src/ol/extent.js | 118 +++++++-------- src/ol/geom/linestring.js | 2 +- src/ol/geom/point.js | 2 +- src/ol/geom2/geom2.js | 21 ++- src/ol/layer/vectorlayer.js | 7 +- src/ol/parser/ogc/filterparser_v1.js | 8 +- src/ol/parser/ogc/filterparser_v1_0_0.js | 10 +- src/ol/parser/ogc/filterparser_v1_1_0.js | 10 +- src/ol/parser/ogc/gmlparser_v2.js | 12 +- src/ol/parser/ogc/gmlparser_v3.js | 14 +- src/ol/parser/ogc/wmscapabilitiesparser_v1.js | 7 +- .../parser/ogc/wmscapabilitiesparser_v1_1.js | 7 +- src/ol/proj/chprojection.js | 6 +- src/ol/proj/epsg3857projection.js | 4 +- src/ol/proj/epsg4326projection.js | 2 +- .../canvas/canvasimagelayerrenderer.js | 4 +- .../canvas/canvastilelayerrenderer.js | 4 +- .../canvas/canvasvectorlayerrenderer.js | 8 +- src/ol/renderer/dom/domimagelayerrenderer.js | 4 +- .../renderer/webgl/webglimagelayerrenderer.js | 8 +- .../renderer/webgl/webgltilelayerrenderer.js | 24 ++-- src/ol/source/imagestaticsource.js | 2 +- src/ol/source/imagewmssource.js | 4 +- src/ol/source/tilewmssource.js | 8 +- src/ol/source/wmssource.js | 4 +- src/ol/source/wmtssource.js | 8 +- src/ol/structs/rtree.js | 68 ++++----- src/ol/tilegrid/tilegrid.js | 8 +- src/ol/view2d.js | 10 +- test/spec/ol/extent.test.js | 136 +++++++++--------- test/spec/ol/geom/geometrycollection.test.js | 8 +- test/spec/ol/geom/linestring.test.js | 8 +- test/spec/ol/geom/multilinestring.test.js | 8 +- test/spec/ol/geom/multipoint.test.js | 8 +- test/spec/ol/geom/multipolygon.test.js | 8 +- test/spec/ol/geom/point.test.js | 8 +- test/spec/ol/geom/polygon.test.js | 8 +- test/spec/ol/geom2/geom2.test.js | 17 +-- test/spec/ol/geom2/linecollection.test.js | 4 +- test/spec/ol/geom2/pointcollection.test.js | 2 +- test/spec/ol/parser/geojson.test.js | 8 +- test/spec/ol/parser/ogc/gml_v2.test.js | 4 +- test/spec/ol/parser/ogc/gml_v3.test.js | 2 +- .../parser/ogc/wmscapabilities_v1_1_1.test.js | 10 +- .../ogc/wmscapabilities_v1_1_1_WMSC.test.js | 4 +- .../parser/ogc/wmscapabilities_v1_3_0.test.js | 6 +- test/spec/ol/parser/topojson.test.js | 10 +- test/spec/ol/proj/chprojection.test.js | 4 +- test/spec/ol/proj/proj.test.js | 4 +- .../webgl/webglimagelayerrenderer.test.js | 4 +- test/spec/ol/source/tilesource.test.js | 2 +- test/spec/ol/source/vectorsource.test.js | 4 +- test/spec/ol/source/wmssource.test.js | 4 +- test/spec/ol/structs/rtree.test.js | 44 +++--- test/spec/ol/tilegrid/tilegrid.test.js | 28 ++-- 63 files changed, 379 insertions(+), 392 deletions(-) diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index f140950054..d7cbb30d46 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -11,8 +11,8 @@ var map = new ol.Map({ controls: ol.control.defaults().extend([ new ol.control.ZoomToExtent({ extent: [ - [813079.7791264898, 5929220.284081122], - [848966.9639063801, 5936863.986909639] + 813079.7791264898, 5929220.284081122, + 848966.9639063801, 5936863.986909639 ] }) ]), diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 3be2b52dea..8ea4cc8d87 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -12,10 +12,10 @@ goog.require('ol.source.TileWMS'); var projection = ol.proj.configureProj4jsProjection({ code: 'EPSG:21781', - extent: [[485869.5728, 76443.1884], [837076.5648, 299941.7864]] + extent: [485869.5728, 76443.1884, 837076.5648, 299941.7864] }); -var extent = [[420000, 30000], [900000, 350000]]; +var extent = [420000, 30000, 900000, 350000]; var layers = [ new ol.layer.Tile({ source: new ol.source.TileWMS({ diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index 309c4ae126..460fd588fb 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -9,10 +9,10 @@ goog.require('ol.source.ImageWMS'); var projection = ol.proj.configureProj4jsProjection({ code: 'EPSG:21781', - extent: [[485869.5728, 76443.1884], [837076.5648, 299941.7864]] + extent: [485869.5728, 76443.1884, 837076.5648, 299941.7864] }); -var extent = [[420000, 30000], [900000, 350000]]; +var extent = [420000, 30000, 900000, 350000]; var layers = [ new ol.layer.Image({ source: new ol.source.ImageWMS({ diff --git a/examples/wms-image.js b/examples/wms-image.js index 9aabd4b1f2..f6c753779e 100644 --- a/examples/wms-image.js +++ b/examples/wms-image.js @@ -15,7 +15,7 @@ var layers = [ source: new ol.source.ImageWMS({ url: 'http://demo.opengeo.org/geoserver/wms', params: {'LAYERS': 'topp:states'}, - extent: [[-13884991, 2870341], [-7455066, 6338219]] + extent: [-13884991, 2870341, -7455066, 6338219] }) }) ]; diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js index 99b749263d..1afc715f4f 100644 --- a/examples/wms-tiled.js +++ b/examples/wms-tiled.js @@ -14,7 +14,7 @@ var layers = [ source: new ol.source.TileWMS({ url: 'http://demo.opengeo.org/geoserver/wms', params: {'LAYERS': 'topp:states', 'TILED': true}, - extent: [[-13884991, 2870341], [-7455066, 6338219]] + extent: [-13884991, 2870341, -7455066, 6338219] }) }) ]; diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js index 25d9016865..1136e1adca 100644 --- a/examples/wmts-ign.js +++ b/examples/wmts-ign.js @@ -76,8 +76,8 @@ xhr.onload = function() { var view = new ol.View2D(); view.fitExtent([ - [257596.65942095537, 6250898.984085131], - [262082.55751844167, 6251854.446938695]], map.getSize()); + 257596.65942095537, 6250898.984085131, + 262082.55751844167, 6251854.446938695], map.getSize()); map.setView(view); } }; diff --git a/examples/wmts.js b/examples/wmts.js index 75b08d64c7..ff6efc6d51 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -39,7 +39,7 @@ var map = new ol.Map({ matrixIds: matrixIds }), style: '_null', - extent: [[-13682835, 5204068], [-13667473, 5221690]] + extent: [-13682835, 5204068, -13667473, 5221690] }) }) ], diff --git a/src/ol/expr/expression.js b/src/ol/expr/expression.js index eed0d5aee0..b249d6d0cd 100644 --- a/src/ol/expr/expression.js +++ b/src/ol/expr/expression.js @@ -144,7 +144,7 @@ ol.expr.lib[ol.expr.functions.EXTENT] = function(minX, minY, maxX, maxY, this.get(opt_attribute) : this.getGeometry(); if (geometry) { intersects = ol.extent.intersects(geometry.getBounds(), - [[minX, minY], [maxX, maxY]]); + [minX, minY, maxX, maxY]); } return intersects; }; diff --git a/src/ol/extent.js b/src/ol/extent.js index b1309b5ff8..9627ea29a1 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -8,7 +8,7 @@ goog.require('ol.TransformFunction'); /** - * @typedef {Array.} + * @typedef {Array.} */ 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]]; diff --git a/src/ol/geom/linestring.js b/src/ol/geom/linestring.js index ffefc66124..682d474a18 100644 --- a/src/ol/geom/linestring.js +++ b/src/ol/geom/linestring.js @@ -126,7 +126,7 @@ ol.geom.LineString.prototype.getBounds = function() { maxY = y; } } - this.bounds_ = [[minX, minY], [maxX, maxY]]; + this.bounds_ = [minX, minY, maxX, maxY]; } return this.bounds_; }; diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js index f7837972e1..b65f21fc18 100644 --- a/src/ol/geom/point.js +++ b/src/ol/geom/point.js @@ -68,7 +68,7 @@ ol.geom.Point.prototype.getBounds = function() { if (goog.isNull(this.bounds_)) { var x = this.get(0), y = this.get(1); - this.bounds_ = [[x, y], [x, y]]; + this.bounds_ = [x, y, x, y]; } return this.bounds_; }; diff --git a/src/ol/geom2/geom2.js b/src/ol/geom2/geom2.js index 9c70888177..1cdfd5228a 100644 --- a/src/ol/geom2/geom2.js +++ b/src/ol/geom2/geom2.js @@ -11,20 +11,17 @@ goog.require('ol.extent'); * @return {ol.Extent} Extent. */ ol.geom2.getExtent = function(buf, dim) { - var extent = ol.extent.createEmpty(); // TODO: make this accept a dimension - for (var i = 0; i < dim; ++i) { - extent[0][i] = Infinity; - extent[1][i] = -Infinity; - } + var extent = ol.extent.createEmpty(); var bufArr = buf.getArray(); buf.forEachRange(function(start, stop) { - var i, j, value; - for (i = start; i < stop; i += dim) { - for (j = 0; j < dim; ++j) { - value = bufArr[i + j]; - extent[0][j] = Math.min(extent[0][j], value); - extent[1][j] = Math.max(extent[1][j], value); - } + var x, y; + for (var i = start; i < stop; i += dim) { + x = bufArr[i]; + y = bufArr[i + 1]; + extent[0] = Math.min(extent[0], x); + extent[1] = Math.min(extent[1], y); + extent[2] = Math.max(extent[2], x); + extent[3] = Math.max(extent[3], y); } }); return extent; diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js index 9fb14ecfae..01da071cd8 100644 --- a/src/ol/layer/vectorlayer.js +++ b/src/ol/layer/vectorlayer.js @@ -110,13 +110,12 @@ ol.layer.FeatureCache.prototype.getFeaturesObject = function(opt_expr) { for (var i = 0; i < 4; ++i) { goog.asserts.assert(args[i] instanceof ol.expr.Literal); } - var extent = [[ + var extent = [ /** @type {ol.expr.Literal} */ (args[0]).evaluate(), - /** @type {ol.expr.Literal} */ (args[1]).evaluate() - ], [ + /** @type {ol.expr.Literal} */ (args[1]).evaluate(), /** @type {ol.expr.Literal} */ (args[2]).evaluate(), /** @type {ol.expr.Literal} */ (args[3]).evaluate() - ]]; + ]; features = this.rTree_.searchReturningObject(extent); } else { // not a call expression, check logical diff --git a/src/ol/parser/ogc/filterparser_v1.js b/src/ol/parser/ogc/filterparser_v1.js index 6bff72d359..a030b9bf78 100644 --- a/src/ol/parser/ogc/filterparser_v1.js +++ b/src/ol/parser/ogc/filterparser_v1.js @@ -184,10 +184,10 @@ ol.parser.ogc.Filter_v1 = function() { if (goog.isDef(container.geometry)) { args.push(new ol.expr.Literal(this.gml_.createGeometry(container))); } else { - args = [new ol.expr.Literal(container.bounds[0][0]), - new ol.expr.Literal(container.bounds[0][1]), - new ol.expr.Literal(container.bounds[1][0]), - new ol.expr.Literal(container.bounds[1][1])]; + args = [new ol.expr.Literal(container.bounds[0]), + new ol.expr.Literal(container.bounds[1]), + new ol.expr.Literal(container.bounds[2]), + new ol.expr.Literal(container.bounds[3])]; } if (goog.isDef(container.distance)) { args.push(container.distance); diff --git a/src/ol/parser/ogc/filterparser_v1_0_0.js b/src/ol/parser/ogc/filterparser_v1_0_0.js index 94dc17ffeb..b96b1d5552 100644 --- a/src/ol/parser/ogc/filterparser_v1_0_0.js +++ b/src/ol/parser/ogc/filterparser_v1_0_0.js @@ -93,8 +93,8 @@ ol.parser.ogc.Filter_v1_0_0 = function() { goog.asserts.assert(args[3] instanceof ol.expr.Literal); goog.asserts.assert(args[4] instanceof ol.expr.Literal); var bbox = [ - [args[0].getValue(), args[1].getValue()], - [args[2].getValue(), args[3].getValue()] + args[0].getValue(), args[1].getValue(), + args[2].getValue(), args[3].getValue() ]; var projection = args[4].getValue(); var property = args[5]; @@ -133,8 +133,8 @@ ol.parser.ogc.Filter_v1_0_0.prototype.writeSpatial_ = function(filter, name) { goog.asserts.assert(args[2] instanceof ol.expr.Literal); goog.asserts.assert(args[3] instanceof ol.expr.Literal); bbox = [ - [args[0].getValue(), args[1].getValue()], - [args[2].getValue(), args[3].getValue()] + args[0].getValue(), args[1].getValue(), + args[2].getValue(), args[3].getValue() ]; projection = args[4]; property = args[5]; @@ -168,7 +168,7 @@ ol.parser.ogc.Filter_v1_0_0.prototype.writeSpatial_ = function(filter, name) { if (geom !== null) { child = this.writeNode('_geometry', geom, this.gml_.featureNS).firstChild; - } else if (bbox.length === 2) { + } else if (bbox.length === 4) { child = this.writeNode('Box', bbox, 'http://www.opengis.net/gml'); } diff --git a/src/ol/parser/ogc/filterparser_v1_1_0.js b/src/ol/parser/ogc/filterparser_v1_1_0.js index c7147f7fbe..a718fa18f3 100644 --- a/src/ol/parser/ogc/filterparser_v1_1_0.js +++ b/src/ol/parser/ogc/filterparser_v1_1_0.js @@ -131,8 +131,8 @@ ol.parser.ogc.Filter_v1_1_0 = function() { goog.asserts.assert(args[3] instanceof ol.expr.Literal); goog.asserts.assert(args[4] instanceof ol.expr.Literal); var bbox = [ - [args[0].getValue(), args[1].getValue()], - [args[2].getValue(), args[3].getValue()] + args[0].getValue(), args[1].getValue(), + args[2].getValue(), args[3].getValue() ]; var projection = args[4].getValue(); var property = args[5]; @@ -191,8 +191,8 @@ ol.parser.ogc.Filter_v1_1_0.prototype.writeSpatial_ = function(filter, name) { goog.asserts.assert(args[2] instanceof ol.expr.Literal); goog.asserts.assert(args[3] instanceof ol.expr.Literal); bbox = [ - [args[0].getValue(), args[1].getValue()], - [args[2].getValue(), args[3].getValue()] + args[0].getValue(), args[1].getValue(), + args[2].getValue(), args[3].getValue() ]; projection = args[4]; property = args[5]; @@ -226,7 +226,7 @@ ol.parser.ogc.Filter_v1_1_0.prototype.writeSpatial_ = function(filter, name) { if (geom !== null) { child = this.writeNode('_geometry', geom, this.gml_.featureNS).firstChild; - } else if (bbox.length === 2) { + } else if (bbox.length === 4) { child = this.writeNode('Envelope', bbox, 'http://www.opengis.net/gml'); } diff --git a/src/ol/parser/ogc/gmlparser_v2.js b/src/ol/parser/ogc/gmlparser_v2.js index bf548f3e38..ff83c9f46a 100644 --- a/src/ol/parser/ogc/gmlparser_v2.js +++ b/src/ol/parser/ogc/gmlparser_v2.js @@ -2,7 +2,6 @@ goog.provide('ol.parser.ogc.GML_v2'); goog.require('goog.array'); goog.require('goog.object'); -goog.require('ol.extent'); goog.require('ol.parser.ogc.GML'); @@ -36,7 +35,10 @@ ol.parser.ogc.GML_v2 = function(opt_options) { [node, coordinates, container]); this.readChildNodes(node, coordinates); container.projection = node.getAttribute('srsName'); - container.bounds = ol.extent.clone(coordinates[0]); + container.bounds = [ + coordinates[0][0][0], coordinates[0][0][1], + coordinates[0][1][0], coordinates[0][1][1] + ]; } }); goog.object.extend(this.writers['http://www.opengis.net/gml'], { @@ -104,7 +106,11 @@ ol.parser.ogc.GML_v2 = function(opt_options) { }, 'Box': function(extent) { var node = this.createElementNS('gml:Box'); - this.writeNode('coordinates', extent, null, node); + var coordinates = [ + [extent[0], extent[1]], + [extent[2], extent[3]] + ]; + this.writeNode('coordinates', coordinates, null, node); // srsName attribute is optional for gml:Box if (goog.isDefAndNotNull(this.srsName)) { node.setAttribute('srsName', this.srsName); diff --git a/src/ol/parser/ogc/gmlparser_v3.js b/src/ol/parser/ogc/gmlparser_v3.js index b783f9be71..6b8478775d 100644 --- a/src/ol/parser/ogc/gmlparser_v3.js +++ b/src/ol/parser/ogc/gmlparser_v3.js @@ -3,7 +3,6 @@ goog.provide('ol.parser.ogc.GML_v3'); goog.require('goog.array'); goog.require('goog.functions'); goog.require('goog.object'); -goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.parser.ogc.GML'); @@ -216,7 +215,10 @@ ol.parser.ogc.GML_v3 = function(opt_options) { [node, coordinates, container]); this.readChildNodes(node, coordinates); container.projection = node.getAttribute('srsName'); - container.bounds = ol.extent.clone(coordinates); + container.bounds = [ + coordinates[0][0], coordinates[0][1], + coordinates[1][0], coordinates[1][1] + ]; }, 'lowerCorner': function(node, envelope) { var coordinates = []; @@ -391,9 +393,9 @@ ol.parser.ogc.GML_v3 = function(opt_options) { // only 2d for simple features profile var pos; if (this.axisOrientation.substr(0, 2) === 'en') { - pos = (bounds[0][0] + ' ' + bounds[0][1]); + pos = (bounds[0] + ' ' + bounds[1]); } else { - pos = (bounds[0][1] + ' ' + bounds[0][0]); + pos = (bounds[1] + ' ' + bounds[0]); } var node = this.createElementNS('gml:lowerCorner'); node.appendChild(this.createTextNode(pos)); @@ -403,9 +405,9 @@ ol.parser.ogc.GML_v3 = function(opt_options) { // only 2d for simple features profile var pos; if (this.axisOrientation.substr(0, 2) === 'en') { - pos = (bounds[1][0] + ' ' + bounds[1][1]); + pos = (bounds[2] + ' ' + bounds[3]); } else { - pos = (bounds[1][1] + ' ' + bounds[1][0]); + pos = (bounds[3] + ' ' + bounds[2]); } var node = this.createElementNS('gml:upperCorner'); node.appendChild(this.createTextNode(pos)); diff --git a/src/ol/parser/ogc/wmscapabilitiesparser_v1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1.js index 4ef0188baf..55ed0c5a07 100644 --- a/src/ol/parser/ogc/wmscapabilitiesparser_v1.js +++ b/src/ol/parser/ogc/wmscapabilitiesparser_v1.js @@ -31,13 +31,12 @@ ol.parser.ogc.WMSCapabilities_v1 = function() { }, 'BoundingBox': function(node, obj) { var bbox = {}; - bbox['bbox'] = [[ + bbox['bbox'] = [ parseFloat(node.getAttribute('minx')), - parseFloat(node.getAttribute('miny')) - ], [ + parseFloat(node.getAttribute('miny')), parseFloat(node.getAttribute('maxx')), parseFloat(node.getAttribute('maxy')) - ]]; + ]; var res = { x: parseFloat(node.getAttribute('resx')), y: parseFloat(node.getAttribute('resy')) diff --git a/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js index 478282b7f2..b367cfa339 100644 --- a/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js +++ b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js @@ -47,13 +47,12 @@ ol.parser.ogc.WMSCapabilities_v1_1 = function() { obj['userSymbols'] = userSymbols; }, 'LatLonBoundingBox': function(node, obj) { - obj['llbbox'] = [[ + obj['llbbox'] = [ parseFloat(node.getAttribute('minx')), - parseFloat(node.getAttribute('miny')) - ], [ + parseFloat(node.getAttribute('miny')), parseFloat(node.getAttribute('maxx')), parseFloat(node.getAttribute('maxy')) - ]]; + ]; }, 'BoundingBox': function(node, obj) { var bbox = bboxreader.apply(this, arguments); diff --git a/src/ol/proj/chprojection.js b/src/ol/proj/chprojection.js index 3b485b32b4..e16fa0de69 100644 --- a/src/ol/proj/chprojection.js +++ b/src/ol/proj/chprojection.js @@ -410,7 +410,7 @@ goog.inherits(ol.proj.EPSG2056, ol.proj.CH); * @type {ol.Extent} */ ol.proj.EPSG2056.EXTENT = - [[2485869.5728, 1076443.1884], [2837076.5648, 1299941.7864]]; + [2485869.5728, 1076443.1884, 2837076.5648, 1299941.7864]; /** @@ -448,8 +448,8 @@ goog.inherits(ol.proj.EPSG21781, ol.proj.CH); * @type {ol.Extent} */ ol.proj.EPSG21781.EXTENT = [ - [485869.5728, 76443.1884], - [837076.5648, 299941.7864] + 485869.5728, 76443.1884, + 837076.5648, 299941.7864 ]; diff --git a/src/ol/proj/epsg3857projection.js b/src/ol/proj/epsg3857projection.js index 8375f889b8..e7739ffb0b 100644 --- a/src/ol/proj/epsg3857projection.js +++ b/src/ol/proj/epsg3857projection.js @@ -44,8 +44,8 @@ ol.proj.EPSG3857.HALF_SIZE = Math.PI * ol.proj.EPSG3857.RADIUS; * @type {ol.Extent} */ ol.proj.EPSG3857.EXTENT = [ - [-ol.proj.EPSG3857.HALF_SIZE, -ol.proj.EPSG3857.HALF_SIZE], - [ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE] + -ol.proj.EPSG3857.HALF_SIZE, -ol.proj.EPSG3857.HALF_SIZE, + ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE ]; diff --git a/src/ol/proj/epsg4326projection.js b/src/ol/proj/epsg4326projection.js index 4acedbede5..57924a4ddc 100644 --- a/src/ol/proj/epsg4326projection.js +++ b/src/ol/proj/epsg4326projection.js @@ -30,7 +30,7 @@ goog.inherits(ol.proj.EPSG4326, ol.Projection); * @const * @type {ol.Extent} */ -ol.proj.EPSG4326.EXTENT = [[-180, -90], [180, 90]]; +ol.proj.EPSG4326.EXTENT = [-180, -90, 180, 90]; /** diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index e3cd41ce23..d2d4a11590 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -113,8 +113,8 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame = 1); goog.vec.Mat4.translate( transform, - (imageExtent[0][0] - viewCenter[0]) / imageResolution, - (viewCenter[1] - imageExtent[1][1]) / imageResolution, + (imageExtent[0] - viewCenter[0]) / imageResolution, + (viewCenter[1] - imageExtent[3]) / imageResolution, 0); this.updateAttributions(frameState.attributions, image.getAttributions()); diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 9b5993e5cb..52d0c14213 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -348,8 +348,8 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame = for (tileCoordKey in tilesToDraw) { tile = tilesToDraw[tileCoordKey]; tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent); - x = (tileExtent[0][0] - origin[0]) / tileResolution; - y = (origin[1] - tileExtent[1][1]) / tileResolution; + x = (tileExtent[0] - origin[0]) / tileResolution; + y = (origin[1] - tileExtent[3]) / tileResolution; width = scale * tileSize[0]; height = scale * tileSize[1]; tileState = tile.getState(); diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 1c203cf7b7..f8aa6fd19f 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -477,10 +477,10 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame = tilesToRender[key] = tileCoord; } else if (idle) { tileExtent = tileGrid.getTileCoordExtent(tileCoord); - tileExtent[0][0] -= tileGutter; - tileExtent[1][0] += tileGutter; - tileExtent[0][1] -= tileGutter; - tileExtent[1][1] += tileGutter; + tileExtent[0] -= tileGutter; + tileExtent[2] += tileGutter; + tileExtent[1] -= tileGutter; + tileExtent[3] += tileGutter; tileHasFeatures = false; for (i = 0; i < numTypes; ++i) { type = types[i]; diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 8f146a7cf4..8c8a3fa7c9 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -99,8 +99,8 @@ ol.renderer.dom.ImageLayer.prototype.renderFrame = 1); goog.vec.Mat4.translate( transform, - (imageExtent[0][0] - viewCenter[0]) / imageResolution, - (viewCenter[1] - imageExtent[1][1]) / imageResolution, + (imageExtent[0] - viewCenter[0]) / imageResolution, + (viewCenter[1] - imageExtent[3]) / imageResolution, 0); if (image != this.image_) { var imageElement = image.getImageElement(this); diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 9138098168..bbef2d4f72 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -169,12 +169,12 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = 2 / canvasExtentWidth, 2 / canvasExtentHeight, 1); goog.vec.Mat4.rotateZ(projectionMatrix, -viewRotation); goog.vec.Mat4.translate(projectionMatrix, - imageExtent[0][0] - viewCenter[0], - imageExtent[0][1] - viewCenter[1], + imageExtent[0] - viewCenter[0], + imageExtent[1] - viewCenter[1], 0); goog.vec.Mat4.scale(projectionMatrix, - (imageExtent[1][0] - imageExtent[0][0]) / 2, - (imageExtent[1][1] - imageExtent[0][1]) / 2, + (imageExtent[2] - imageExtent[0]) / 2, + (imageExtent[3] - imageExtent[1]) / 2, 1); goog.vec.Mat4.translate(projectionMatrix, 1, 1, 0); diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index 6eed0df344..e60139653b 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -161,8 +161,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame = var minX = origin[0] + tileRange.minX * tileSize[0] * tileResolution; var minY = origin[1] + tileRange.minY * tileSize[1] * tileResolution; framebufferExtent = [ - [minX, minY], - [minX + framebufferExtentDimension, minY + framebufferExtentDimension] + minX, minY, + minX + framebufferExtentDimension, minY + framebufferExtentDimension ]; this.bindFramebuffer(frameState, framebufferDimension); @@ -246,13 +246,13 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame = for (tileKey in tilesToDraw) { tile = tilesToDraw[tileKey]; tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent); - sx = 2 * (tileExtent[1][0] - tileExtent[0][0]) / + sx = 2 * (tileExtent[2] - tileExtent[0]) / framebufferExtentDimension; - sy = 2 * (tileExtent[1][1] - tileExtent[0][1]) / + sy = 2 * (tileExtent[3] - tileExtent[1]) / framebufferExtentDimension; - tx = 2 * (tileExtent[0][0] - framebufferExtent[0][0]) / + tx = 2 * (tileExtent[0] - framebufferExtent[0]) / framebufferExtentDimension - 1; - ty = 2 * (tileExtent[0][1] - framebufferExtent[0][1]) / + ty = 2 * (tileExtent[1] - framebufferExtent[1]) / framebufferExtentDimension - 1; goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty); gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset); @@ -296,17 +296,17 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame = var texCoordMatrix = this.texCoordMatrix; goog.vec.Mat4.makeIdentity(texCoordMatrix); goog.vec.Mat4.translate(texCoordMatrix, - (center[0] - framebufferExtent[0][0]) / - (framebufferExtent[1][0] - framebufferExtent[0][0]), - (center[1] - framebufferExtent[0][1]) / - (framebufferExtent[1][1] - framebufferExtent[0][1]), + (center[0] - framebufferExtent[0]) / + (framebufferExtent[2] - framebufferExtent[0]), + (center[1] - framebufferExtent[1]) / + (framebufferExtent[3] - framebufferExtent[1]), 0); goog.vec.Mat4.rotateZ(texCoordMatrix, view2DState.rotation); goog.vec.Mat4.scale(texCoordMatrix, frameState.size[0] * view2DState.resolution / - (framebufferExtent[1][0] - framebufferExtent[0][0]), + (framebufferExtent[2] - framebufferExtent[0]), frameState.size[1] * view2DState.resolution / - (framebufferExtent[1][1] - framebufferExtent[0][1]), + (framebufferExtent[3] - framebufferExtent[1]), 1); goog.vec.Mat4.translate(texCoordMatrix, -0.5, diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestaticsource.js index a920c4484e..b6e3742d9a 100644 --- a/src/ol/source/imagestaticsource.js +++ b/src/ol/source/imagestaticsource.js @@ -20,7 +20,7 @@ ol.source.ImageStatic = function(options) { var imageExtent = options.imageExtent; var imageSize = options.imageSize; - var imageResolution = (imageExtent[1][1] - imageExtent[0][1]) / imageSize[1]; + var imageResolution = (imageExtent[3] - imageExtent[1]) / imageSize[1]; var projection = ol.proj.get(options.projection); goog.base(this, { diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index dfc3305423..2445312dc0 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -89,8 +89,8 @@ ol.source.ImageWMS.prototype.getImage = extent = extent.slice(); ol.extent.scaleFromCenter(extent, this.ratio_); - var width = (extent[1][0] - extent[0][0]) / resolution; - var height = (extent[1][1] - extent[0][1]) / resolution; + var width = (extent[2] - extent[0]) / resolution; + var height = (extent[3] - extent[1]) / resolution; var size = [width, height]; this.image_ = this.createImage(extent, resolution, size, projection); diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index d0853c9540..7faa7244b7 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -75,11 +75,11 @@ ol.source.TileWMS = function(options) { extent = goog.isDef(extent) ? extent : projectionExtent; if (!goog.isNull(extent) && projection.isGlobal() && - extent[0][0] === projectionExtent[0][0] && - extent[1][0] === projectionExtent[1][0]) { + extent[0] === projectionExtent[0] && + extent[2] === projectionExtent[2]) { var numCols = Math.ceil( - (extent[1][0] - extent[0][0]) / - (tileExtent[1][0] - tileExtent[0][0])); + (extent[2] - extent[0]) / + (tileExtent[2] - tileExtent[0])); x = goog.math.modulo(x, numCols); tileExtent = tileGrid.getTileCoordExtent( new ol.TileCoord(tileCoord.z, x, tileCoord.y)); diff --git a/src/ol/source/wmssource.js b/src/ol/source/wmssource.js index 02052e1e6a..1171f5babe 100644 --- a/src/ol/source/wmssource.js +++ b/src/ol/source/wmssource.js @@ -54,8 +54,8 @@ ol.source.wms.getUrl = var axisOrientation = projection.getAxisOrientation(); var bboxValues = (wms13 && axisOrientation.substr(0, 2) == 'ne') ? - [extent[0][1], extent[0][0], extent[1][1], extent[1][0]] : - [extent[0][0], extent[0][1], extent[1][0], extent[1][1]]; + [extent[1], extent[0], extent[3], extent[2]] : + [extent[0], extent[1], extent[2], extent[3]]; baseParams['BBOX'] = bboxValues.join(','); return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams); diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 0d358f5694..e4fecfcd05 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -154,11 +154,11 @@ ol.source.WMTS = function(options) { options.extent : projectionExtent; if (!goog.isNull(extent) && projection.isGlobal() && - extent[0][0] === projectionExtent[0][0] && - extent[1][0] === projectionExtent[1][0]) { + extent[0] === projectionExtent[0] && + extent[2] === projectionExtent[2]) { var numCols = Math.ceil( - (extent[1][0] - extent[0][0]) / - (tileExtent[1][0] - tileExtent[0][0])); + (extent[2] - extent[0]) / + (tileExtent[2] - tileExtent[0])); x = goog.math.modulo(x, numCols); tmpTileCoord.z = tileCoord.z; tmpTileCoord.x = x; diff --git a/src/ol/structs/rtree.js b/src/ol/structs/rtree.js index f7a76e1b92..ad3db13ffb 100644 --- a/src/ol/structs/rtree.js +++ b/src/ol/structs/rtree.js @@ -84,10 +84,10 @@ ol.structs.RTree.recalculateExtent_ = function(node) { ol.extent.empty(extent); } else { var firstNodeExtent = node.nodes[0].extent; - extent[0][0] = firstNodeExtent[0][0]; - extent[1][0] = firstNodeExtent[1][0]; - extent[0][1] = firstNodeExtent[0][1]; - extent[1][1] = firstNodeExtent[1][1]; + extent[0] = firstNodeExtent[0]; + extent[2] = firstNodeExtent[2]; + extent[1] = firstNodeExtent[1]; + extent[3] = firstNodeExtent[3]; var i; for (i = 1; i < n; ++i) { ol.extent.extend(extent, node.nodes[i].extent); @@ -151,19 +151,19 @@ ol.structs.RTree.prototype.chooseLeafSubtree_ = function(rect, root) { } // Area of new enlarged rectangle var oldLRatio = ol.structs.RTree.squarifiedRatio_( - lTree.extent[1][0] - lTree.extent[0][0], - lTree.extent[1][1] - lTree.extent[0][1], + lTree.extent[2] - lTree.extent[0], + lTree.extent[3] - lTree.extent[1], lTree.nodes.length + 1); // Enlarge rectangle to fit new rectangle - var nw = (lTree.extent[1][0] > rect.extent[1][0] ? - lTree.extent[1][0] : rect.extent[1][0]) - - (lTree.extent[0][0] < rect.extent[0][0] ? - lTree.extent[0][0] : rect.extent[0][0]); - var nh = (lTree.extent[1][1] > rect.extent[1][1] ? - lTree.extent[1][1] : rect.extent[1][1]) - - (lTree.extent[0][1] < rect.extent[0][1] ? - lTree.extent[0][1] : rect.extent[0][1]); + var nw = (lTree.extent[2] > rect.extent[2] ? + lTree.extent[2] : rect.extent[2]) - + (lTree.extent[0] < rect.extent[0] ? + lTree.extent[0] : rect.extent[0]); + var nh = (lTree.extent[3] > rect.extent[3] ? + lTree.extent[3] : rect.extent[3]) - + (lTree.extent[1] < rect.extent[1] ? + lTree.extent[1] : rect.extent[1]); // Area of new enlarged rectangle var lRatio = ol.structs.RTree.squarifiedRatio_( @@ -308,21 +308,21 @@ ol.structs.RTree.prototype.pickLinear_ = function(nodes) { for (var i = nodes.length - 2; i >= 0; --i) { var l = nodes[i]; - if (l.extent[0][0] > nodes[highestLowX].extent[0][0]) { + if (l.extent[0] > nodes[highestLowX].extent[0]) { highestLowX = i; - } else if (l.extent[1][0] < nodes[lowestHighX].extent[0][1]) { + } else if (l.extent[2] < nodes[lowestHighX].extent[1]) { lowestHighX = i; } - if (l.extent[0][1] > nodes[highestLowY].extent[0][1]) { + if (l.extent[1] > nodes[highestLowY].extent[1]) { highestLowY = i; - } else if (l.extent[1][1] < nodes[lowestHighY].extent[1][1]) { + } else if (l.extent[3] < nodes[lowestHighY].extent[3]) { lowestHighY = i; } } - var dx = Math.abs(nodes[lowestHighX].extent[1][0] - - nodes[highestLowX].extent[0][0]); - var dy = Math.abs(nodes[lowestHighY].extent[1][1] - - nodes[highestLowY].extent[0][1]); + var dx = Math.abs(nodes[lowestHighX].extent[2] - + nodes[highestLowX].extent[0]); + var dy = Math.abs(nodes[lowestHighY].extent[3] - + nodes[highestLowY].extent[1]); if (dx > dy) { if (lowestHighX > highestLowX) { t1 = nodes.splice(lowestHighX, 1)[0]; @@ -359,10 +359,10 @@ ol.structs.RTree.prototype.pickLinear_ = function(nodes) { */ ol.structs.RTree.prototype.pickNext_ = function(nodes, a, b) { // Area of new enlarged rectangle - var areaA = ol.structs.RTree.squarifiedRatio_(a.extent[1][0] - a.extent[0][0], - a.extent[1][1] - a.extent[0][1], a.nodes.length + 1); - var areaB = ol.structs.RTree.squarifiedRatio_(b.extent[1][0] - b.extent[0][0], - b.extent[1][1] - b.extent[0][1], b.nodes.length + 1); + var areaA = ol.structs.RTree.squarifiedRatio_(a.extent[2] - a.extent[0], + a.extent[3] - a.extent[1], a.nodes.length + 1); + var areaB = ol.structs.RTree.squarifiedRatio_(b.extent[2] - b.extent[0], + b.extent[3] - b.extent[1], b.nodes.length + 1); var highAreaDelta; var highAreaNode; var lowestGrowthGroup; @@ -371,20 +371,20 @@ ol.structs.RTree.prototype.pickNext_ = function(nodes, a, b) { var l = nodes[i]; var newAreaA = [ - a.extent[0][0] < l.extent[0][0] ? a.extent[0][0] : l.extent[0][0], - a.extent[1][0] > l.extent[1][0] ? a.extent[1][0] : l.extent[1][0], - a.extent[0][1] < l.extent[0][1] ? a.extent[0][1] : l.extent[0][1], - a.extent[1][1] > l.extent[1][1] ? a.extent[1][1] : l.extent[1][1] + a.extent[0] < l.extent[0] ? a.extent[0] : l.extent[0], + a.extent[2] > l.extent[2] ? a.extent[2] : l.extent[2], + a.extent[1] < l.extent[1] ? a.extent[1] : l.extent[1], + a.extent[3] > l.extent[3] ? a.extent[3] : l.extent[3] ]; var changeNewAreaA = Math.abs(ol.structs.RTree.squarifiedRatio_( newAreaA[1] - newAreaA[0], newAreaA[3] - newAreaA[2], a.nodes.length + 2) - areaA); var newAreaB = [ - b.extent[0][0] < l.extent[0][0] ? b.extent[0][0] : l.extent[0][0], - b.extent[1][0] > l.extent[1][0] ? b.extent[1][0] : l.extent[1][0], - b.extent[0][1] < l.extent[0][1] ? b.extent[0][1] : l.extent[0][1], - b.extent[1][1] > l.extent[1][1] ? b.extent[1][1] : l.extent[1][1] + b.extent[0] < l.extent[0] ? b.extent[0] : l.extent[0], + b.extent[2] > l.extent[2] ? b.extent[2] : l.extent[2], + b.extent[1] < l.extent[1] ? b.extent[1] : l.extent[1], + b.extent[3] > l.extent[3] ? b.extent[3] : l.extent[3] ]; var changeNewAreaB = Math.abs(ol.structs.RTree.squarifiedRatio_( newAreaB[1] - newAreaB[0], newAreaB[3] - newAreaB[2], diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index 8b96bad2f5..fe90b19b5b 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -232,11 +232,11 @@ ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution = function(extent, resolution, opt_tileRange) { var tileCoord = ol.tilegrid.TileGrid.tmpTileCoord_; this.getTileCoordForXYAndResolution_( - extent[0][0], extent[0][1], resolution, false, tileCoord); + extent[0], extent[1], resolution, false, tileCoord); var minX = tileCoord.x; var minY = tileCoord.y; this.getTileCoordForXYAndResolution_( - extent[1][0], extent[1][1], resolution, true, tileCoord); + extent[2], extent[3], resolution, true, tileCoord); return ol.TileRange.createOrUpdate( minX, tileCoord.x, minY, tileCoord.y, opt_tileRange); }; @@ -414,8 +414,8 @@ ol.tilegrid.createForProjection = var size = goog.isNull(projectionExtent) ? 360 * ol.METERS_PER_UNIT[ol.ProjectionUnits.DEGREES] / projection.getMetersPerUnit() : - Math.max(projectionExtent[1][0] - projectionExtent[0][0], - projectionExtent[1][1] - projectionExtent[0][1]); + Math.max(projectionExtent[2] - projectionExtent[0], + projectionExtent[3] - projectionExtent[1]); var maxZoom = goog.isDef(opt_maxZoom) ? opt_maxZoom : ol.DEFAULT_MAX_ZOOM; var tileSize = goog.isDef(opt_tileSize) ? diff --git a/src/ol/view2d.js b/src/ol/view2d.js index 6d5fe6218f..dd573f1306 100644 --- a/src/ol/view2d.js +++ b/src/ol/view2d.js @@ -226,7 +226,7 @@ ol.View2D.prototype.calculateExtent = function(size) { var maxX = center[0] + resolution * size[0] / 2; var minY = center[1] - resolution * size[1] / 2; var maxY = center[1] + resolution * size[1] / 2; - return [[minX, minY], [maxX, maxY]]; + return [minX, minY, maxX, maxY]; }; @@ -262,8 +262,8 @@ goog.exportProperty( * @return {number} Resolution. */ ol.View2D.prototype.getResolutionForExtent = function(extent, size) { - var xResolution = (extent[1][0] - extent[0][0]) / size[0]; - var yResolution = (extent[1][1] - extent[0][1]) / size[1]; + var xResolution = (extent[2] - extent[0]) / size[0]; + var yResolution = (extent[3] - extent[1]) / size[1]; return Math.max(xResolution, yResolution); }; @@ -498,8 +498,8 @@ ol.View2D.createResolutionConstraint_ = function(options) { // use an extent that can fit the whole world if need be 360 * ol.METERS_PER_UNIT[ol.ProjectionUnits.DEGREES] / ol.METERS_PER_UNIT[projection.getUnits()] : - Math.max(projectionExtent[1][0] - projectionExtent[0][0], - projectionExtent[1][1] - projectionExtent[0][1]); + Math.max(projectionExtent[2] - projectionExtent[0], + projectionExtent[3] - projectionExtent[1]); maxResolution = size / ol.DEFAULT_TILE_SIZE; } var maxZoom = options.maxZoom; diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index efb0368e1e..c4a9a1dbeb 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -20,7 +20,7 @@ describe('ol.extent', function() { describe('positive', function() { it('returns true', function() { - var extent = [[1, 2], [3, 4]]; + var extent = [1, 2, 3, 4]; expect(ol.extent.containsCoordinate(extent, [1, 2])).to.be.ok(); expect(ol.extent.containsCoordinate(extent, [1, 3])).to.be.ok(); expect(ol.extent.containsCoordinate(extent, [1, 4])).to.be.ok(); @@ -35,7 +35,7 @@ describe('ol.extent', function() { describe('negative', function() { it('returns false', function() { - var extent = [[1, 2], [3, 4]]; + var extent = [1, 2, 3, 4]; expect(ol.extent.containsCoordinate(extent, [0, 1])).to.not.be(); expect(ol.extent.containsCoordinate(extent, [0, 2])).to.not.be(); expect(ol.extent.containsCoordinate(extent, [0, 3])).to.not.be(); @@ -58,7 +58,7 @@ describe('ol.extent', function() { describe('getCenter', function() { it('returns the expected center', function() { - var extent = [[1, 2], [3, 4]]; + var extent = [1, 2, 3, 4]; var center = ol.extent.getCenter(extent); expect(center[0]).to.eql(2); expect(center[1]).to.eql(3); @@ -70,53 +70,53 @@ describe('ol.extent', function() { it('works for a unit square', function() { var extent = ol.extent.getForView2DAndSize( [0, 0], 1, 0, [1, 1]); - expect(extent[0][0]).to.be(-0.5); - expect(extent[1][0]).to.be(0.5); - expect(extent[0][1]).to.be(-0.5); - expect(extent[1][1]).to.be(0.5); + expect(extent[0]).to.be(-0.5); + expect(extent[2]).to.be(0.5); + expect(extent[1]).to.be(-0.5); + expect(extent[3]).to.be(0.5); }); it('works for center', function() { var extent = ol.extent.getForView2DAndSize( [5, 10], 1, 0, [1, 1]); - expect(extent[0][0]).to.be(4.5); - expect(extent[1][0]).to.be(5.5); - expect(extent[0][1]).to.be(9.5); - expect(extent[1][1]).to.be(10.5); + expect(extent[0]).to.be(4.5); + expect(extent[2]).to.be(5.5); + expect(extent[1]).to.be(9.5); + expect(extent[3]).to.be(10.5); }); it('works for rotation', function() { var extent = ol.extent.getForView2DAndSize( [0, 0], 1, Math.PI / 4, [1, 1]); - expect(extent[0][0]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9); - expect(extent[1][0]).to.roughlyEqual(Math.sqrt(0.5), 1e-9); - expect(extent[0][1]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9); - expect(extent[1][1]).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[1]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9); + expect(extent[3]).to.roughlyEqual(Math.sqrt(0.5), 1e-9); }); it('works for resolution', function() { var extent = ol.extent.getForView2DAndSize( [0, 0], 2, 0, [1, 1]); - expect(extent[0][0]).to.be(-1); - expect(extent[1][0]).to.be(1); - expect(extent[0][1]).to.be(-1); - expect(extent[1][1]).to.be(1); + expect(extent[0]).to.be(-1); + expect(extent[2]).to.be(1); + expect(extent[1]).to.be(-1); + expect(extent[3]).to.be(1); }); it('works for size', function() { var extent = ol.extent.getForView2DAndSize( [0, 0], 1, 0, [10, 5]); - expect(extent[0][0]).to.be(-5); - expect(extent[1][0]).to.be(5); - expect(extent[0][1]).to.be(-2.5); - expect(extent[1][1]).to.be(2.5); + expect(extent[0]).to.be(-5); + expect(extent[2]).to.be(5); + expect(extent[1]).to.be(-2.5); + expect(extent[3]).to.be(2.5); }); }); describe('getSize', function() { it('returns the expected size', function() { - var extent = [[0, 1], [2, 4]]; + var extent = [0, 1, 2, 4]; var size = ol.extent.getSize(extent); expect(size).to.eql([2, 3]); }); @@ -126,40 +126,40 @@ describe('ol.extent', function() { it('returns the expected value', function() { var intersects = ol.extent.intersects; - var extent = [[50, 50], [100, 100]]; + var extent = [50, 50, 100, 100]; expect(intersects(extent, extent)).to.be(true); - expect(intersects(extent, [[20, 20], [80, 80]])).to.be(true); - expect(intersects(extent, [[20, 50], [80, 100]])).to.be(true); - expect(intersects(extent, [[20, 80], [80, 120]])).to.be(true); - expect(intersects(extent, [[50, 20], [100, 80]])).to.be(true); - expect(intersects(extent, [[50, 80], [100, 120]])).to.be(true); - expect(intersects(extent, [[80, 20], [120, 80]])).to.be(true); - expect(intersects(extent, [[80, 50], [120, 100]])).to.be(true); - expect(intersects(extent, [[80, 80], [120, 120]])).to.be(true); - expect(intersects(extent, [[20, 20], [120, 120]])).to.be(true); - expect(intersects(extent, [[70, 70], [80, 80]])).to.be(true); - expect(intersects(extent, [[10, 10], [30, 30]])).to.be(false); - expect(intersects(extent, [[30, 10], [70, 30]])).to.be(false); - expect(intersects(extent, [[50, 10], [100, 30]])).to.be(false); - expect(intersects(extent, [[80, 10], [120, 30]])).to.be(false); - expect(intersects(extent, [[120, 10], [140, 30]])).to.be(false); - expect(intersects(extent, [[10, 30], [30, 70]])).to.be(false); - expect(intersects(extent, [[120, 30], [140, 70]])).to.be(false); - expect(intersects(extent, [[10, 50], [30, 100]])).to.be(false); - expect(intersects(extent, [[120, 50], [140, 100]])).to.be(false); - expect(intersects(extent, [[10, 80], [30, 120]])).to.be(false); - expect(intersects(extent, [[120, 80], [140, 120]])).to.be(false); - expect(intersects(extent, [[10, 120], [30, 140]])).to.be(false); - expect(intersects(extent, [[30, 120], [70, 140]])).to.be(false); - expect(intersects(extent, [[50, 120], [100, 140]])).to.be(false); - expect(intersects(extent, [[80, 120], [120, 140]])).to.be(false); - expect(intersects(extent, [[120, 120], [140, 140]])).to.be(false); + expect(intersects(extent, [20, 20, 80, 80])).to.be(true); + expect(intersects(extent, [20, 50, 80, 100])).to.be(true); + expect(intersects(extent, [20, 80, 80, 120])).to.be(true); + expect(intersects(extent, [50, 20, 100, 80])).to.be(true); + expect(intersects(extent, [50, 80, 100, 120])).to.be(true); + expect(intersects(extent, [80, 20, 120, 80])).to.be(true); + expect(intersects(extent, [80, 50, 120, 100])).to.be(true); + expect(intersects(extent, [80, 80, 120, 120])).to.be(true); + expect(intersects(extent, [20, 20, 120, 120])).to.be(true); + expect(intersects(extent, [70, 70, 80, 80])).to.be(true); + expect(intersects(extent, [10, 10, 30, 30])).to.be(false); + expect(intersects(extent, [30, 10, 70, 30])).to.be(false); + expect(intersects(extent, [50, 10, 100, 30])).to.be(false); + expect(intersects(extent, [80, 10, 120, 30])).to.be(false); + expect(intersects(extent, [120, 10, 140, 30])).to.be(false); + expect(intersects(extent, [10, 30, 30, 70])).to.be(false); + expect(intersects(extent, [120, 30, 140, 70])).to.be(false); + expect(intersects(extent, [10, 50, 30, 100])).to.be(false); + expect(intersects(extent, [120, 50, 140, 100])).to.be(false); + expect(intersects(extent, [10, 80, 30, 120])).to.be(false); + expect(intersects(extent, [120, 80, 140, 120])).to.be(false); + expect(intersects(extent, [10, 120, 30, 140])).to.be(false); + expect(intersects(extent, [30, 120, 70, 140])).to.be(false); + expect(intersects(extent, [50, 120, 100, 140])).to.be(false); + expect(intersects(extent, [80, 120, 120, 140])).to.be(false); + expect(intersects(extent, [120, 120, 140, 140])).to.be(false); }); }); describe('normalize', function() { it('returns the expected coordinate', function() { - var extent = [[0, 1], [2, 3]]; + var extent = [0, 1, 2, 3]; var coordinate; coordinate = ol.extent.normalize(extent, [1, 2]); @@ -186,18 +186,18 @@ describe('ol.extent', function() { describe('scaleFromCenter', function() { it('scales the extent from its center', function() { - var extent = [[1, 1], [3, 3]]; + var extent = [1, 1, 3, 3]; ol.extent.scaleFromCenter(extent, 2); - expect(extent[0][0]).to.eql(0); - expect(extent[1][0]).to.eql(4); - expect(extent[0][1]).to.eql(0); - expect(extent[1][1]).to.eql(4); + expect(extent[0]).to.eql(0); + expect(extent[2]).to.eql(4); + expect(extent[1]).to.eql(0); + expect(extent[3]).to.eql(4); }); }); describe('toString', function() { it('returns the expected string', function() { - var extent = [[0, 1], [2, 3]]; + var extent = [0, 1, 2, 3]; expect(ol.extent.toString(extent)).to.eql('(0, 2, 1, 3)'); }); }); @@ -206,16 +206,16 @@ describe('ol.extent', function() { it('does transform', function() { var transformFn = ol.proj.getTransform('EPSG:4326', 'EPSG:3857'); - var sourceExtent = [[-15, -30], [45, 60]]; + var sourceExtent = [-15, -30, 45, 60]; var destinationExtent = ol.extent.transform(sourceExtent, transformFn); expect(destinationExtent).not.to.be(undefined); expect(destinationExtent).not.to.be(null); // FIXME check values with third-party tool - expect(destinationExtent[0][0]) + expect(destinationExtent[0]) .to.roughlyEqual(-1669792.3618991037, 1e-9); - expect(destinationExtent[1][0]).to.roughlyEqual(5009377.085697311, 1e-9); - expect(destinationExtent[0][1]).to.roughlyEqual(-3503549.843504376, 1e-8); - expect(destinationExtent[1][1]).to.roughlyEqual(8399737.889818361, 1e-9); + expect(destinationExtent[2]).to.roughlyEqual(5009377.085697311, 1e-9); + expect(destinationExtent[1]).to.roughlyEqual(-3503549.843504376, 1e-8); + expect(destinationExtent[3]).to.roughlyEqual(8399737.889818361, 1e-9); }); it('takes arbitrary function', function() { @@ -232,14 +232,14 @@ describe('ol.extent', function() { } return output; }; - var sourceExtent = [[-15, -30], [45, 60]]; + var sourceExtent = [-15, -30, 45, 60]; var destinationExtent = ol.extent.transform(sourceExtent, transformFn); expect(destinationExtent).not.to.be(undefined); expect(destinationExtent).not.to.be(null); - expect(destinationExtent[0][0]).to.be(-45); - expect(destinationExtent[1][0]).to.be(15); - expect(destinationExtent[0][1]).to.be(-60); - expect(destinationExtent[1][1]).to.be(30); + expect(destinationExtent[0]).to.be(-45); + expect(destinationExtent[2]).to.be(15); + expect(destinationExtent[1]).to.be(-60); + expect(destinationExtent[3]).to.be(30); }); }); diff --git a/test/spec/ol/geom/geometrycollection.test.js b/test/spec/ol/geom/geometrycollection.test.js index c486eaa493..014fd39b8a 100644 --- a/test/spec/ol/geom/geometrycollection.test.js +++ b/test/spec/ol/geom/geometrycollection.test.js @@ -79,10 +79,10 @@ describe('ol.geom.GeometryCollection', function() { var line = new ol.geom.LineString([[1, 20], [30, 40]]); var multi = new ol.geom.GeometryCollection([point, line]); var bounds = multi.getBounds(); - expect(bounds[0][0]).to.be(1); - expect(bounds[1][0]).to.be(30); - expect(bounds[0][1]).to.be(2); - expect(bounds[1][1]).to.be(40); + expect(bounds[0]).to.be(1); + expect(bounds[2]).to.be(30); + expect(bounds[1]).to.be(2); + expect(bounds[3]).to.be(40); }); }); diff --git a/test/spec/ol/geom/linestring.test.js b/test/spec/ol/geom/linestring.test.js index 58c37a4457..39f6ff3693 100644 --- a/test/spec/ol/geom/linestring.test.js +++ b/test/spec/ol/geom/linestring.test.js @@ -39,10 +39,10 @@ describe('ol.geom.LineString', function() { it('returns the bounding extent', function() { var line = new ol.geom.LineString([[10, 20], [20, 30], [30, 40]]); var bounds = line.getBounds(); - expect(bounds[0][0]).to.be(10); - expect(bounds[1][0]).to.be(30); - expect(bounds[0][1]).to.be(20); - expect(bounds[1][1]).to.be(40); + expect(bounds[0]).to.be(10); + expect(bounds[2]).to.be(30); + expect(bounds[1]).to.be(20); + expect(bounds[3]).to.be(40); }); }); diff --git a/test/spec/ol/geom/multilinestring.test.js b/test/spec/ol/geom/multilinestring.test.js index 4a0a305cef..571b038175 100644 --- a/test/spec/ol/geom/multilinestring.test.js +++ b/test/spec/ol/geom/multilinestring.test.js @@ -61,10 +61,10 @@ describe('ol.geom.MultiLineString', function() { [[10, 20], [30, 40]], [[20, 30], [40, 50]]]); var bounds = multi.getBounds(); - expect(bounds[0][0]).to.be(10); - expect(bounds[1][0]).to.be(40); - expect(bounds[0][1]).to.be(20); - expect(bounds[1][1]).to.be(50); + expect(bounds[0]).to.be(10); + expect(bounds[2]).to.be(40); + expect(bounds[1]).to.be(20); + expect(bounds[3]).to.be(50); }); }); diff --git a/test/spec/ol/geom/multipoint.test.js b/test/spec/ol/geom/multipoint.test.js index 636ed9bf34..a79a75b59a 100644 --- a/test/spec/ol/geom/multipoint.test.js +++ b/test/spec/ol/geom/multipoint.test.js @@ -51,10 +51,10 @@ describe('ol.geom.MultiPoint', function() { it('returns the bounding extent', function() { var multi = new ol.geom.MultiPoint([[10, 20], [30, 40]]); var bounds = multi.getBounds(); - expect(bounds[0][0]).to.be(10); - expect(bounds[1][0]).to.be(30); - expect(bounds[0][1]).to.be(20); - expect(bounds[1][1]).to.be(40); + expect(bounds[0]).to.be(10); + expect(bounds[2]).to.be(30); + expect(bounds[1]).to.be(20); + expect(bounds[3]).to.be(40); }); }); diff --git a/test/spec/ol/geom/multipolygon.test.js b/test/spec/ol/geom/multipolygon.test.js index bfad33a60b..2cd118e0ed 100644 --- a/test/spec/ol/geom/multipolygon.test.js +++ b/test/spec/ol/geom/multipolygon.test.js @@ -64,10 +64,10 @@ describe('ol.geom.MultiPolygon', function() { [outer1, inner1a, inner1b], [outer2]]); var bounds = multi.getBounds(); - expect(bounds[0][0]).to.be(0); - expect(bounds[1][0]).to.be(20); - expect(bounds[0][1]).to.be(0); - expect(bounds[1][1]).to.be(50); + expect(bounds[0]).to.be(0); + expect(bounds[2]).to.be(20); + expect(bounds[1]).to.be(0); + expect(bounds[3]).to.be(50); }); }); diff --git a/test/spec/ol/geom/point.test.js b/test/spec/ol/geom/point.test.js index 6acf73a6ef..ff3e7db02e 100644 --- a/test/spec/ol/geom/point.test.js +++ b/test/spec/ol/geom/point.test.js @@ -48,10 +48,10 @@ describe('ol.geom.Point', function() { it('returns the bounding extent', function() { var point = new ol.geom.Point([10, 20]); var bounds = point.getBounds(); - expect(bounds[0][0]).to.be(10); - expect(bounds[1][0]).to.be(10); - expect(bounds[0][1]).to.be(20); - expect(bounds[1][1]).to.be(20); + expect(bounds[0]).to.be(10); + expect(bounds[2]).to.be(10); + expect(bounds[1]).to.be(20); + expect(bounds[3]).to.be(20); }); }); diff --git a/test/spec/ol/geom/polygon.test.js b/test/spec/ol/geom/polygon.test.js index a07922eefd..4cac05c9e7 100644 --- a/test/spec/ol/geom/polygon.test.js +++ b/test/spec/ol/geom/polygon.test.js @@ -80,10 +80,10 @@ describe('ol.geom.Polygon', function() { it('returns the bounding extent', function() { var poly = new ol.geom.Polygon([outer, inner1, inner2]); var bounds = poly.getBounds(); - expect(bounds[0][0]).to.be(0); - expect(bounds[1][0]).to.be(10); - expect(bounds[0][1]).to.be(0); - expect(bounds[1][1]).to.be(10); + expect(bounds[0]).to.be(0); + expect(bounds[2]).to.be(10); + expect(bounds[1]).to.be(0); + expect(bounds[3]).to.be(10); }); }); diff --git a/test/spec/ol/geom2/geom2.test.js b/test/spec/ol/geom2/geom2.test.js index 926fa2a83f..83e87e7ce8 100644 --- a/test/spec/ol/geom2/geom2.test.js +++ b/test/spec/ol/geom2/geom2.test.js @@ -13,22 +13,7 @@ describe('ol.geom2', function() { it('returns the expected extent', function() { var extent = ol.geom2.getExtent(buf, dim); - expect(extent).to.eql([[0, 1], [10, 11]]); - }); - - it('returns the expect extent in three dimensions', function() { - var extent = ol.geom2.getExtent(buf, 3); - expect(extent).to.eql([[0, 1, 2], [9, 10, 11]]); - }); - - it('returns the expect extent in four dimensions', function() { - var extent = ol.geom2.getExtent(buf, 4); - expect(extent).to.eql([[0, 1, 2, 3], [8, 9, 10, 11]]); - }); - - it('returns the expect extent in six dimensions', function() { - var extent = ol.geom2.getExtent(buf, 6); - expect(extent).to.eql([[0, 1, 2, 3, 4, 5], [6, 7, 8, 9, 10, 11]]); + expect(extent).to.eql([0, 1, 10, 11]); }); }); diff --git a/test/spec/ol/geom2/linecollection.test.js b/test/spec/ol/geom2/linecollection.test.js index 7175d42fbd..e1a86b7f9f 100644 --- a/test/spec/ol/geom2/linecollection.test.js +++ b/test/spec/ol/geom2/linecollection.test.js @@ -189,7 +189,7 @@ describe('ol.geom2.LineStringCollection', function() { describe('getExtent', function() { it('returns the expected extent', function() { - expect(lsc.getExtent()).to.eql([[0, 1], [2, 3]]); + expect(lsc.getExtent()).to.eql([0, 1, 2, 3]); }); }); @@ -268,7 +268,7 @@ describe('ol.geom2.LineStringCollection', function() { describe('getExtent', function() { it('returns the expected value', function() { - expect(lsc.getExtent()).to.eql([[0, 1], [8, 9]]); + expect(lsc.getExtent()).to.eql([0, 1, 8, 9]); }); }); diff --git a/test/spec/ol/geom2/pointcollection.test.js b/test/spec/ol/geom2/pointcollection.test.js index 0d5f89c566..246dfec466 100644 --- a/test/spec/ol/geom2/pointcollection.test.js +++ b/test/spec/ol/geom2/pointcollection.test.js @@ -198,7 +198,7 @@ describe('ol.geom2.PointCollection', function() { it('returns the expected value', function() { var extent = pc.getExtent(); - expect(extent).to.eql([[0, 1], [2, 3]]); + expect(extent).to.eql([0, 1, 2, 3]); }); }); diff --git a/test/spec/ol/parser/geojson.test.js b/test/spec/ol/parser/geojson.test.js index f95388b9ef..a7a472e130 100644 --- a/test/spec/ol/parser/geojson.test.js +++ b/test/spec/ol/parser/geojson.test.js @@ -202,7 +202,7 @@ describe('ol.parser.GeoJSON', function() { var firstGeom = first.getGeometry(); expect(firstGeom).to.be.a(ol.geom.Polygon); expect(ol.extent.equals(firstGeom.getBounds(), - [[60.52843, 29.318572], [75.158028, 38.486282]])) + [60.52843, 29.318572, 75.158028, 38.486282])) .to.be(true); var last = result[178]; @@ -212,7 +212,7 @@ describe('ol.parser.GeoJSON', function() { var lastGeom = last.getGeometry(); expect(lastGeom).to.be.a(ol.geom.Polygon); expect(ol.extent.equals(lastGeom.getBounds(), - [[25.264226, -22.271612], [32.849861, -15.507787]])) + [25.264226, -22.271612, 32.849861, -15.507787])) .to.be(true); done(); }); @@ -251,7 +251,7 @@ describe('ol.parser.GeoJSON', function() { var firstGeom = first.getGeometry(); expect(firstGeom).to.be.a(ol.geom.Polygon); expect(ol.extent.equals(firstGeom.getBounds(), - [[60.52843, 29.318572], [75.158028, 38.486282]])) + [60.52843, 29.318572, 75.158028, 38.486282])) .to.be(true); var last = result[178]; @@ -260,7 +260,7 @@ describe('ol.parser.GeoJSON', function() { var lastGeom = last.getGeometry(); expect(lastGeom).to.be.a(ol.geom.Polygon); expect(ol.extent.equals(lastGeom.getBounds(), - [[25.264226, -22.271612], [32.849861, -15.507787]])) + [25.264226, -22.271612, 32.849861, -15.507787])) .to.be(true); }); }); diff --git a/test/spec/ol/parser/ogc/gml_v2.test.js b/test/spec/ol/parser/ogc/gml_v2.test.js index 1c9c1ea1c3..dc79f7bebe 100644 --- a/test/spec/ol/parser/ogc/gml_v2.test.js +++ b/test/spec/ol/parser/ogc/gml_v2.test.js @@ -204,7 +204,7 @@ describe('ol.parser.gml_v2', function() { var url = 'spec/ol/parser/ogc/xml/gml_v2/box-coord.xml'; afterLoadXml(url, function(xml) { var obj = parser.read(xml); - expect(obj.bounds).to.eql([[1, 2], [3, 4]]); + expect(obj.bounds).to.eql([1, 2, 3, 4]); done(); }); }); @@ -212,7 +212,7 @@ describe('ol.parser.gml_v2', function() { var url = 'spec/ol/parser/ogc/xml/gml_v2/box-coordinates.xml'; afterLoadXml(url, function(xml) { var obj = parser.read(xml); - expect(obj.bounds).to.eql([[1, 2], [3, 4]]); + expect(obj.bounds).to.eql([1, 2, 3, 4]); done(); }); }); diff --git a/test/spec/ol/parser/ogc/gml_v3.test.js b/test/spec/ol/parser/ogc/gml_v3.test.js index e6fd62b984..f86cacde95 100644 --- a/test/spec/ol/parser/ogc/gml_v3.test.js +++ b/test/spec/ol/parser/ogc/gml_v3.test.js @@ -9,7 +9,7 @@ describe('ol.parser.gml_v3', function() { var url = 'spec/ol/parser/ogc/xml/gml_v3/envelope.xml'; afterLoadXml(url, function(xml) { var obj = parser.read(xml); - expect(obj.bounds).to.eql([[1, 2], [3, 4]]); + expect(obj.bounds).to.eql([1, 2, 3, 4]); done(); }); }); diff --git a/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js index 7629608191..a4c00991db 100644 --- a/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js +++ b/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js @@ -50,8 +50,8 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1', function() { var abstr = 'Highly simplified road layout of Manhattan in New York..'; expect(layer['abstract']).to.eql(abstr); var bbox = [ - [-74.08769307536667, 40.660618924633326], - [-73.84653192463333, 40.90178007536667] + -74.08769307536667, 40.660618924633326, + -73.84653192463333, 40.90178007536667 ]; expect(layer.llbbox).to.eql(bbox); expect(layer.styles.length).to.eql(1); @@ -89,13 +89,13 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1', function() { expect(layers['ROADS_RIVERS'].srs).to.eql(srs); expect(layers['Temperature'].srs).to.eql({'EPSG:4326': true}); var bbox = layers['ROADS_RIVERS'].bbox['EPSG:26986']; - expect(bbox.bbox).to.eql([[189000, 834000], [285000, 962000]]); + expect(bbox.bbox).to.eql([189000, 834000, 285000, 962000]); expect(bbox.res).to.eql({x: 1, y: 1}); bbox = layers['ROADS_RIVERS'].bbox['EPSG:4326']; - expect(bbox.bbox).to.eql([[-71.63, 41.75], [-70.78, 42.90]]); + expect(bbox.bbox).to.eql([-71.63, 41.75, -70.78, 42.90]); expect(bbox.res).to.eql({x: 0.01, y: 0.01}); bbox = layers['ROADS_1M'].bbox['EPSG:26986']; - expect(bbox.bbox).to.eql([[189000, 834000], [285000, 962000]]); + expect(bbox.bbox).to.eql([189000, 834000, 285000, 962000]); expect(bbox.res).to.eql({x: 1, y: 1}); expect(identifiers).to.be.ok(); expect('DIF_ID' in identifiers).to.be.ok(); diff --git a/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js index 18c3b00139..ba2b3c50f4 100644 --- a/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js +++ b/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js @@ -17,8 +17,8 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1_wmsc', function() { tileset = tilesets[0]; expect(tilesets.length).to.eql(2); var bbox = [ - [-13697515.466796875, 5165920.118906248], - [-13619243.94984375, 5244191.635859374] + -13697515.466796875, 5165920.118906248, + -13619243.94984375, 5244191.635859374 ]; expect(tileset.bbox['EPSG:900913'].bbox).to.eql(bbox); expect(tileset.format).to.eql('image/png'); diff --git a/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js index 4c8fb4b3d7..b3e6050ffb 100644 --- a/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js +++ b/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js @@ -53,13 +53,13 @@ describe('ol.parser.ogc.wmscapabilities_v1_3_0', function() { var infoFormats = ['text/xml', 'text/plain', 'text/html']; expect(layers['Temperature'].infoFormats).to.eql(infoFormats); var bbox = layers['ROADS_RIVERS'].bbox['EPSG:26986']; - expect(bbox.bbox).to.eql([[189000, 834000], [285000, 962000]]); + expect(bbox.bbox).to.eql([189000, 834000, 285000, 962000]); expect(bbox.res).to.eql({x: 1, y: 1}); bbox = layers['ROADS_RIVERS'].bbox['CRS:84']; - expect(bbox.bbox).to.eql([[-71.63, 41.75], [-70.78, 42.90]]); + expect(bbox.bbox).to.eql([-71.63, 41.75, -70.78, 42.90]); expect(bbox.res).to.eql({x: 0.01, y: 0.01}); bbox = layers['ROADS_1M'].bbox['EPSG:26986']; - expect(bbox.bbox).to.eql([[189000, 834000], [285000, 962000]]); + expect(bbox.bbox).to.eql([189000, 834000, 285000, 962000]); expect(bbox.res).to.eql({x: 1, y: 1}); expect(identifiers).to.be.ok(); expect('DIF_ID' in identifiers).to.be.ok(); diff --git a/test/spec/ol/parser/topojson.test.js b/test/spec/ol/parser/topojson.test.js index a547b64646..9cda1170d9 100644 --- a/test/spec/ol/parser/topojson.test.js +++ b/test/spec/ol/parser/topojson.test.js @@ -47,8 +47,8 @@ describe('ol.parser.TopoJSON', function() { expect(geometry).to.be.a(ol.geom.Polygon); expect(geometry.getBounds()).to.eql([ - [-70.08100810081008, 12.417091709170947], - [-69.9009900990099, 12.608069195591469] + -70.08100810081008, 12.417091709170947, + -69.9009900990099, 12.608069195591469 ]); }); @@ -88,15 +88,15 @@ describe('ol.parser.TopoJSON', function() { var firstGeom = first.getGeometry(); expect(firstGeom).to.be.a(ol.geom.MultiPolygon); expect(firstGeom.getBounds()).to.eql( - [[-180, -85.60903777459777], [180, 83.64513000000002]]); + [-180, -85.60903777459777, 180, 83.64513000000002]); var last = result.features[177]; expect(last).to.be.a(ol.Feature); var lastGeom = last.getGeometry(); expect(lastGeom).to.be.a(ol.geom.Polygon); expect(lastGeom.getBounds()).to.eql([ - [25.26325263252633, -22.271802279310577], - [32.848528485284874, -15.50833810039586] + 25.26325263252633, -22.271802279310577, + 32.848528485284874, -15.50833810039586 ]); done(); diff --git a/test/spec/ol/proj/chprojection.test.js b/test/spec/ol/proj/chprojection.test.js index b6934a5a9c..5b86aa6f20 100644 --- a/test/spec/ol/proj/chprojection.test.js +++ b/test/spec/ol/proj/chprojection.test.js @@ -90,8 +90,8 @@ describe('ol.proj.EPSG21781', function() { var fromEPSG4326 = ol.proj.getTransform('EPSG:4326', 'EPSG:21781'); var toEPSG4326 = ol.proj.getTransform('EPSG:21781', 'EPSG:4326'); var roundTripped, x, y; - for (x = extent[0][0]; x < extent[1][0]; x += 50000) { - for (y = extent[0][1]; y < extent[1][1]; y += 50000) { + for (x = extent[0]; x < extent[2]; x += 50000) { + for (y = extent[1]; y < extent[3]; y += 50000) { roundTripped = fromEPSG4326(toEPSG4326([x, y])); expect(roundTripped).to.be.an(Array); expect(roundTripped).to.have.length(2); diff --git a/test/spec/ol/proj/proj.test.js b/test/spec/ol/proj/proj.test.js index 116791c831..313d3234cb 100644 --- a/test/spec/ol/proj/proj.test.js +++ b/test/spec/ol/proj/proj.test.js @@ -284,7 +284,7 @@ describe('ol.proj', function() { describe('ol.proj.removeTransform()', function() { - var extent = [[180, -90], [180, 90]]; + var extent = [180, -90, 180, 90]; var units = ol.ProjectionUnits.DEGREES; it('removes functions cached by addTransform', function() { @@ -347,7 +347,7 @@ describe('ol.proj', function() { }); it('returns a configured projection', function() { - var extent = [[485869.5728, 76443.1884], [837076.5648, 299941.7864]]; + var extent = [485869.5728, 76443.1884, 837076.5648, 299941.7864]; var epsg21781 = ol.proj.configureProj4jsProjection({ code: 'EPSG:21781', extent: extent diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js index f34041566a..c9b9844cb6 100644 --- a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js +++ b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js @@ -17,7 +17,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { }); var layer = new ol.layer.Image({ source: new ol.source.Image({ - extent: [[0, 0], [1, 1]] + extent: [0, 0, 1, 1] }) }); renderer = new ol.renderer.webgl.ImageLayer(map.getRenderer(), layer); @@ -32,7 +32,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { // image size is 1024, 768 // image resolution is 10 - imageExtent = [[0, 0], [10240, 7680]]; + imageExtent = [0, 0, 10240, 7680]; }); afterEach(function() { diff --git a/test/spec/ol/source/tilesource.test.js b/test/spec/ol/source/tilesource.test.js index d5d05f5c71..e643d8f4ea 100644 --- a/test/spec/ol/source/tilesource.test.js +++ b/test/spec/ol/source/tilesource.test.js @@ -192,7 +192,7 @@ describe('ol.source.Tile', function() { * @param {Object.} loaded Lookup of already loaded tiles. */ ol.test.source.TileMock = function(loaded) { - var extent = [[-180, -180], [180, 180]]; + var extent = [-180, -180, 180, 180]; var tileGrid = new ol.tilegrid.TileGrid({ resolutions: [360 / 256, 180 / 256, 90 / 256, 45 / 256], extent: extent, diff --git a/test/spec/ol/source/vectorsource.test.js b/test/spec/ol/source/vectorsource.test.js index edb5ce267f..8029a492aa 100644 --- a/test/spec/ol/source/vectorsource.test.js +++ b/test/spec/ol/source/vectorsource.test.js @@ -20,7 +20,7 @@ describe('ol.source.Vector', function() { var layer = new ol.layer.Vector({ source: source }); - source.prepareFeatures(layer, [[-180, -90], [180, 90]], + source.prepareFeatures(layer, [-180, -90, 180, 90], ol.proj.get('EPSG:4326'), function() { expect(source.loadState_).to.be(ol.source.VectorLoadState.LOADED); @@ -66,7 +66,7 @@ describe('ol.source.Vector', function() { var layer = new ol.layer.Vector({ source: source }); - source.prepareFeatures(layer, [[-180, -90], [180, 90]], + source.prepareFeatures(layer, [-180, -90, 180, 90], ol.proj.get('EPSG:4326'), function() { expect(source.loadState_).to.be(ol.source.VectorLoadState.LOADED); diff --git a/test/spec/ol/source/wmssource.test.js b/test/spec/ol/source/wmssource.test.js index bfc4ebc9c8..fb23af0dbf 100644 --- a/test/spec/ol/source/wmssource.test.js +++ b/test/spec/ol/source/wmssource.test.js @@ -5,7 +5,7 @@ describe('ol.source.wms', function() { describe('ol.source.wms.getUrl', function() { it('creates expected URL', function() { var epsg3857 = ol.proj.get('EPSG:3857'); - var extent = [[-20037508.342789244, -20037508.342789244], [0, 0]]; + var extent = [-20037508.342789244, -20037508.342789244, 0, 0]; var expected = 'http://wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=' + 'GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&WIDTH=256&HEIGHT=256&' + 'foo=bar&STYLES=&CRS=EPSG%3A3857&BBOX=' + @@ -16,7 +16,7 @@ describe('ol.source.wms', function() { }); it('creates expected URL respecting axis orientation', function() { var epsg4326 = ol.proj.get('EPSG:4326'); - var extent = [[-180, -90], [0, 90]]; + var extent = [-180, -90, 0, 90]; var expected = 'http://wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=' + 'GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&WIDTH=256&HEIGHT=256&' + 'foo=bar&STYLES=&CRS=EPSG%3A4326&BBOX=-90%2C-180%2C90%2C0'; diff --git a/test/spec/ol/structs/rtree.test.js b/test/spec/ol/structs/rtree.test.js index bba964d317..0a65afb978 100644 --- a/test/spec/ol/structs/rtree.test.js +++ b/test/spec/ol/structs/rtree.test.js @@ -11,11 +11,11 @@ describe('ol.structs.RTree', function() { while (i > 0) { var min = [Math.random() * 10000, Math.random() * 10000]; var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500]; - var bounds = [min, max]; + var bounds = [min[0], min[1], max[0], max[1]]; rTree.insert(bounds, 'JUST A TEST OBJECT!_' + i); i--; } - expect(goog.object.getCount(rTree.search([[0, 0], [10600, 10600]]))) + expect(goog.object.getCount(rTree.search([0, 0, 10600, 10600]))) .to.be(1000); }); it('can insert 1k more objects', function() { @@ -23,11 +23,11 @@ describe('ol.structs.RTree', function() { while (i > 0) { var min = [Math.random() * 10000, Math.random() * 10000]; var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500]; - var bounds = [min, max]; + var bounds = [min[0], min[1], max[0], max[1]]; rTree.insert(bounds, 'JUST A TEST OBJECT!_' + i); i--; } - expect(goog.object.getCount(rTree.search([[0, 0], [10600, 10600]]))) + expect(goog.object.getCount(rTree.search([0, 0, 10600, 10600]))) .to.be(2000); }); }); @@ -40,7 +40,7 @@ describe('ol.structs.RTree', function() { var min = [-(Math.random() * 10000 + 501), -(Math.random() * 10000 + 501)]; var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500]; - var bounds = [min, max]; + var bounds = [min[0], min[1], max[0], max[1]]; len += rTree.search(bounds).length; i--; } @@ -52,7 +52,7 @@ describe('ol.structs.RTree', function() { while (i > 0) { var min = [Math.random() * 10000, Math.random() * 10000]; var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500]; - var bounds = [min, max]; + var bounds = [min[0], min[1], max[0], max[1]]; len += rTree.search(bounds).length; i--; } @@ -63,12 +63,12 @@ describe('ol.structs.RTree', function() { describe('deletion', function() { var len = 0; it('can delete half the RTree', function() { - var bounds = [[5000, 0], [10500, 10500]]; + var bounds = [5000, 0, 10500, 10500]; len += rTree.remove(bounds).length; expect(len).to.not.be(0); }); it('can delete the other half of the RTree', function() { - var bounds = [[0, 0], [5000, 10500]]; + var bounds = [0, 0, 5000, 10500]; len += rTree.remove(bounds).length; expect(len).to.be(2000); }); @@ -77,42 +77,42 @@ describe('ol.structs.RTree', function() { describe('result plausibility and structure', function() { it('filters by rectangle', function() { - rTree.insert([[0, 0], [1, 1]], 1); - rTree.insert([[1, 1], [4, 4]], 2); - rTree.insert([[2, 2], [3, 3]], 3); - rTree.insert([[-5, -5], [-4, -4]], 4); - rTree.insert([[-4, -4], [-1, -1]], 5); - rTree.insert([[-3, -3], [-2, -2]], 6); + rTree.insert([0, 0, 1, 1], 1); + rTree.insert([1, 1, 4, 4], 2); + rTree.insert([2, 2, 3, 3], 3); + rTree.insert([-5, -5, -4, -4], 4); + rTree.insert([-4, -4, -1, -1], 5); + rTree.insert([-3, -3, -2, -2], 6); var result; - result = goog.object.getValues(rTree.search([[2, 2], [3, 3]])); + result = goog.object.getValues(rTree.search([2, 2, 3, 3])); expect(result).to.contain(2); expect(result).to.contain(3); expect(result.length).to.be(2); - result = goog.object.getValues(rTree.search([[-1, -1], [2, 2]])); + result = goog.object.getValues(rTree.search([-1, -1, 2, 2])); expect(result).to.contain(1); expect(result).to.contain(2); expect(result).to.contain(3); expect(result).to.contain(5); expect(result.length).to.be(4); - expect(goog.object.getCount(rTree.search([[5, 5], [6, 6]]))).to.be(0); + expect(goog.object.getCount(rTree.search([5, 5, 6, 6]))).to.be(0); }); it('filters by type', function() { - rTree.insert([[2, 2], [3, 3]], 7, 'type1'); + rTree.insert([2, 2, 3, 3], 7, 'type1'); var result; - result = rTree.search([[1, 2], [4, 4]], 'type1'); + result = rTree.search([1, 2, 4, 4], 'type1'); expect(result).to.contain(7); expect(result.length).to.be(1); - result = rTree.search([[1, 2], [4, 4]]); + result = rTree.search([1, 2, 4, 4]); expect(result.length).to.be(3); }); it('can return objects instead of arrays', function() { var obj = {foo: 'bar'}; - rTree.insert([[5, 5], [5, 5]], obj); - var result = rTree.searchReturningObject([[4, 4], [6, 6]]); + rTree.insert([5, 5, 5, 5], obj); + var result = rTree.searchReturningObject([4, 4, 6, 6]); expect(result[goog.getUid(obj)]).to.equal(obj); }); diff --git a/test/spec/ol/tilegrid/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js index b874adb6e0..86700b6be6 100644 --- a/test/spec/ol/tilegrid/tilegrid.test.js +++ b/test/spec/ol/tilegrid/tilegrid.test.js @@ -9,7 +9,7 @@ describe('ol.tilegrid.TileGrid', function() { beforeEach(function() { resolutions = [1000, 500, 250, 100]; - extent = [[0, 0], [100000, 100000]]; + extent = [0, 0, 100000, 100000]; origin = [0, 0]; origins = []; tileSize = [100, 100]; @@ -462,22 +462,22 @@ describe('ol.tilegrid.TileGrid', function() { var tileCoordExtent; tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(0, 0, 0)); - expect(tileCoordExtent[0][0]).to.eql(0); - expect(tileCoordExtent[1][0]).to.eql(100000); - expect(tileCoordExtent[0][1]).to.eql(0); - expect(tileCoordExtent[1][1]).to.eql(100000); + expect(tileCoordExtent[0]).to.eql(0); + expect(tileCoordExtent[2]).to.eql(100000); + expect(tileCoordExtent[1]).to.eql(0); + expect(tileCoordExtent[3]).to.eql(100000); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 9, 0)); - expect(tileCoordExtent[0][0]).to.eql(90000); - expect(tileCoordExtent[1][0]).to.eql(100000); - expect(tileCoordExtent[0][1]).to.eql(0); - expect(tileCoordExtent[1][1]).to.eql(10000); + expect(tileCoordExtent[0]).to.eql(90000); + expect(tileCoordExtent[2]).to.eql(100000); + expect(tileCoordExtent[1]).to.eql(0); + expect(tileCoordExtent[3]).to.eql(10000); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 0, 9)); - expect(tileCoordExtent[0][0]).to.eql(0); - expect(tileCoordExtent[1][0]).to.eql(10000); - expect(tileCoordExtent[0][1]).to.eql(90000); - expect(tileCoordExtent[1][1]).to.eql(100000); + expect(tileCoordExtent[0]).to.eql(0); + expect(tileCoordExtent[2]).to.eql(10000); + expect(tileCoordExtent[1]).to.eql(90000); + expect(tileCoordExtent[3]).to.eql(100000); }); }); @@ -529,7 +529,7 @@ describe('ol.tilegrid.TileGrid', function() { origin: origin, tileSize: tileSize }); - var e = [[45000, 5000], [55000, 15000]]; + var e = [45000, 5000, 55000, 15000]; var tileRange; tileRange = tileGrid.getTileRangeForExtentAndZ(e, 0);