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

Merge pull request #5036 from ahocevar/icon-imgsize

Browse Source 
Use imgSize when provided
This commit is contained in:
Andreas Hocevar
2016-03-15 18:56:27 +01:00
parent 08b19549ce 339c7c5c23
commit 88701db4c4
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/style/iconstyle.js
View File

@@ -106,9 +106,6 @@ ol.style.Icon = function(opt_options) {
goog.asserts.assert(!(src !== undefined && image),
'image and src can not provided at the same time');
goog.asserts.assert(
src === undefined || (src !== undefined && !imgSize),
'imgSize should not be set when src is provided');
goog.asserts.assert(
!image || (image && imgSize),
'imgSize must be set when image is provided');
@@ -513,6 +510,10 @@ ol.style.IconImage_.prototype.handleImageError_ = function() {
*/
ol.style.IconImage_.prototype.handleImageLoad_ = function() {
this.imageState_ = ol.style.ImageState.LOADED;
if (this.size_) {
this.image_.width = this.size_[0];
this.image_.height = this.size_[1];
}
this.size_ = [this.image_.width, this.image_.height];
this.unlistenImage_();
this.determineTainting_();