From a670b7979c6f37a9a5cfb7d493bcd7b3a9a99a16 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 3 Sep 2013 17:49:22 -0600 Subject: [PATCH] Tile grid working with new extent structure --- src/ol/tilegrid/tilegrid.js | 8 ++++---- test/spec/ol/tilegrid/tilegrid.test.js | 28 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index ced5880a2c..8b96bad2f5 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], extent[2], resolution, false, tileCoord); + extent[0][0], extent[0][1], resolution, false, tileCoord); var minX = tileCoord.x; var minY = tileCoord.y; this.getTileCoordForXYAndResolution_( - extent[1], extent[3], resolution, true, tileCoord); + extent[1][0], extent[1][1], 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] - projectionExtent[0], - projectionExtent[3] - projectionExtent[2]); + Math.max(projectionExtent[1][0] - projectionExtent[0][0], + projectionExtent[1][1] - projectionExtent[0][1]); var maxZoom = goog.isDef(opt_maxZoom) ? opt_maxZoom : ol.DEFAULT_MAX_ZOOM; var tileSize = goog.isDef(opt_tileSize) ? diff --git a/test/spec/ol/tilegrid/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js index 8a4e9fef2a..b874adb6e0 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, 100000, 0, 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]).to.eql(0); - expect(tileCoordExtent[1]).to.eql(100000); - expect(tileCoordExtent[2]).to.eql(0); - expect(tileCoordExtent[3]).to.eql(100000); + 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); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 9, 0)); - expect(tileCoordExtent[0]).to.eql(90000); - expect(tileCoordExtent[1]).to.eql(100000); - expect(tileCoordExtent[2]).to.eql(0); - expect(tileCoordExtent[3]).to.eql(10000); + 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); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 0, 9)); - expect(tileCoordExtent[0]).to.eql(0); - expect(tileCoordExtent[1]).to.eql(10000); - expect(tileCoordExtent[2]).to.eql(90000); - expect(tileCoordExtent[3]).to.eql(100000); + 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); }); }); @@ -529,7 +529,7 @@ describe('ol.tilegrid.TileGrid', function() { origin: origin, tileSize: tileSize }); - var e = [45000, 55000, 5000, 15000]; + var e = [[45000, 5000], [55000, 15000]]; var tileRange; tileRange = tileGrid.getTileRangeForExtentAndZ(e, 0);