s/TileBounds/TileRange/

This commit is contained in:
Tom Payne
2012-09-24 14:33:24 +02:00
parent f8c31ba45c
commit a416d1f601
10 changed files with 320 additions and 320 deletions
+4 -4
View File
@@ -43,12 +43,12 @@ goog.inherits(ol.tilegrid.XYZ, ol.TileGrid);
/**
* @inheritDoc
*/
ol.tilegrid.XYZ.prototype.forEachTileCoordParentTileBounds =
ol.tilegrid.XYZ.prototype.forEachTileCoordParentTileRange =
function(tileCoord, callback, opt_obj) {
var x = tileCoord.x;
var y = tileCoord.y;
var z = tileCoord.z;
var tileBounds;
var tileRange;
while (true) {
z -= 1;
if (z < 0) {
@@ -56,8 +56,8 @@ ol.tilegrid.XYZ.prototype.forEachTileCoordParentTileBounds =
}
x = Math.floor(x / 2);
y = Math.floor(y / 2);
tileBounds = new ol.TileBounds(x, y, x, y);
if (callback.call(opt_obj, z, tileBounds)) {
tileRange = new ol.TileRange(x, y, x, y);
if (callback.call(opt_obj, z, tileRange)) {
break;
}
}
+26 -26
View File
@@ -79,51 +79,51 @@ function testXYZCropY() {
}
function testXYZTileGridForEachTileCoordParentTileBounds() {
function testXYZTileGridForEachTileCoordParentTileRange() {
var xyzTileGrid = new ol.tilegrid.XYZ(6);
var tileCoord = new ol.TileCoord(5, 11, 21);
var zs = [], tileBoundss = [];
xyzTileGrid.forEachTileCoordParentTileBounds(
var zs = [], tileRanges = [];
xyzTileGrid.forEachTileCoordParentTileRange(
tileCoord,
function(z, tileBounds) {
function(z, tileRange) {
zs.push(z);
tileBoundss.push(tileBounds);
tileRanges.push(tileRange);
return false;
});
assertEquals(5, zs.length);
assertEquals(5, tileBoundss.length);
assertEquals(5, tileRanges.length);
assertEquals(4, zs[0]);
assertEquals(5, tileBoundss[0].minX);
assertEquals(10, tileBoundss[0].minY);
assertEquals(5, tileBoundss[0].maxX);
assertEquals(10, tileBoundss[0].maxY);
assertEquals(5, tileRanges[0].minX);
assertEquals(10, tileRanges[0].minY);
assertEquals(5, tileRanges[0].maxX);
assertEquals(10, tileRanges[0].maxY);
assertEquals(3, zs[1]);
assertEquals(2, tileBoundss[1].minX);
assertEquals(5, tileBoundss[1].minY);
assertEquals(2, tileBoundss[1].maxX);
assertEquals(5, tileBoundss[1].maxY);
assertEquals(2, tileRanges[1].minX);
assertEquals(5, tileRanges[1].minY);
assertEquals(2, tileRanges[1].maxX);
assertEquals(5, tileRanges[1].maxY);
assertEquals(2, zs[2]);
assertEquals(1, tileBoundss[2].minX);
assertEquals(2, tileBoundss[2].minY);
assertEquals(1, tileBoundss[2].maxX);
assertEquals(2, tileBoundss[2].maxY);
assertEquals(1, tileRanges[2].minX);
assertEquals(2, tileRanges[2].minY);
assertEquals(1, tileRanges[2].maxX);
assertEquals(2, tileRanges[2].maxY);
assertEquals(1, zs[3]);
assertEquals(0, tileBoundss[3].minX);
assertEquals(1, tileBoundss[3].minY);
assertEquals(0, tileBoundss[3].maxX);
assertEquals(1, tileBoundss[3].maxY);
assertEquals(0, tileRanges[3].minX);
assertEquals(1, tileRanges[3].minY);
assertEquals(0, tileRanges[3].maxX);
assertEquals(1, tileRanges[3].maxY);
assertEquals(0, zs[4]);
assertEquals(0, tileBoundss[4].minX);
assertEquals(0, tileBoundss[4].minY);
assertEquals(0, tileBoundss[4].maxX);
assertEquals(0, tileBoundss[4].maxY);
assertEquals(0, tileRanges[4].minX);
assertEquals(0, tileRanges[4].minY);
assertEquals(0, tileRanges[4].maxX);
assertEquals(0, tileRanges[4].maxY);
}