Add pixelRatio param to ol.Image constructor
This commit is contained in:
@@ -28,11 +28,13 @@ ol.ImageState = {
|
|||||||
* @extends {goog.events.EventTarget}
|
* @extends {goog.events.EventTarget}
|
||||||
* @param {ol.Extent} extent Extent.
|
* @param {ol.Extent} extent Extent.
|
||||||
* @param {number} resolution Resolution.
|
* @param {number} resolution Resolution.
|
||||||
|
* @param {number} pixelRatio Pixel ratio.
|
||||||
* @param {string} src Image source URI.
|
* @param {string} src Image source URI.
|
||||||
* @param {?string} crossOrigin Cross origin.
|
* @param {?string} crossOrigin Cross origin.
|
||||||
* @param {Array.<ol.Attribution>} attributions Attributions.
|
* @param {Array.<ol.Attribution>} attributions Attributions.
|
||||||
*/
|
*/
|
||||||
ol.Image = function(extent, resolution, src, crossOrigin, attributions) {
|
ol.Image =
|
||||||
|
function(extent, resolution, pixelRatio, src, crossOrigin, attributions) {
|
||||||
|
|
||||||
goog.base(this);
|
goog.base(this);
|
||||||
|
|
||||||
@@ -54,6 +56,12 @@ ol.Image = function(extent, resolution, src, crossOrigin, attributions) {
|
|||||||
*/
|
*/
|
||||||
this.src_ = src;
|
this.src_ = src;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
* @type {number}
|
||||||
|
*/
|
||||||
|
this.pixelRatio_ = pixelRatio;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @type {number}
|
* @type {number}
|
||||||
@@ -137,6 +145,14 @@ ol.Image.prototype.getImageElement = function(opt_context) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return {number} PixelRatio.
|
||||||
|
*/
|
||||||
|
ol.Image.prototype.getPixelRatio = function() {
|
||||||
|
return this.pixelRatio_;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {number} Resolution.
|
* @return {number} Resolution.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ ol.source.Image.prototype.createImage =
|
|||||||
var imageUrl = this.imageUrlFunction(extent, size, projection);
|
var imageUrl = this.imageUrlFunction(extent, size, projection);
|
||||||
if (goog.isDef(imageUrl)) {
|
if (goog.isDef(imageUrl)) {
|
||||||
image = new ol.Image(
|
image = new ol.Image(
|
||||||
extent, resolution, imageUrl, this.crossOrigin_,
|
extent, resolution, pixelRatio, imageUrl, this.crossOrigin_,
|
||||||
this.getAttributions());
|
this.getAttributions());
|
||||||
}
|
}
|
||||||
return image;
|
return image;
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ ol.source.ImageWMS.prototype.getImage =
|
|||||||
var image = this.image_;
|
var image = this.image_;
|
||||||
if (!goog.isNull(image) &&
|
if (!goog.isNull(image) &&
|
||||||
image.getResolution() == resolution &&
|
image.getResolution() == resolution &&
|
||||||
|
image.getPixelRatio() == pixelRatio &&
|
||||||
ol.extent.containsExtent(image.getExtent(), extent)) {
|
ol.extent.containsExtent(image.getExtent(), extent)) {
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ ol.source.MapGuide.prototype.getImage =
|
|||||||
var image = this.image_;
|
var image = this.image_;
|
||||||
if (!goog.isNull(image) &&
|
if (!goog.isNull(image) &&
|
||||||
image.getResolution() == resolution &&
|
image.getResolution() == resolution &&
|
||||||
|
image.getPixelRatio() == pixelRatio &&
|
||||||
ol.extent.containsExtent(image.getExtent(), extent)) {
|
ol.extent.containsExtent(image.getExtent(), extent)) {
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user