diff --git a/src/ol/style/Icon.js b/src/ol/style/Icon.js index 2e299f0cb1..d99acb4f8b 100644 --- a/src/ol/style/Icon.js +++ b/src/ol/style/Icon.js @@ -8,7 +8,7 @@ import {asArray} from '../color.js'; import {listen, unlisten} from '../events.js'; import EventType from '../events/EventType.js'; import IconAnchorUnits from '../style/IconAnchorUnits.js'; -import IconImage from '../style/IconImage.js'; +import {get as getIconImage} from '../style/IconImage.js'; import IconOrigin from '../style/IconOrigin.js'; import ImageStyle from '../style/Image.js'; @@ -107,7 +107,7 @@ const Icon = function(opt_options) { * @private * @type {ol.style.IconImage} */ - this.iconImage_ = IconImage.get( + this.iconImage_ = getIconImage( image, /** @type {string} */ (src), imgSize, this.crossOrigin_, imageState, this.color_); /** diff --git a/src/ol/style/IconImage.js b/src/ol/style/IconImage.js index 15d46aef26..311b64660e 100644 --- a/src/ol/style/IconImage.js +++ b/src/ol/style/IconImage.js @@ -19,8 +19,7 @@ import {iconImageCache} from '../style.js'; * @param {ol.Color} color Color. * @extends {ol.events.EventTarget} */ -const IconImage = function(image, src, size, crossOrigin, imageState, - color) { +const IconImage = function(image, src, size, crossOrigin, imageState, color) { EventTarget.call(this); @@ -101,16 +100,14 @@ inherits(IconImage, EventTarget); * @param {ol.Color} color Color. * @return {ol.style.IconImage} Icon image. */ -IconImage.get = function(image, src, size, crossOrigin, imageState, - color) { +export function get(image, src, size, crossOrigin, imageState, color) { let iconImage = iconImageCache.get(src, crossOrigin, color); if (!iconImage) { - iconImage = new IconImage( - image, src, size, crossOrigin, imageState, color); + iconImage = new IconImage(image, src, size, crossOrigin, imageState, color); iconImageCache.set(src, crossOrigin, color, iconImage); } return iconImage; -}; +} /** diff --git a/test/spec/ol/style/icon.test.js b/test/spec/ol/style/icon.test.js index 4331e273fc..b999513480 100644 --- a/test/spec/ol/style/icon.test.js +++ b/test/spec/ol/style/icon.test.js @@ -1,7 +1,7 @@ import {getUid} from '../../../../src/ol/index.js'; import {iconImageCache} from '../../../../src/ol/style.js'; import Icon from '../../../../src/ol/style/Icon.js'; -import IconImage from '../../../../src/ol/style/IconImage.js'; +import IconImage, {get as getIconImage} from '../../../../src/ol/style/IconImage.js'; describe('ol.style.Icon', function() { @@ -17,8 +17,7 @@ describe('ol.style.Icon', function() { img: canvas, imgSize: size }); - expect(IconImage.get( - canvas, getUid(canvas), size, '').getImage()).to.eql(canvas); + expect(getIconImage(canvas, getUid(canvas), size, '').getImage()).to.eql(canvas); }); it('imgSize overrides img.width and img.height', function(done) {