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

Move wrapX to ol.tilegrid to break circular dependency

Browse Source
This commit is contained in:
Tim Schaub
2016-08-08 13:48:54 -06:00
parent 789aeb1c64
commit 568f0c81bb
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ol/tilecoord.js
View File

@@ -1,8 +1,5 @@
goog.provide('ol.tilecoord');
goog.require('ol.extent');
goog.require('ol.tilegrid');
/**
* @enum {number}
@@ -93,27 +90,6 @@ ol.tilecoord.quadKey = function(tileCoord) {
};
/**
* @param {ol.TileCoord} tileCoord Tile coordinate.
* @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
* @param {ol.proj.Projection} projection Projection.
* @return {ol.TileCoord} Tile coordinate.
*/
ol.tilecoord.wrapX = function(tileCoord, tileGrid, projection) {
var z = tileCoord[0];
var center = tileGrid.getTileCoordCenter(tileCoord);
var projectionExtent = ol.tilegrid.extentFromProjection(projection);
if (!ol.extent.containsCoordinate(projectionExtent, center)) {
var worldWidth = ol.extent.getWidth(projectionExtent);
var worldsAway = Math.ceil((projectionExtent[0] - center[0]) / worldWidth);
center[0] += worldWidth * worldsAway;
return tileGrid.getTileCoordForCoordAndZ(center, z);
} else {
return tileCoord;
}
};
/**
* @param {ol.TileCoord} tileCoord Tile coordinate.
* @param {!ol.tilegrid.TileGrid} tileGrid Tile grid.