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

Make reverseIntersection argument mandatory

Browse Source
This commit is contained in:
Tom Payne
2013-03-24 13:59:35 +01:00
parent aeeaa79393
commit 247fc8f031
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/tilegrid/tilegrid.js
View File

@@ -190,7 +190,7 @@ ol.tilegrid.TileGrid.prototype.getTileRangeExtent = function(z, tileRange) {
ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution = function( ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution = function(
extent, resolution) { extent, resolution) {
var min = this.getTileCoordForXYAndResolution_( var min = this.getTileCoordForXYAndResolution_(
extent.minX, extent.minY, resolution); extent.minX, extent.minY, resolution, false);
var max = this.getTileCoordForXYAndResolution_( var max = this.getTileCoordForXYAndResolution_(
extent.maxX, extent.maxY, resolution, true); extent.maxX, extent.maxY, resolution, true);
return new ol.TileRange(min.x, min.y, max.x, max.y); return new ol.TileRange(min.x, min.y, max.x, max.y);
@@ -250,7 +250,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordExtent = function(tileCoord) {
ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndResolution = function( ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndResolution = function(
coordinate, resolution) { coordinate, resolution) {
return this.getTileCoordForXYAndResolution_( return this.getTileCoordForXYAndResolution_(
coordinate.x, coordinate.y, resolution); coordinate.x, coordinate.y, resolution, false);
}; };
@@ -258,14 +258,14 @@ ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndResolution = function(
* @param {number} x X. * @param {number} x X.
* @param {number} y Y. * @param {number} y Y.
* @param {number} resolution Resolution. * @param {number} resolution Resolution.
* @param {boolean=} opt_reverseIntersectionPolicy Instead of letting edge * @param {boolean} reverseIntersectionPolicy Instead of letting edge
* intersections go to the higher tile coordinate, let edge intersections * intersections go to the higher tile coordinate, let edge intersections
* go to the lower tile coordinate. * go to the lower tile coordinate.
* @return {ol.TileCoord} Tile coordinate. * @return {ol.TileCoord} Tile coordinate.
* @private * @private
*/ */
ol.tilegrid.TileGrid.prototype.getTileCoordForXYAndResolution_ = function( ol.tilegrid.TileGrid.prototype.getTileCoordForXYAndResolution_ = function(
x, y, resolution, opt_reverseIntersectionPolicy) { x, y, resolution, reverseIntersectionPolicy) {
var z = this.getZForResolution(resolution); var z = this.getZForResolution(resolution);
var scale = resolution / this.getResolution(z); var scale = resolution / this.getResolution(z);
var origin = this.getOrigin(z); var origin = this.getOrigin(z);
@@ -274,12 +274,12 @@ ol.tilegrid.TileGrid.prototype.getTileCoordForXYAndResolution_ = function(
var tileCoordX = scale * (x - origin.x) / (resolution * tileSize.width); var tileCoordX = scale * (x - origin.x) / (resolution * tileSize.width);
var tileCoordY = scale * (y - origin.y) / (resolution * tileSize.height); var tileCoordY = scale * (y - origin.y) / (resolution * tileSize.height);
if (!opt_reverseIntersectionPolicy) { if (reverseIntersectionPolicy) {
tileCoordX = Math.floor(tileCoordX);
tileCoordY = Math.floor(tileCoordY);
} else {
tileCoordX = Math.ceil(tileCoordX) - 1; tileCoordX = Math.ceil(tileCoordX) - 1;
tileCoordY = Math.ceil(tileCoordY) - 1; tileCoordY = Math.ceil(tileCoordY) - 1;
} else {
tileCoordX = Math.floor(tileCoordX);
tileCoordY = Math.floor(tileCoordY);
} }
return new ol.TileCoord(z, tileCoordX, tileCoordY); return new ol.TileCoord(z, tileCoordX, tileCoordY);
@@ -295,7 +295,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndZ =
function(coordinate, z) { function(coordinate, z) {
var resolution = this.getResolution(z); var resolution = this.getResolution(z);
return this.getTileCoordForXYAndResolution_( return this.getTileCoordForXYAndResolution_(
coordinate.x, coordinate.y, resolution); coordinate.x, coordinate.y, resolution, false);
}; };

4
test/spec/ol/tilegrid/tilegrid.test.js
View File

@@ -392,14 +392,14 @@ describe('ol.tilegrid.TileGrid', function() {
// gets higher tile for edge intersection // gets higher tile for edge intersection
tileCoord = tileGrid.getTileCoordForXYAndResolution_( tileCoord = tileGrid.getTileCoordForXYAndResolution_(
0, 0, 100); 0, 0, 100, false);
expect(tileCoord.z).to.eql(3); expect(tileCoord.z).to.eql(3);
expect(tileCoord.x).to.eql(0); expect(tileCoord.x).to.eql(0);
expect(tileCoord.y).to.eql(0); expect(tileCoord.y).to.eql(0);
// gets higher tile for edge intersection // gets higher tile for edge intersection
tileCoord = tileGrid.getTileCoordForXYAndResolution_( tileCoord = tileGrid.getTileCoordForXYAndResolution_(
100000, 100000, 100); 100000, 100000, 100, false);
expect(tileCoord.z).to.eql(3); expect(tileCoord.z).to.eql(3);
expect(tileCoord.x).to.eql(10); expect(tileCoord.x).to.eql(10);
expect(tileCoord.y).to.eql(10); expect(tileCoord.y).to.eql(10);