More named export and rename

src/ol/CanvasMap.js

@@ -3,20 +3,20 @@
  */
 import {inherits} from './index.js';
 import _ol_PluggableMap_ from './PluggableMap.js';
-import _ol_PluginType_ from './PluginType.js';
+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';
 import _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js';
 import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js';
 
 
-_ol_plugins_.register(_ol_PluginType_.MAP_RENDERER, _ol_renderer_canvas_Map_);
-_ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
+register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_canvas_ImageLayer_,
   _ol_renderer_canvas_TileLayer_,
   _ol_renderer_canvas_VectorLayer_,

src/ol/Graticule.js

@@ -9,7 +9,7 @@ import Point from './geom/Point.js';
 import _ol_geom_flat_geodesic_ from './geom/flat/geodesic.js';
 import _ol_math_ from './math.js';
 import {get as getProjection, equivalent as equivalentProjection, getTransform, transformExtent} from './proj.js';
-import _ol_render_EventType_ from './render/EventType.js';
+import RenderEventType from './render/EventType.js';
 import _ol_style_Fill_ from './style/Fill.js';
 import _ol_style_Stroke_ from './style/Stroke.js';
 import _ol_style_Text_ from './style/Text.js';
@@ -723,13 +723,11 @@ Graticule.prototype.updateProjectionInfo_ = function(projection) {
  */
 Graticule.prototype.setMap = function(map) {
   if (this.map_) {
-    this.map_.un(_ol_render_EventType_.POSTCOMPOSE,
-        this.handlePostCompose_, this);
+    this.map_.un(RenderEventType.POSTCOMPOSE, this.handlePostCompose_, this);
     this.map_.render();
   }
   if (map) {
-    map.on(_ol_render_EventType_.POSTCOMPOSE,
-        this.handlePostCompose_, this);
+    map.on(RenderEventType.POSTCOMPOSE, this.handlePostCompose_, this);
     map.render();
   }
   this.map_ = map;

src/ol/Map.js

@@ -3,11 +3,11 @@
  */
 import {inherits} from './index.js';
 import _ol_PluggableMap_ from './PluggableMap.js';
-import _ol_PluginType_ from './PluginType.js';
+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,17 +19,17 @@ import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js';
 import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js';
 
 
-_ol_plugins_.register(_ol_PluginType_.MAP_RENDERER, _ol_renderer_canvas_Map_);
-_ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
+register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_canvas_ImageLayer_,
   _ol_renderer_canvas_TileLayer_,
   _ol_renderer_canvas_VectorLayer_,
   _ol_renderer_canvas_VectorTileLayer_
 ]);
 
 // TODO: move these to new ol-webgl package
-_ol_plugins_.register(_ol_PluginType_.MAP_RENDERER, _ol_renderer_webgl_Map_);
-_ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
+register(PluginType.MAP_RENDERER, _ol_renderer_webgl_Map_);
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_webgl_ImageLayer_,
   _ol_renderer_webgl_TileLayer_,
   _ol_renderer_webgl_VectorLayer_

src/ol/MapBrowserEventHandler.js

@@ -7,7 +7,7 @@ import MapBrowserEventType from './MapBrowserEventType.js';
 import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
 import _ol_events_ from './events.js';
 import EventTarget from './events/EventTarget.js';
-import _ol_pointer_EventType_ from './pointer/EventType.js';
+import PointerEventType from './pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
 
 /**
@@ -97,15 +97,15 @@ var MapBrowserEventHandler = function(map, moveTolerance) {
    * @private
    */
   this.pointerdownListenerKey_ = _ol_events_.listen(this.pointerEventHandler_,
-      _ol_pointer_EventType_.POINTERDOWN,
+      PointerEventType.POINTERDOWN,
       this.handlePointerDown_, this);
 
   /**
    * @type {?ol.EventsKey}
    * @private
    */
   this.relayedListenerKey_ = _ol_events_.listen(this.pointerEventHandler_,
-      _ol_pointer_EventType_.POINTERMOVE,
+      PointerEventType.POINTERMOVE,
       this.relayEvent_, this);
 
 };

src/ol/PluggableMap.js

@@ -24,8 +24,8 @@ 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 _ol_renderer_Type_ from './renderer/Type.js';
+import {getMapRendererPlugins} from './plugins.js';
+import RendererType from './renderer/Type.js';
 import _ol_size_ from './size.js';
 import PriorityQueue from './structs/PriorityQueue.js';
 import _ol_transform_ from './transform.js';
