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

Merge pull request #4334 from ahocevar/extent-ratio

Browse Source 
Check view extent within image extent
This commit is contained in:
Andreas Hocevar
2015-10-29 07:07:21 +01:00
parent 6d9dd030a1 40c1a6d112
commit c5dac0aa70
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,14 +201,6 @@ ol.source.ImageWMS.prototype.getImageInternal =
extent = extent.slice();
var centerX = (extent[0] + extent[2]) / 2;
var centerY = (extent[1] + extent[3]) / 2;
if (this.ratio_ != 1) {
var halfWidth = this.ratio_ * ol.extent.getWidth(extent) / 2;
var halfHeight = this.ratio_ * ol.extent.getHeight(extent) / 2;
extent[0] = centerX - halfWidth;
extent[1] = centerY - halfHeight;
extent[2] = centerX + halfWidth;
extent[3] = centerY + halfHeight;
}
var imageResolution = resolution / pixelRatio;
@@ -231,6 +223,15 @@ ol.source.ImageWMS.prototype.getImageInternal =
return image;
}
if (this.ratio_ != 1) {
var halfWidth = this.ratio_ * ol.extent.getWidth(extent) / 2;
var halfHeight = this.ratio_ * ol.extent.getHeight(extent) / 2;
extent[0] = centerX - halfWidth;
extent[1] = centerY - halfHeight;
extent[2] = centerX + halfWidth;
extent[3] = centerY + halfHeight;
}
var params = {
'SERVICE': 'WMS',
'VERSION': ol.DEFAULT_WMS_VERSION,

10
test/spec/ol/source/imagewmssource.test.js
View File

@@ -163,6 +163,16 @@ describe('ol.source.ImageWMS', function() {
expect(image1).to.equal(image2);
});
it('returns same image for calls with similar extents', function() {
options.ratio = 1.5;
var source = new ol.source.ImageWMS(options);
var extent = [10.01, 20, 30.01, 40];
var image1 = source.getImage(extent, resolution, pixelRatio, projection);
extent = [10.01, 20.1, 30.01, 40.1];
var image2 = source.getImage(extent, resolution, pixelRatio, projection);
expect(image1).to.equal(image2);
});
});
describe('#getGetFeatureInfo', function() {