Named export for ol/plugins

src/ol/CanvasMap.js

@@ -7,7 +7,7 @@ import PluginType from './PluginType.js';
 import {defaults as defaultControls} from './control.js';
 import {defaults as defaultInteractions} from './interaction.js';
 import _ol_obj_ from './obj.js';
-import _ol_plugins_ from './plugins.js';
+import {register, registerMultiple} from './plugins.js';
 import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.js';
 import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
 import _ol_renderer_canvas_TileLayer_ from './renderer/canvas/TileLayer.js';
@@ -15,8 +15,8 @@ import _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js';
 import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js';
 
 
-_ol_plugins_.register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
-_ol_plugins_.registerMultiple(PluginType.LAYER_RENDERER, [
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_canvas_ImageLayer_,
   _ol_renderer_canvas_TileLayer_,
   _ol_renderer_canvas_VectorLayer_,

src/ol/Map.js

@@ -7,7 +7,7 @@ import PluginType from './PluginType.js';
 import {defaults as defaultControls} from './control.js';
 import {defaults as defaultInteractions} from './interaction.js';
 import _ol_obj_ from './obj.js';
-import _ol_plugins_ from './plugins.js';
+import {register, registerMultiple} from './plugins.js';
 import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.js';
 import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
 import _ol_renderer_canvas_TileLayer_ from './renderer/canvas/TileLayer.js';
@@ -19,8 +19,8 @@ import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js';
 import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js';
 
 
-_ol_plugins_.register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
-_ol_plugins_.registerMultiple(PluginType.LAYER_RENDERER, [
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_canvas_ImageLayer_,
   _ol_renderer_canvas_TileLayer_,
   _ol_renderer_canvas_VectorLayer_,
@@ -28,8 +28,8 @@ _ol_plugins_.registerMultiple(PluginType.LAYER_RENDERER, [
 ]);
 
 // TODO: move these to new ol-webgl package
-_ol_plugins_.register(PluginType.MAP_RENDERER, _ol_renderer_webgl_Map_);
+register(PluginType.MAP_RENDERER, _ol_renderer_webgl_Map_);
-_ol_plugins_.registerMultiple(PluginType.LAYER_RENDERER, [
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_webgl_ImageLayer_,
   _ol_renderer_webgl_TileLayer_,
   _ol_renderer_webgl_VectorLayer_

src/ol/PluggableMap.js

@@ -24,7 +24,7 @@ import {createEmpty, clone, createOrUpdateEmpty, equals, getForViewAndSize, isEm
 import {TRUE} from './functions.js';
 import _ol_has_ from './has.js';
 import _ol_layer_Group_ from './layer/Group.js';
-import _ol_plugins_ from './plugins.js';
+import {getMapRendererPlugins} from './plugins.js';
 import RendererType from './renderer/Type.js';
 import _ol_size_ from './size.js';
 import PriorityQueue from './structs/PriorityQueue.js';
@@ -1438,7 +1438,7 @@ _ol_PluggableMap_.createOptionsInternal = function(options) {
    */
   var mapRendererPlugin;
 
-  var mapRendererPlugins = _ol_plugins_.getMapRendererPlugins();
+  var mapRendererPlugins = getMapRendererPlugins();
   outer: for (var i = 0, ii = rendererTypes.length; i < ii; ++i) {
     var rendererType = rendererTypes[i];
     for (var j = 0, jj = mapRendererPlugins.length; j < jj; ++j) {

src/ol/plugins.js

@@ -2,23 +2,22 @@
  * @module ol/plugins
  */
 import PluginType from './PluginType.js';
-var _ol_plugins_ = {};
 
 /**
  * The registry of map renderer plugins.
  * @type {Array<olx.MapRendererPlugin>}
  * @private
  */
-_ol_plugins_.mapRendererPlugins_ = [];
+var mapRendererPlugins = [];
 
 
 /**
  * Get all registered map renderer plugins.
  * @return {Array<olx.MapRendererPlugin>} The registered map renderer plugins.
  */
-_ol_plugins_.getMapRendererPlugins = function() {
+export function getMapRendererPlugins() {
-  return _ol_plugins_.mapRendererPlugins_;
+  return mapRendererPlugins;
-};
+}
 
 
 /**
@@ -26,16 +25,16 @@ _ol_plugins_.getMapRendererPlugins = function() {
  * @type {Array<olx.LayerRendererPlugin>}
  * @private
  */
-_ol_plugins_.layerRendererPlugins_ = [];
+var layerRendererPlugins = [];
 
 
 /**
  * Get all registered layer renderer plugins.
  * @return {Array<olx.LayerRendererPlugin>} The registered layer renderer plugins.
  */
-_ol_plugins_.getLayerRendererPlugins = function() {
+export function getLayerRendererPlugins() {
-  return _ol_plugins_.layerRendererPlugins_;
+  return layerRendererPlugins;
-};
+}
 
 
 /**
@@ -43,16 +42,16 @@ _ol_plugins_.getLayerRendererPlugins = function() {
  * @param {ol.PluginType} type The plugin type.
  * @param {*} plugin The plugin.
  */
-_ol_plugins_.register = function(type, plugin) {
+export function register(type, plugin) {
   var plugins;
   switch (type) {
     case PluginType.MAP_RENDERER: {
-      plugins = _ol_plugins_.mapRendererPlugins_;
+      plugins = mapRendererPlugins;
       plugins.push(/** @type {olx.MapRendererPlugin} */ (plugin));
       break;
     }
     case PluginType.LAYER_RENDERER: {
-      plugins = _ol_plugins_.layerRendererPlugins_;
+      plugins = layerRendererPlugins;
       plugins.push(/** @type {olx.LayerRendererPlugin} */ (plugin));
       break;
     }
@@ -60,7 +59,7 @@ _ol_plugins_.register = function(type, plugin) {
       throw new Error('Unsupported plugin type: ' + type);
     }
   }
-};
+}
 
 
 /**
@@ -68,9 +67,8 @@ _ol_plugins_.register = function(type, plugin) {
  * @param {ol.PluginType} type The plugin type.
  * @param {Array} plugins The plugins.
  */
-_ol_plugins_.registerMultiple = function(type, plugins) {
+export function registerMultiple(type, plugins) {
   for (var i = 0, ii = plugins.length; i < ii; ++i) {
-    _ol_plugins_.register(type, plugins[i]);
+    register(type, plugins[i]);
   }
-};
+}
-export default _ol_plugins_;

src/ol/renderer/Map.js

@@ -8,7 +8,7 @@ import EventType from '../events/EventType.js';
 import {getWidth} from '../extent.js';
 import {TRUE} from '../functions.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
-import _ol_plugins_ from '../plugins.js';
+import {getLayerRendererPlugins} from '../plugins.js';
 import {iconImageCache} from '../style.js';
 import _ol_transform_ from '../transform.js';
 
@@ -207,7 +207,7 @@ _ol_renderer_Map_.prototype.getLayerRenderer = function(layer) {
   if (layerKey in this.layerRenderers_) {
     return this.layerRenderers_[layerKey];
   } else {
-    var layerRendererPlugins = _ol_plugins_.getLayerRendererPlugins();
+    var layerRendererPlugins = getLayerRendererPlugins();
     var renderer;
     var type = this.getType();
     for (var i = 0, ii = layerRendererPlugins.length; i < ii; ++i) {

src/ol/renderer/canvas/ImageLayer.js

@@ -10,7 +10,7 @@ import _ol_array_ from '../../array.js';
 import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
 import _ol_layer_VectorRenderType_ from '../../layer/VectorRenderType.js';
 import _ol_obj_ from '../../obj.js';
-import _ol_plugins_ from '../../plugins.js';
+import {getLayerRendererPlugins} from '../../plugins.js';
 import RendererType from '../Type.js';
 import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
 import _ol_transform_ from '../../transform.js';
@@ -75,7 +75,7 @@ _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) {
 _ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) {
   var renderer = new _ol_renderer_canvas_ImageLayer_(/** @type {ol.layer.Image} */ (layer));
   if (layer.getType() === LayerType.VECTOR) {
-    var candidates = _ol_plugins_.getLayerRendererPlugins();
+    var candidates = getLayerRendererPlugins();
     for (var i = 0, ii = candidates.length; i < ii; ++i) {
       var candidate = /** @type {Object.<string, Function>} */ (candidates[i]);
       if (candidate !== _ol_renderer_canvas_ImageLayer_ && candidate['handles'](RendererType.CANVAS, layer)) {