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

Merge pull request #4412 from ahocevar/revert-4344

Browse Source 
Revert "Merge pull request #4344 from bartvde/issue-2844"
This commit is contained in:
Andreas Hocevar
2015-11-12 19:36:27 +01:00
parent 14338e9c16 c5f4710b8d
commit 70d376f215
13 changed files with 31 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/source/imagemapguidesource.js
View File

@@ -150,7 +150,7 @@ ol.source.ImageMapGuide.prototype.getImageInternal =
var imageUrl = this.imageUrlFunction_(extent, size, projection);
if (imageUrl !== undefined) {
image = new ol.Image(extent, [resolution, resolution], pixelRatio,
image = new ol.Image(extent, resolution, pixelRatio,
this.getAttributions(), imageUrl, this.crossOrigin_,
this.imageLoadFunction_);
goog.events.listen(image, goog.events.EventType.CHANGE,

12
src/ol/source/imagestaticsource.js
View File

@@ -26,12 +26,10 @@ ol.source.ImageStatic = function(options) {
var imageExtent = options.imageExtent;
var xResolution, yResolution, resolutions, imgResolution;
var resolution, resolutions;
if (options.imageSize !== undefined) {
xResolution = ol.extent.getWidth(imageExtent) / options.imageSize[0];
yResolution = ol.extent.getHeight(imageExtent) / options.imageSize[1];
imgResolution = [xResolution, yResolution];
resolutions = [yResolution];
resolution = ol.extent.getHeight(imageExtent) / options.imageSize[1];
resolutions = [resolution];
}
var crossOrigin = options.crossOrigin !== undefined ?
@@ -52,8 +50,8 @@ ol.source.ImageStatic = function(options) {
* @private
* @type {ol.Image}
*/
this.image_ = new ol.Image(imageExtent, imgResolution, 1,
attributions, options.url, crossOrigin, imageLoadFunction);
this.image_ = new ol.Image(imageExtent, resolution, 1, attributions,
options.url, crossOrigin, imageLoadFunction);
goog.events.listen(this.image_, goog.events.EventType.CHANGE,
this.handleImageChange, false, this);

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

@@ -209,7 +209,7 @@ ol.source.ImageWMS.prototype.getImageInternal =
var image = this.image_;
if (image &&
this.renderedRevision_ == this.getRevision() &&
image.getResolution()[0] == resolution &&
image.getResolution() == resolution &&
image.getPixelRatio() == pixelRatio &&
ol.extent.containsExtent(image.getExtent(), extent)) {
return image;
@@ -239,7 +239,7 @@ ol.source.ImageWMS.prototype.getImageInternal =
var url = this.getRequestUrl_(extent, this.imageSize_, pixelRatio,
projection, params);
this.image_ = new ol.Image(extent, [resolution, resolution], pixelRatio,
this.image_ = new ol.Image(extent, resolution, pixelRatio,
this.getAttributions(), url, this.crossOrigin_, this.imageLoadFunction_);
this.renderedRevision_ = this.getRevision();