only change bounds when wrapDateLine is true; remove unused variable

This commit is contained in:
ahocevar
2011-09-27 07:38:22 -06:00
parent 61a3c2a072
commit 99d012f321
2 changed files with 12 additions and 11 deletions

View File

@@ -404,14 +404,16 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
*/
calculateGridLayout: function(bounds, origin, resolution) {
bounds = bounds.clone();
var maxExtent = this.map.getMaxExtent(),
width = maxExtent.getWidth();
// move the bounds one world width to the right until the origin is
// within the world extent
while (bounds.left < maxExtent.left) {
bounds.left += width;
bounds.right += width;
}
if (this.map.baseLayer.wrapDateLine) {
var maxExtent = this.map.getMaxExtent(),
width = maxExtent.getWidth();
// move the bounds one world width to the right until the origin is
// within the world extent
while (bounds.left < maxExtent.left) {
bounds.left += width;
bounds.right += width;
}
}
var tilelon = resolution * this.tileSize.w;
var tilelat = resolution * this.tileSize.h;

View File

@@ -215,9 +215,8 @@ OpenLayers.Tile = OpenLayers.Class({
*/
setBounds: function(bounds) {
bounds = bounds.clone();
var maxExtent = this.layer.maxExtent,
worldExtent = this.layer.map.getMaxExtent();
if (maxExtent && this.layer.map.baseLayer.wrapDateLine) {
var worldExtent = this.layer.map.getMaxExtent();
if (this.layer.map.baseLayer.wrapDateLine) {
bounds = bounds.wrapDateLine(worldExtent);
}
this.bounds = bounds;