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

Avoid creating ol.Coordinate objects to call getTileCoordForCoordAndResolution_

Browse Source
This commit is contained in:
Tom Payne
2013-03-24 13:56:23 +01:00
parent e023e6fa2f
commit aeeaa79393
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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