OpenLayers OpenLayers

Changeset 1785

Show
Ignore:
Timestamp:
11/08/06 14:07:32 (2 years ago)
Author:
euzuro
Message:

pulling up fixes for #366 #387 #392 from trunk so that we can release RC3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/openlayers/2.2/lib/OpenLayers/Layer/WMS/Untiled.js

    r1740 r1785  
    126126            //clear out the old tile  
    127127            if (this.tile) { 
    128                 OpenLayers.Util.clearArray(this.tile); 
     128                this.tile.clear(); 
    129129            } 
    130130 
    …… 
    150150            var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top); 
    151151            var pos = this.map.getLayerPxFromLonLat(ul); 
     152 
     153            if ( this.tile && !this.tile.size.equals(tileSize)) { 
     154                this.tile.destroy(); 
     155                this.tile = null; 
     156            } 
    152157 
    153158            if (!this.tile) { 

  • branches/openlayers/2.2/lib/OpenLayers/Map.js

    r1740 r1785  
    787787        var newPx = this.getViewPortPxFromLonLat(lonlat); 
    788788 
    789         this.layerContainerDiv.style.left = (originPx.x - newPx.x) + "px"; 
    790         this.layerContainerDiv.style.top  = (originPx.y - newPx.y) + "px"; 
     789        if ((originPx != null) && (newPx != null)) { 
     790            this.layerContainerDiv.style.left = (originPx.x - newPx.x) + "px"; 
     791            this.layerContainerDiv.style.top  = (originPx.y - newPx.y) + "px"; 
     792        } 
    791793    }, 
    792794