The OpenLayers server threw a disk, and clobbered another, resulting in a loss
of data up to our last backup. In the previous subversion repository, this was r1694->r1777. I'm sorry to all those of you who might have checked out that code, as this will surely cause problems for you. We're currently working to figure out what went wrong, and how to prevent it in the future. git-svn-id: http://svn.openlayers.org/trunk/openlayers@1695 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -131,6 +131,7 @@ OpenLayers.Map.prototype = {
|
||||
"hidden");
|
||||
this.viewPortDiv.style.width = "100%";
|
||||
this.viewPortDiv.style.height = "100%";
|
||||
this.viewPortDiv.className = "olMapViewport";
|
||||
this.div.appendChild(this.viewPortDiv);
|
||||
|
||||
// the layerContainerDiv is the one that holds all the layers
|
||||
@@ -298,14 +299,12 @@ OpenLayers.Map.prototype = {
|
||||
if (this.baseLayer == null) {
|
||||
// set the first baselaye we add as the baselayer
|
||||
this.setBaseLayer(layer);
|
||||
this.events.triggerEvent("changebaselayer");
|
||||
} else {
|
||||
layer.setVisibility(false);
|
||||
}
|
||||
} else {
|
||||
var extent = this.getExtent();
|
||||
if (extent) {
|
||||
layer.moveTo(extent, true);
|
||||
if (this.getCenter() != null) {
|
||||
layer.moveTo(this.getExtent(), true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -450,13 +449,13 @@ OpenLayers.Map.prototype = {
|
||||
//redraw all layers
|
||||
var center = this.getCenter();
|
||||
if (center != null) {
|
||||
var zoom = null;
|
||||
if (oldBaseLayer != null) {
|
||||
var oldResolution = oldBaseLayer.getResolution();
|
||||
zoom = this.baseLayer.getZoomForResolution(oldResolution);
|
||||
if (oldBaseLayer == null) {
|
||||
this.setCenter(center);
|
||||
} else {
|
||||
this.zoomToExtent(oldBaseLayer.getExtent());
|
||||
}
|
||||
this.setCenter(center, zoom);
|
||||
}
|
||||
|
||||
if ((noEvent == null) || (noEvent == false)) {
|
||||
this.events.triggerEvent("changebaselayer");
|
||||
}
|
||||
@@ -702,21 +701,33 @@ OpenLayers.Map.prototype = {
|
||||
}
|
||||
}
|
||||
|
||||
//send the move call to the baselayer and all the overlays
|
||||
var bounds = this.getExtent();
|
||||
|
||||
//send the move call to the baselayer and all the overlays
|
||||
this.baseLayer.moveTo(bounds, zoomChanged, dragging);
|
||||
for (var i = 0; i < this.layers.length; i++) {
|
||||
var layer = this.layers[i];
|
||||
|
||||
var inRange = layer.calculateInRange();
|
||||
if (layer.inRange != inRange) {
|
||||
layer.inRange = inRange;
|
||||
layer.display(layer.visibility && layer.inRange);
|
||||
this.events.triggerEvent("changelayer");
|
||||
}
|
||||
|
||||
if (layer.visibility && layer.inRange) {
|
||||
layer.moveTo(bounds, zoomChanged, dragging);
|
||||
}
|
||||
if (!layer.isBaseLayer) {
|
||||
|
||||
var moveLayer;
|
||||
var inRange = layer.calculateInRange();
|
||||
if (layer.inRange != inRange) {
|
||||
// Layer property has changed. We are going
|
||||
// to call moveLayer so that the layer can be turned
|
||||
// off or on.
|
||||
layer.inRange = inRange;
|
||||
moveLayer = true;
|
||||
this.events.triggerEvent("changelayer");
|
||||
} else {
|
||||
// If nothing has changed, then we only move the layer
|
||||
// if it is visible and inrange.
|
||||
moveLayer = (layer.visibility && layer.inRange);
|
||||
}
|
||||
|
||||
if (moveLayer) {
|
||||
layer.moveTo(bounds, zoomChanged, dragging);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.events.triggerEvent("move");
|
||||
|
||||
Reference in New Issue
Block a user