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

improvements suggested by bartvde

Browse Source
This commit is contained in:
ahocevar
2011-09-28 07:41:00 -06:00
parent 99d012f321
commit dfdcdb8d33
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/OpenLayers/Tile.js
View File

@@ -183,17 +183,15 @@ OpenLayers.Tile = OpenLayers.Class({
// (3) left bound negative (exceeding world), right bound positive // (3) left bound negative (exceeding world), right bound positive
var maxExtents = [maxExtent]; var maxExtents = [maxExtent];
if (this.layer.map.baseLayer.wrapDateLine) { if (this.layer.map.baseLayer.wrapDateLine) {
var worldExtentWidth = this.layer.map.getMaxExtent().getWidth();
maxExtent = this.layer.maxExtent.clone();
if (maxExtent.left > maxExtent.right) { if (maxExtent.left > maxExtent.right) {
maxExtent.left -= worldExtentWidth; var worldWidth = this.layer.map.getMaxExtent().getWidth();
maxExtent = this.layer.maxExtent.clone();
maxExtent.left -= worldWidth;
maxExtents.push(maxExtent);
maxExtent = this.layer.maxExtent.clone();
maxExtent.right += worldWidth;
maxExtents.push(maxExtent);
} }
maxExtents.push(maxExtent);
maxExtent = this.layer.maxExtent.clone();
if (maxExtent.right < maxExtent.left) {
maxExtent.right += worldExtentWidth;
}
maxExtents.push(maxExtent);
} }
for (var i=maxExtents.length-1; i>=0; --i) { for (var i=maxExtents.length-1; i>=0; --i) {
if (this.bounds.intersectsBounds(maxExtents[i], false)) { if (this.bounds.intersectsBounds(maxExtents[i], false)) {
@@ -215,8 +213,8 @@ OpenLayers.Tile = OpenLayers.Class({
*/ */
setBounds: function(bounds) { setBounds: function(bounds) {
bounds = bounds.clone(); bounds = bounds.clone();
var worldExtent = this.layer.map.getMaxExtent();
if (this.layer.map.baseLayer.wrapDateLine) { if (this.layer.map.baseLayer.wrapDateLine) {
var worldExtent = this.layer.map.getMaxExtent();
bounds = bounds.wrapDateLine(worldExtent); bounds = bounds.wrapDateLine(worldExtent);
} }
this.bounds = bounds; this.bounds = bounds;

2
tests/manual/dateline-smallextent.html
View File

@@ -28,7 +28,7 @@ function init(){
); );
var extent = new OpenLayers.Bounds(15849982.183008, -11368938.517442, -14206280.326992, -1350184.3474419); var extent = new OpenLayers.Bounds(15849982.183008, -11368938.517442, -14206280.326992, -1350184.3474419);
var wms = new OpenLayers.Layer.WMS( "world", var wms = new OpenLayers.Layer.WMS( "world",
"/geoserver/wms", "http://demo.opengeo.org/geoserver/wms",
{layers: 'world', transparent: true}, {layers: 'world', transparent: true},
{maxExtent: extent} {maxExtent: extent}
); );