Compare commits

..

1 Commits

Author SHA1 Message Date
crschmidt
35c469e84c Tagging the 2.8 rc1 Release
git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.8-rc1@9311 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
2009-04-20 15:27:28 +00:00
5 changed files with 37 additions and 31 deletions

View File

@@ -22,7 +22,7 @@
url: "http://publicus.opengeo.org/geoserver/wfs",
featureType: "tasmania_roads",
featureNS: "http://www.openplans.org/topp"
})
}),
});
map.addLayers([wms, layer]);

View File

@@ -212,24 +212,22 @@ OpenLayers.Layer.Google = OpenLayers.Class(
* evt - {Event}
*/
onMapResize: function() {
this.windowResized = true;
if(this.visibility) {
this.checkResize();
}
},
/**
* APIMethod: checkResize
* Check if the map has been resized, and if the Google Maps object is ready for checkResize.
* If the mapObject.getSize() equals the layer div's offset size, or if mapObject.getCenter()
* is null, the mapObject.checkResize() will fail.
*/
checkResize: function() {
if (this.windowResized && this.div.style.display != "none" && this.mapObject.getCenter()) {
this.mapObject.checkResize();
} else {
// workaround for resizing of invisible layers where
// GMap2.checkResize() does not work. We need to load all tiles
// for the old div size, then checkResize(), and then call
// layer.moveTo() to trigger GMap.setCenter() (which will finish
// the GMap initialization).
if(!this._resized) {
var layer = this;
var handle = GEvent.addListener(this.mapObject, "tilesloaded", function() {
GEvent.removeListener(handle);
delete layer._resized;
layer.mapObject.checkResize();
layer.moveTo(layer.map.getCenter(), layer.map.getZoom());
})
}
this._resized = true;
this.windowResized = false;
}
},
@@ -242,6 +240,7 @@ OpenLayers.Layer.Google = OpenLayers.Class(
*/
display: function(display) {
OpenLayers.Layer.EventPane.prototype.display.apply(this, arguments);
this.checkResize();
this.termsOfUse.style.display = this.div.style.display;
this.poweredBy.style.display = this.div.style.display;
},
@@ -264,7 +263,22 @@ OpenLayers.Layer.Google = OpenLayers.Class(
}
OpenLayers.Layer.EventPane.prototype.removeMap.apply(this, arguments);
},
/**
* Method: moveTo
* Handle calls to move the layer.
*
* Parameters:
* bound - {<OpenLayers.Bounds>}
* zoomChanged - {Boolean} Tells when zoom has changed, as layers have to
* do some init work in that case.
* dragging - {Boolean}
*/
moveTo:function(bounds, zoomChanged, dragging) {
OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
this.checkResize();
},
/**
* APIMethod: getZoomForExtent
*

View File

@@ -122,8 +122,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
this.imgDiv.map = null;
}
this.imgDiv.urls = null;
// abort any currently loading image
this.imgDiv.src = OpenLayers.Util.getImagesLocation() + "blank.gif";
this.imgDiv.src = null;
}
this.imgDiv = null;
if ((this.frame != null) && (this.frame.parentNode == this.layer.div)) {

View File

@@ -1356,10 +1356,7 @@ OpenLayers.Util.createUrlObject = function(url, options) {
a.href = url;
//host (without port)
// if we don't have a host (which is the case with URLs starting with "/"
// in IE), take the window location's host to match other browsers that
// fill in the window's location host automatically
urlObject.host = a.host || window.location.host;
urlObject.host = a.host;
var port = a.port;
if (port.length <= 0) {
var newHostLength = urlObject.host.length - (port.length);
@@ -1383,6 +1380,7 @@ OpenLayers.Util.createUrlObject = function(url, options) {
}
urlObject.args = OpenLayers.Util.getParameters(queryString);
//pathname (this part allows for relative <-> absolute comparison)
if ( ((urlObject.protocol == "file:") && (url.indexOf("file:") != -1)) ||
((urlObject.protocol != "file:") && (urlObject.host != "")) ) {

View File

@@ -606,7 +606,7 @@
}
function test_Util_isEquivalentUrl(t) {
t.plan(9);
t.plan(8);
var url1, url2, options;
@@ -663,12 +663,7 @@
url1 = "foo.html?bar=now#go";
url2 = "../tests/../tests/foo.html?bar=now#go";
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "relative vs. absolute paths works");
url1 = "/foo/bar";
url2 = new Array(window.location.pathname.split("/").length-1).join("../")+"foo/bar";
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "absolute and relative path without host works for "+url2)
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "relative vs. absolute paths works");
}
function test_Util_createUniqueIDSeq(t) {