@@ -1378,8 +1378,8 @@ _ol_PluggableMap_.prototype.unskipFeature = function(feature) {
  * @const
  */
 _ol_PluggableMap_.DEFAULT_RENDERER_TYPES = [
-  _ol_renderer_Type_.CANVAS,
-  _ol_renderer_Type_.WEBGL
+  RendererType.CANVAS,
+  RendererType.WEBGL
 ];
 
 
@@ -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/control/ZoomSlider.js

@@ -12,7 +12,7 @@ import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
 import EventType from '../events/EventType.js';
 import _ol_math_ from '../math.js';
-import _ol_pointer_EventType_ from '../pointer/EventType.js';
+import PointerEventType from '../pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from '../pointer/PointerEventHandler.js';
 
 /**
@@ -113,11 +113,11 @@ var ZoomSlider = function(opt_options) {
    */
   this.dragger_ = new _ol_pointer_PointerEventHandler_(containerElement);
 
-  _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERDOWN,
+  _ol_events_.listen(this.dragger_, PointerEventType.POINTERDOWN,
       this.handleDraggerStart_, this);
-  _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERMOVE,
+  _ol_events_.listen(this.dragger_, PointerEventType.POINTERMOVE,
       this.handleDraggerDrag_, this);
-  _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERUP,
+  _ol_events_.listen(this.dragger_, PointerEventType.POINTERUP,
       this.handleDraggerEnd_, this);
 
   _ol_events_.listen(containerElement, EventType.CLICK,

src/ol/featureloader.js

@@ -2,7 +2,7 @@
  * @module ol/featureloader
  */
 import {nullFunction} from './index.js';
-import _ol_format_FormatType_ from './format/FormatType.js';
+import FormatType from './format/FormatType.js';
 import _ol_xml_ from './xml.js';
 
 
@@ -30,7 +30,7 @@ export function loadFeaturesXhr(url, format, success, failure) {
       xhr.open('GET',
           typeof url === 'function' ? url(extent, resolution, projection) : url,
           true);
-      if (format.getType() == _ol_format_FormatType_.ARRAY_BUFFER) {
+      if (format.getType() == FormatType.ARRAY_BUFFER) {
         xhr.responseType = 'arraybuffer';
       }
       /**
@@ -43,15 +43,14 @@ export function loadFeaturesXhr(url, format, success, failure) {
           var type = format.getType();
           /** @type {Document|Node|Object|string|undefined} */
           var source;
-          if (type == _ol_format_FormatType_.JSON ||
-                type == _ol_format_FormatType_.TEXT) {
+          if (type == FormatType.JSON || type == FormatType.TEXT) {
             source = xhr.responseText;
-          } else if (type == _ol_format_FormatType_.XML) {
+          } else if (type == FormatType.XML) {
             source = xhr.responseXML;
             if (!source) {
               source = _ol_xml_.parse(xhr.responseText);
             }
-          } else if (type == _ol_format_FormatType_.ARRAY_BUFFER) {
+          } else if (type == FormatType.ARRAY_BUFFER) {
             source = /** @type {ArrayBuffer} */ (xhr.response);
           }
           if (source) {

src/ol/format/JSONFeature.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 
 /**
  * @classdesc
@@ -43,7 +43,7 @@ JSONFeature.prototype.getObject_ = function(source) {
  * @inheritDoc
  */
 JSONFeature.prototype.getType = function() {
-  return _ol_format_FormatType_.JSON;
+  return FormatType.JSON;
 };
 
 

src/ol/format/MVT.js

@@ -7,7 +7,7 @@ import {inherits} from '../index.js';
 import {assert} from '../asserts.js';
 import PBF from 'pbf';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
 import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
@@ -345,7 +345,7 @@ MVT.prototype.getLastExtent = function() {
  * @inheritDoc
  */
 MVT.prototype.getType = function() {
-  return _ol_format_FormatType_.ARRAY_BUFFER;
+  return FormatType.ARRAY_BUFFER;
 };
 
 

src/ol/format/TextFeature.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 
 /**
  * @classdesc
@@ -40,7 +40,7 @@ TextFeature.prototype.getText_ = function(source) {
  * @inheritDoc
  */
 TextFeature.prototype.getType = function() {
-  return _ol_format_FormatType_.TEXT;
+  return FormatType.TEXT;
 };
 
 

src/ol/format/XMLFeature.js

@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 import _ol_xml_ from '../xml.js';
 
 /**
@@ -35,7 +35,7 @@ inherits(XMLFeature, FeatureFormat);
  * @inheritDoc
  */
 XMLFeature.prototype.getType = function() {
-  return _ol_format_FormatType_.XML;
+  return FormatType.XML;
 };
 
 

src/ol/interaction/Draw.js

@@ -19,7 +19,7 @@ import MultiPoint from '../geom/MultiPoint.js';
 import MultiPolygon from '../geom/MultiPolygon.js';
 import Point from '../geom/Point.js';
 import Polygon from '../geom/Polygon.js';
-import _ol_interaction_DrawEventType_ from '../interaction/DrawEventType.js';
+import DrawEventType from '../interaction/DrawEventType.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
 import _ol_interaction_Property_ from '../interaction/Property.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
@@ -520,8 +520,7 @@ Draw.prototype.startDrawing_ = function(event) {
   }
   this.sketchFeature_.setGeometry(geometry);
   this.updateSketchFeatures_();
-  this.dispatchEvent(new Draw.Event(
-      _ol_interaction_DrawEventType_.DRAWSTART, this.sketchFeature_));
+  this.dispatchEvent(new Draw.Event(DrawEventType.DRAWSTART, this.sketchFeature_));
 };
 
 
@@ -680,8 +679,7 @@ Draw.prototype.finishDrawing = function() {
   }
 
   // First dispatch event to allow full set up of feature
-  this.dispatchEvent(new Draw.Event(
-      _ol_interaction_DrawEventType_.DRAWEND, sketchFeature));
+  this.dispatchEvent(new Draw.Event(DrawEventType.DRAWEND, sketchFeature));
 
   // Then insert feature
   if (this.features_) {
@@ -727,8 +725,7 @@ Draw.prototype.extend = function(feature) {
   this.finishCoordinate_ = last.slice();
   this.sketchCoords_.push(last.slice());
   this.updateSketchFeatures_();
-  this.dispatchEvent(new Draw.Event(
-      _ol_interaction_DrawEventType_.DRAWSTART, this.sketchFeature_));
+  this.dispatchEvent(new Draw.Event(DrawEventType.DRAWSTART, this.sketchFeature_));
 };
 
 

src/ol/layer/Heatmap.js

@@ -8,7 +8,7 @@ import {createCanvasContext2D} from '../dom.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
 import _ol_math_ from '../math.js';
 import _ol_obj_ from '../obj.js';
-import _ol_render_EventType_ from '../render/EventType.js';
+import RenderEventType from '../render/EventType.js';
 import _ol_style_Icon_ from '../style/Icon.js';
 import _ol_style_Style_ from '../style/Style.js';
 
@@ -133,7 +133,7 @@ var Heatmap = function(opt_options) {
   // The render order is not relevant for a heatmap representation.
   this.setRenderOrder(null);
 
-  _ol_events_.listen(this, _ol_render_EventType_.RENDER, this.handleRender_, this);
+  _ol_events_.listen(this, RenderEventType.RENDER, this.handleRender_, this);
 };
 
 inherits(Heatmap, _ol_layer_Vector_);

src/ol/layer/Image.js

@@ -2,7 +2,7 @@
  * @module ol/layer/Image
  */
 import {inherits} from '../index.js';
-import _ol_LayerType_ from '../LayerType.js';
+import LayerType from '../LayerType.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
 
 /**
@@ -28,7 +28,7 @@ var _ol_layer_Image_ = function(opt_options) {
    * @protected
    * @type {ol.LayerType}
    */
-  this.type = _ol_LayerType_.IMAGE;
+  this.type = LayerType.IMAGE;
 
 };
 

src/ol/layer/Layer.js

@@ -8,7 +8,7 @@ import _ol_Object_ from '../Object.js';
 import _ol_layer_Base_ from '../layer/Base.js';
 import _ol_layer_Property_ from '../layer/Property.js';
 import _ol_obj_ from '../obj.js';
-import _ol_render_EventType_ from '../render/EventType.js';
+import RenderEventType from '../render/EventType.js';
 import _ol_source_State_ from '../source/State.js';
 
 /**
@@ -179,7 +179,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
   }
   if (map) {
     this.mapPrecomposeKey_ = _ol_events_.listen(
-        map, _ol_render_EventType_.PRECOMPOSE, function(evt) {
+        map, RenderEventType.PRECOMPOSE, function(evt) {
           var layerState = this.getLayerState();
           layerState.managed = false;
           layerState.zIndex = Infinity;

src/ol/layer/Tile.js

@@ -2,7 +2,7 @@
  * @module ol/layer/Tile
  */
 import {inherits} from '../index.js';
-import _ol_LayerType_ from '../LayerType.js';
+import LayerType from '../LayerType.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
 import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
 import _ol_obj_ from '../obj.js';
@@ -39,7 +39,7 @@ var _ol_layer_Tile_ = function(opt_options) {
    * @protected
    * @type {ol.LayerType}
    */
-  this.type = _ol_LayerType_.TILE;
+  this.type = LayerType.TILE;
 
 };