Export shared icon image class from IconImageCache module

src/ol/renderer/Map.js

@@ -8,8 +8,9 @@ import EventType from '../events/EventType.js';
 import {getWidth} from '../extent.js';
 import {TRUE, UNDEFINED} from '../functions.js';
 import {visibleAtResolution} from '../layer/Layer.js';
-import {iconImageCache} from '../style.js';
-import {compose as composeTransform, invert as invertTransform, setFromArray as transformSetFromArray} from '../transform.js';
+import {shared as iconImageCache} from '../style/IconImageCache.js';
+import {compose as composeTransform, invert as invertTransform, setFromArray as transformSetFromArray} from '../transform.js'; import IconImageCache from '../style/IconImageCache.js';
+
 
 /**
  * @constructor

src/ol/style.js

@@ -13,13 +13,3 @@
  *     (module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>)} StyleFunction
  * @api
  */
-
-
-import IconImageCache from './style/IconImageCache.js';
-
-/**
- * The {@link module:ol/style/IconImageCache~IconImageCache} for
- * {@link module:ol/style/Icon~Icon} images.
- * @api
- */
-export const iconImageCache = new IconImageCache();

src/ol/style/IconImage.js

@@ -7,7 +7,7 @@ import {listenOnce, unlistenByKey} from '../events.js';
 import EventTarget from '../events/EventTarget.js';
 import EventType from '../events/EventType.js';
 import ImageState from '../ImageState.js';
-import {iconImageCache} from '../style.js';
+import {shared as iconImageCache} from '../style/IconImageCache.js';
 
 /**
  * @constructor

src/ol/style/IconImageCache.js

@@ -4,7 +4,7 @@
 import {asString} from '../color.js';
 
 /**
- * Singleton class. Available through {@link ol.style.iconImageCache}.
+ * Singleton class. Available through {@link module:ol/style/IconImageCache~shared}.
  * @constructor
  */
 const IconImageCache = function() {
@@ -104,3 +104,11 @@ IconImageCache.prototype.setSize = function(maxCacheSize) {
   this.expire();
 };
 export default IconImageCache;
+
+
+/**
+ * The {@link module:ol/style/IconImageCache~IconImageCache} for
+ * {@link module:ol/style/Icon~Icon} images.
+ * @api
+ */
+export const shared = new IconImageCache();

test/spec/ol/style/icon.test.js

@@ -1,5 +1,5 @@
 import {getUid} from '../../../../src/ol/index.js';
-import {iconImageCache} from '../../../../src/ol/style.js';
+import {shared as iconImageCache} from '../../../../src/ol/style/IconImageCache.js';
 import Icon from '../../../../src/ol/style/Icon.js';
 import IconImage, {get as getIconImage} from '../../../../src/ol/style/IconImage.js';
 

test/spec/ol/style/iconimagecache.test.js

@@ -1,6 +1,6 @@
 import {UNDEFINED} from '../../../../src/ol/functions.js';
 import {listen} from '../../../../src/ol/events.js';
-import {iconImageCache} from '../../../../src/ol/style.js';
+import {shared as iconImageCache} from '../../../../src/ol/style/IconImageCache.js';
 import IconImage from '../../../../src/ol/style/IconImage.js';
 
 describe('ol.style.IconImageCache', function() {