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

Compute new image extent for comparison to existing image extent

Browse Source
This commit is contained in:
rattai
2015-08-04 17:25:47 -04:00
parent 85815a32a0
commit b3f14f09c4
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,24 +198,6 @@ ol.source.ImageWMS.prototype.getImage =
pixelRatio = 1; pixelRatio = 1;
} }
var image = this.image_;
if (!goog.isNull(image) &&
this.renderedRevision_ == this.getRevision() &&
image.getResolution() == resolution &&
image.getPixelRatio() == pixelRatio &&
ol.extent.containsExtent(image.getExtent(), extent)) {
return image;
}
var params = {
'SERVICE': 'WMS',
'VERSION': ol.DEFAULT_WMS_VERSION,
'REQUEST': 'GetMap',
'FORMAT': 'image/png',
'TRANSPARENT': true
};
goog.object.extend(params, this.params_);
extent = extent.slice(); extent = extent.slice();
var centerX = (extent[0] + extent[2]) / 2; var centerX = (extent[0] + extent[2]) / 2;
var centerY = (extent[1] + extent[3]) / 2; var centerY = (extent[1] + extent[3]) / 2;
@@ -240,6 +222,24 @@ ol.source.ImageWMS.prototype.getImage =
extent[1] = centerY - imageResolution * height / 2; extent[1] = centerY - imageResolution * height / 2;
extent[3] = centerY + imageResolution * height / 2; extent[3] = centerY + imageResolution * height / 2;
var image = this.image_;
if (!goog.isNull(image) &&
this.renderedRevision_ == this.getRevision() &&
image.getResolution() == resolution &&
image.getPixelRatio() == pixelRatio &&
ol.extent.containsExtent(image.getExtent(), extent)) {
return image;
}
var params = {
'SERVICE': 'WMS',
'VERSION': ol.DEFAULT_WMS_VERSION,
'REQUEST': 'GetMap',
'FORMAT': 'image/png',
'TRANSPARENT': true
};
goog.object.extend(params, this.params_);
this.imageSize_[0] = width; this.imageSize_[0] = width;
this.imageSize_[1] = height; this.imageSize_[1] = height;

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

@@ -155,6 +155,14 @@ describe('ol.source.ImageWMS', function() {
expect(imageLoadFunction.calledWith(image, image.src_)).to.be(true); expect(imageLoadFunction.calledWith(image, image.src_)).to.be(true);
}); });
it('returns the same image for consecutive calls with the same args', function() {
var extent = [10.01, 20, 30.01, 40];
var source = new ol.source.ImageWMS(options);
var image1 = source.getImage(extent, resolution, pixelRatio, projection);
var image2 = source.getImage(extent, resolution, pixelRatio, projection);
expect(image1).to.equal(image2);
});
}); });
describe('#getGetFeatureInfo', function() { describe('#getGetFeatureInfo', function() {