Rename _ol_layer_Layer_ to Layer

src/ol/layer/Image.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 
 /**
  * @classdesc
@@ -21,7 +21,7 @@ import _ol_layer_Layer_ from '../layer/Layer.js';
  */
 var ImageLayer = function(opt_options) {
   var options = opt_options ? opt_options : {};
-  _ol_layer_Layer_.call(this,  /** @type {olx.layer.LayerOptions} */ (options));
+  Layer.call(this,  /** @type {olx.layer.LayerOptions} */ (options));
 
   /**
    * The layer type.
@@ -32,7 +32,7 @@ var ImageLayer = function(opt_options) {
 
 };
 
-inherits(ImageLayer, _ol_layer_Layer_);
+inherits(ImageLayer, Layer);
 
 
 /**

src/ol/layer/Layer.js

@@ -33,7 +33,7 @@ import SourceState from '../source/State.js';
  * @param {olx.layer.LayerOptions} options Layer options.
  * @api
  */
-var _ol_layer_Layer_ = function(options) {
+var Layer = function(options) {
 
   var baseOptions = _ol_obj_.assign({}, options);
   delete baseOptions.source;
@@ -70,7 +70,7 @@ var _ol_layer_Layer_ = function(options) {
   this.setSource(source);
 };
 
-inherits(_ol_layer_Layer_, BaseLayer);
+inherits(Layer, BaseLayer);
 
 
 /**
@@ -81,7 +81,7 @@ inherits(_ol_layer_Layer_, BaseLayer);
  * @param {number} resolution Resolution.
  * @return {boolean} The layer is visible at the given resolution.
  */
-_ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
+Layer.visibleAtResolution = function(layerState, resolution) {
   return layerState.visible && resolution >= layerState.minResolution &&
       resolution < layerState.maxResolution;
 };
@@ -90,7 +90,7 @@ _ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
 /**
  * @inheritDoc
  */
-_ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
+Layer.prototype.getLayersArray = function(opt_array) {
   var array = opt_array ? opt_array : [];
   array.push(this);
   return array;
@@ -100,7 +100,7 @@ _ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
 /**
  * @inheritDoc
  */
-_ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
+Layer.prototype.getLayerStatesArray = function(opt_states) {
   var states = opt_states ? opt_states : [];
   states.push(this.getLayerState());
   return states;
@@ -113,7 +113,7 @@ _ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
  * @observable
  * @api
  */
-_ol_layer_Layer_.prototype.getSource = function() {
+Layer.prototype.getSource = function() {
   var source = this.get(LayerProperty.SOURCE);
   return /** @type {ol.source.Source} */ (source) || null;
 };
@@ -122,7 +122,7 @@ _ol_layer_Layer_.prototype.getSource = function() {
 /**
   * @inheritDoc
   */
-_ol_layer_Layer_.prototype.getSourceState = function() {
+Layer.prototype.getSourceState = function() {
   var source = this.getSource();
   return !source ? SourceState.UNDEFINED : source.getState();
 };
@@ -131,7 +131,7 @@ _ol_layer_Layer_.prototype.getSourceState = function() {
 /**
  * @private
  */
-_ol_layer_Layer_.prototype.handleSourceChange_ = function() {
+Layer.prototype.handleSourceChange_ = function() {
   this.changed();
 };
 
@@ -139,7 +139,7 @@ _ol_layer_Layer_.prototype.handleSourceChange_ = function() {
 /**
  * @private
  */
-_ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
+Layer.prototype.handleSourcePropertyChange_ = function() {
   if (this.sourceChangeKey_) {
     _ol_events_.unlistenByKey(this.sourceChangeKey_);
     this.sourceChangeKey_ = null;
@@ -165,7 +165,7 @@ _ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
  * @param {ol.PluggableMap} map Map.
  * @api
  */
-_ol_layer_Layer_.prototype.setMap = function(map) {
+Layer.prototype.setMap = function(map) {
   if (this.mapPrecomposeKey_) {
     _ol_events_.unlistenByKey(this.mapPrecomposeKey_);
     this.mapPrecomposeKey_ = null;
@@ -199,7 +199,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
  * @observable
  * @api
  */
-_ol_layer_Layer_.prototype.setSource = function(source) {
+Layer.prototype.setSource = function(source) {
   this.set(LayerProperty.SOURCE, source);
 };
-export default _ol_layer_Layer_;
+export default Layer;

src/ol/layer/Tile.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
 import _ol_obj_ from '../obj.js';
 
@@ -28,7 +28,7 @@ var TileLayer = function(opt_options) {
 
   delete baseOptions.preload;
   delete baseOptions.useInterimTilesOnError;
-  _ol_layer_Layer_.call(this,  /** @type {olx.layer.LayerOptions} */ (baseOptions));
+  Layer.call(this,  /** @type {olx.layer.LayerOptions} */ (baseOptions));
 
   this.setPreload(options.preload !== undefined ? options.preload : 0);
   this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ?
@@ -43,7 +43,7 @@ var TileLayer = function(opt_options) {
 
 };
 
-inherits(TileLayer, _ol_layer_Layer_);
+inherits(TileLayer, Layer);
 
 
 /**

src/ol/layer/Vector.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js';
 import _ol_obj_ from '../obj.js';
 import _ol_style_Style_ from '../style/Style.js';
@@ -41,7 +41,7 @@ var VectorLayer = function(opt_options) {
   delete baseOptions.renderBuffer;
   delete baseOptions.updateWhileAnimating;
   delete baseOptions.updateWhileInteracting;
-  _ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
+  Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
 
   /**
    * @private
@@ -101,7 +101,7 @@ var VectorLayer = function(opt_options) {
 
 };
 
-inherits(VectorLayer, _ol_layer_Layer_);
+inherits(VectorLayer, Layer);
 
 
 /**