Port ol.source.SingleImageWMS to new extents

This commit is contained in:
Tom Payne
2013-04-16 16:24:58 +02:00
parent 583564e484
commit aff9f5dbf9

View File

@@ -1,9 +1,9 @@
goog.provide('ol.source.SingleImageWMS');
goog.require('ol.Extent');
goog.require('ol.Image');
goog.require('ol.ImageUrlFunction');
goog.require('ol.Size');
goog.require('ol.extent');
goog.require('ol.source.ImageSource');
goog.require('ol.source.wms');
@@ -56,15 +56,14 @@ ol.source.SingleImageWMS.prototype.getImage =
var image = this.image_;
if (!goog.isNull(image) &&
image.getResolution() == resolution &&
image.getExtent().containsExtent(extent)) {
ol.extent.containsExtent(image.getExtent(), extent)) {
return image;
}
extent = new ol.Extent(extent.minX, extent.minY,
extent.maxX, extent.maxY);
extent.scaleFromCenter(this.ratio_);
var width = extent.getWidth() / resolution;
var height = extent.getHeight() / resolution;
extent = extent.slice();
ol.extent.scaleFromCenter(extent, this.ratio_);
var width = (extent[1] - extent[0]) / resolution;
var height = (extent[3] - extent[2]) / resolution;
var size = new ol.Size(width, height);
this.image_ = this.createImage(extent, resolution, size, projection);