Revert "Merge pull request #116 from elemoine/redraw"
This reverts commit7a5b469192, reversing changes made toa719de7e93. Conflicts: tests/Tile/Image.html
This commit is contained in:
@@ -275,16 +275,6 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
* {Float}
|
||||
*/
|
||||
minResolution: null,
|
||||
|
||||
/**
|
||||
* Property: resolution
|
||||
* {Float} Current resolution that the layer is drawn in. This is
|
||||
* used to determine whether the zoom has changed when calling
|
||||
* <moveTo> from <redraw>. Subclasses may set this.resolution to
|
||||
* null prior to calling redraw to force passing zoomChanged
|
||||
* true to moveTo.
|
||||
*/
|
||||
resolution: null,
|
||||
|
||||
/**
|
||||
* APIProperty: numZoomLevels
|
||||
@@ -561,8 +551,7 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
var extent = this.getExtent();
|
||||
|
||||
if (extent && this.inRange && this.visibility) {
|
||||
zoomChanged = this.resolution == null ||
|
||||
this.resolution !== this.map.getResolution();
|
||||
var zoomChanged = true;
|
||||
this.moveTo(extent, zoomChanged, false);
|
||||
this.events.triggerEvent("moveend",
|
||||
{"zoomChanged": zoomChanged});
|
||||
@@ -587,7 +576,6 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
display = display && this.inRange;
|
||||
}
|
||||
this.display(display);
|
||||
this.resolution = this.map.getResolution();
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -643,8 +631,6 @@ OpenLayers.Layer = OpenLayers.Class({
|
||||
|
||||
// deal with gutters
|
||||
this.setTileSize();
|
||||
|
||||
this.resolution = null;
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -122,7 +122,6 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
|
||||
*/
|
||||
mergeNewParams:function(newParams) {
|
||||
this.params = OpenLayers.Util.extend(this.params, newParams);
|
||||
this.resolution = null;
|
||||
var ret = this.redraw();
|
||||
if(this.map != null) {
|
||||
this.map.events.triggerEvent("changelayer", {
|
||||
@@ -147,7 +146,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
|
||||
if (force) {
|
||||
return this.mergeNewParams({"_olSalt": Math.random()});
|
||||
} else {
|
||||
return OpenLayers.Layer.prototype.redraw.call(this);
|
||||
return OpenLayers.Layer.prototype.redraw.apply(this, []);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user