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

Tile grid working with new extent structure

Browse Source
This commit is contained in:
Tim Schaub
2013-09-03 17:49:22 -06:00
parent 65863614bb
commit a670b7979c
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/tilegrid/tilegrid.js
+4 -4
View File
@@ -232,11 +232,11 @@ ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution =
function(extent, resolution, opt_tileRange) { function(extent, resolution, opt_tileRange) {
var tileCoord = ol.tilegrid.TileGrid.tmpTileCoord_; var tileCoord = ol.tilegrid.TileGrid.tmpTileCoord_;
this.getTileCoordForXYAndResolution_( this.getTileCoordForXYAndResolution_(
extent[0], extent[2], resolution, false, tileCoord); extent[0][0], extent[0][1], resolution, false, tileCoord);
var minX = tileCoord.x; var minX = tileCoord.x;
var minY = tileCoord.y; var minY = tileCoord.y;
this.getTileCoordForXYAndResolution_( this.getTileCoordForXYAndResolution_(
extent[1], extent[3], resolution, true, tileCoord); extent[1][0], extent[1][1], resolution, true, tileCoord);
return ol.TileRange.createOrUpdate( return ol.TileRange.createOrUpdate(
minX, tileCoord.x, minY, tileCoord.y, opt_tileRange); minX, tileCoord.x, minY, tileCoord.y, opt_tileRange);
}; };
@@ -414,8 +414,8 @@ ol.tilegrid.createForProjection =
var size = goog.isNull(projectionExtent) ? var size = goog.isNull(projectionExtent) ?
360 * ol.METERS_PER_UNIT[ol.ProjectionUnits.DEGREES] / 360 * ol.METERS_PER_UNIT[ol.ProjectionUnits.DEGREES] /
projection.getMetersPerUnit() : projection.getMetersPerUnit() :
Math.max(projectionExtent[1] - projectionExtent[0], Math.max(projectionExtent[1][0] - projectionExtent[0][0],
projectionExtent[3] - projectionExtent[2]); projectionExtent[1][1] - projectionExtent[0][1]);
var maxZoom = goog.isDef(opt_maxZoom) ? var maxZoom = goog.isDef(opt_maxZoom) ?
opt_maxZoom : ol.DEFAULT_MAX_ZOOM; opt_maxZoom : ol.DEFAULT_MAX_ZOOM;
var tileSize = goog.isDef(opt_tileSize) ? var tileSize = goog.isDef(opt_tileSize) ?
test/spec/ol/tilegrid/tilegrid.test.js
+14 -14
View File
@@ -9,7 +9,7 @@ describe('ol.tilegrid.TileGrid', function() {
beforeEach(function() { beforeEach(function() {
resolutions = [1000, 500, 250, 100]; resolutions = [1000, 500, 250, 100];
extent = [0, 100000, 0, 100000]; extent = [[0, 0], [100000, 100000]];
origin = [0, 0]; origin = [0, 0];
origins = []; origins = [];
tileSize = [100, 100]; tileSize = [100, 100];
@@ -462,22 +462,22 @@ describe('ol.tilegrid.TileGrid', function() {
var tileCoordExtent; var tileCoordExtent;
tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(0, 0, 0)); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(0, 0, 0));
expect(tileCoordExtent[0]).to.eql(0); expect(tileCoordExtent[0][0]).to.eql(0);
expect(tileCoordExtent[1]).to.eql(100000); expect(tileCoordExtent[1][0]).to.eql(100000);
expect(tileCoordExtent[2]).to.eql(0); expect(tileCoordExtent[0][1]).to.eql(0);
expect(tileCoordExtent[3]).to.eql(100000); expect(tileCoordExtent[1][1]).to.eql(100000);
tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 9, 0)); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 9, 0));
expect(tileCoordExtent[0]).to.eql(90000); expect(tileCoordExtent[0][0]).to.eql(90000);
expect(tileCoordExtent[1]).to.eql(100000); expect(tileCoordExtent[1][0]).to.eql(100000);
expect(tileCoordExtent[2]).to.eql(0); expect(tileCoordExtent[0][1]).to.eql(0);
expect(tileCoordExtent[3]).to.eql(10000); expect(tileCoordExtent[1][1]).to.eql(10000);
tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 0, 9)); tileCoordExtent = tileGrid.getTileCoordExtent(new ol.TileCoord(3, 0, 9));
expect(tileCoordExtent[0]).to.eql(0); expect(tileCoordExtent[0][0]).to.eql(0);
expect(tileCoordExtent[1]).to.eql(10000); expect(tileCoordExtent[1][0]).to.eql(10000);
expect(tileCoordExtent[2]).to.eql(90000); expect(tileCoordExtent[0][1]).to.eql(90000);
expect(tileCoordExtent[3]).to.eql(100000); expect(tileCoordExtent[1][1]).to.eql(100000);
}); });
}); });
@@ -529,7 +529,7 @@ describe('ol.tilegrid.TileGrid', function() {
origin: origin, origin: origin,
tileSize: tileSize tileSize: tileSize
}); });
var e = [45000, 55000, 5000, 15000]; var e = [[45000, 5000], [55000, 15000]];
var tileRange; var tileRange;
tileRange = tileGrid.getTileRangeForExtentAndZ(e, 0); tileRange = tileGrid.getTileRangeForExtentAndZ(e, 0);