Merge pull request #4412 from ahocevar/revert-4344

Revert "Merge pull request #4344 from bartvde/issue-2844"
This commit is contained in:
Andreas Hocevar
2015-11-12 19:36:27 +01:00
13 changed files with 31 additions and 75 deletions

View File

@@ -209,7 +209,7 @@ ol.source.ImageWMS.prototype.getImageInternal =
var image = this.image_;
if (image &&
this.renderedRevision_ == this.getRevision() &&
image.getResolution()[0] == resolution &&
image.getResolution() == resolution &&
image.getPixelRatio() == pixelRatio &&
ol.extent.containsExtent(image.getExtent(), extent)) {
return image;
@@ -239,7 +239,7 @@ ol.source.ImageWMS.prototype.getImageInternal =
var url = this.getRequestUrl_(extent, this.imageSize_, pixelRatio,
projection, params);
this.image_ = new ol.Image(extent, [resolution, resolution], pixelRatio,
this.image_ = new ol.Image(extent, resolution, pixelRatio,
this.getAttributions(), url, this.crossOrigin_, this.imageLoadFunction_);
this.renderedRevision_ = this.getRevision();