ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4408 from ahocevar/fix-imagewms-ratio-3.11.x

Browse Source 
Use ratio when calculating ImageWMS width and height
This commit is contained in:
Andreas Hocevar
2015-11-12 18:30:31 +01:00
parent bb5377fb8c ce5ab5b59c
commit 14338e9c16
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ol/source/imagewmssource.js
View File

@@ -203,16 +203,8 @@ ol.source.ImageWMS.prototype.getImageInternal =
var centerY = (extent[1] + extent[3]) / 2; var centerY = (extent[1] + extent[3]) / 2;
var imageResolution = resolution / pixelRatio; var imageResolution = resolution / pixelRatio;
var imageWidth = ol.extent.getWidth(extent) / imageResolution;
// Compute an integer width and height. var imageHeight = ol.extent.getHeight(extent) / imageResolution;
var width = Math.ceil(ol.extent.getWidth(extent) / imageResolution);
var height = Math.ceil(ol.extent.getHeight(extent) / imageResolution);
// Modify the extent to match the integer width and height.
extent[0] = centerX - imageResolution * width / 2;
extent[2] = centerX + imageResolution * width / 2;
extent[1] = centerY - imageResolution * height / 2;
extent[3] = centerY + imageResolution * height / 2;
var image = this.image_; var image = this.image_;
if (image && if (image &&
@@ -241,8 +233,8 @@ ol.source.ImageWMS.prototype.getImageInternal =
}; };
goog.object.extend(params, this.params_); goog.object.extend(params, this.params_);
this.imageSize_[0] = width; this.imageSize_[0] = Math.ceil(imageWidth * this.ratio_);
this.imageSize_[1] = height; this.imageSize_[1] = Math.ceil(imageHeight * this.ratio_);
var url = this.getRequestUrl_(extent, this.imageSize_, pixelRatio, var url = this.getRequestUrl_(extent, this.imageSize_, pixelRatio,
projection, params); projection, params);