Rename _ol_layer_Layer_ to Layer

test/spec/ol/layer/group.test.js

@@ -3,7 +3,7 @@ import {stableSort} from '../../../../src/ol/array.js';
 import _ol_Collection_ from '../../../../src/ol/Collection.js';
 import * as _ol_extent_ from '../../../../src/ol/extent.js';
 import LayerGroup from '../../../../src/ol/layer/Group.js';
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import MapRenderer from '../../../../src/ol/renderer/Map.js';
 import Source from '../../../../src/ol/source/Source.js';
@@ -60,7 +60,7 @@ describe('ol.layer.Group', function() {
 
     var layer, group, listener;
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -99,7 +99,7 @@ describe('ol.layer.Group', function() {
 
     var layer, group, listener;
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -137,7 +137,7 @@ describe('ol.layer.Group', function() {
   describe('constructor (options)', function() {
 
     it('accepts options', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -175,7 +175,7 @@ describe('ol.layer.Group', function() {
     });
 
     it('accepts an extent option', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -289,7 +289,7 @@ describe('ol.layer.Group', function() {
         layers: layers
       });
       expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(0);
-      var layer = new _ol_layer_Layer_({});
+      var layer = new Layer({});
       layers.push(layer);
       expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(1);
 
@@ -310,7 +310,7 @@ describe('ol.layer.Group', function() {
   describe('#setLayers', function() {
 
     it('sets layers property', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -341,12 +341,12 @@ describe('ol.layer.Group', function() {
       layerGroup.dispose();
     });
 
-    var layer1 = new _ol_layer_Layer_({
+    var layer1 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       })
     });
-    var layer2 = new _ol_layer_Layer_({
+    var layer2 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       }),
@@ -355,7 +355,7 @@ describe('ol.layer.Group', function() {
       maxResolution: 500,
       minResolution: 0.25
     });
-    var layer3 = new _ol_layer_Layer_({
+    var layer3 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       }),
@@ -460,14 +460,14 @@ describe('ol.layer.Group', function() {
     });
 
     it('orders layer with higher Z-index on top', function() {
-      var layer10 = new _ol_layer_Layer_({
+      var layer10 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
       layer10.setZIndex(10);
 
-      var layerM1 = new _ol_layer_Layer_({
+      var layerM1 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })

test/spec/ol/layer/layer.test.js

@@ -1,6 +1,6 @@
 import {getUid} from '../../../../src/ol/index.js';
 import Map from '../../../../src/ol/Map.js';
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import {get as getProjection} from '../../../../src/ol/proj.js';
 import RenderEvent from '../../../../src/ol/render/Event.js';
 import Source from '../../../../src/ol/source/Source.js';
@@ -13,7 +13,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -25,7 +25,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('creates an instance', function() {
-      expect(layer).to.be.a(_ol_layer_Layer_);
+      expect(layer).to.be.a(Layer);
     });
 
     it('provides default opacity', function() {
@@ -63,7 +63,7 @@ describe('ol.layer.Layer', function() {
   describe('constructor (options)', function() {
 
     it('accepts options', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         }),
@@ -101,7 +101,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -117,7 +117,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 4)).to.be(false);
+      expect(Layer.visibleAtResolution(layerState, 4)).to.be(false);
     });
 
     it('returns false if resolution lower than minResolution', function() {
@@ -125,7 +125,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 2)).to.be(false);
+      expect(Layer.visibleAtResolution(layerState, 2)).to.be(false);
     });
 
     it('returns false if resolution greater than maxResolution', function() {
@@ -133,7 +133,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 6)).to.be(false);
+      expect(Layer.visibleAtResolution(layerState, 6)).to.be(false);
     });
 
     it('returns true otherwise', function() {
@@ -141,7 +141,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 4)).to.be(true);
+      expect(Layer.visibleAtResolution(layerState, 4)).to.be(true);
     });
 
   });
@@ -151,7 +151,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -217,7 +217,7 @@ describe('ol.layer.Layer', function() {
 
     it('gets the layer source', function() {
       var source = new Source({projection: getProjection('EPSG:4326')});
-      var layer = new _ol_layer_Layer_({source: source});
+      var layer = new Layer({source: source});
       expect(layer.getSource()).to.be(source);
     });
 
@@ -227,7 +227,7 @@ describe('ol.layer.Layer', function() {
     var projection = getProjection('EPSG:4326');
 
     it('sets the layer source', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
 
@@ -237,7 +237,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('calls changed', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
       sinon.spy(layer, 'changed');
@@ -248,10 +248,10 @@ describe('ol.layer.Layer', function() {
     });
 
     it('sets up event listeners', function() {
-      sinon.spy(_ol_layer_Layer_.prototype, 'handleSourceChange_');
+      sinon.spy(Layer.prototype, 'handleSourceChange_');
 
       var first = new Source({projection: projection});
-      var layer = new _ol_layer_Layer_({source: first});
+      var layer = new Layer({source: first});
 
       first.setState('ready');
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -264,7 +264,7 @@ describe('ol.layer.Layer', function() {
       expect(layer.handleSourceChange_.callCount).to.be(2);
 
       // remove spy
-      _ol_layer_Layer_.prototype.handleSourceChange_.restore();
+      Layer.prototype.handleSourceChange_.restore();
     });
 
   });
@@ -273,7 +273,7 @@ describe('ol.layer.Layer', function() {
     var projection = getProjection('EPSG:4326');
 
     it('sets the layer source', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
 
@@ -283,7 +283,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('calls changed', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
       sinon.spy(layer, 'changed');
@@ -294,10 +294,10 @@ describe('ol.layer.Layer', function() {
     });
 
     it('sets up event listeners', function() {
-      sinon.spy(_ol_layer_Layer_.prototype, 'handleSourceChange_');
+      sinon.spy(Layer.prototype, 'handleSourceChange_');
 
       var first = new Source({projection: projection});
-      var layer = new _ol_layer_Layer_({source: first});
+      var layer = new Layer({source: first});
 
       first.setState('ready');
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -310,7 +310,7 @@ describe('ol.layer.Layer', function() {
       expect(layer.handleSourceChange_.callCount).to.be(2);
 
       // remove spy
-      _ol_layer_Layer_.prototype.handleSourceChange_.restore();
+      Layer.prototype.handleSourceChange_.restore();
     });
 
   });
@@ -321,7 +321,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -351,7 +351,7 @@ describe('ol.layer.Layer', function() {
 
     var layer;
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -392,7 +392,7 @@ describe('ol.layer.Layer', function() {
 
     describe('with map in constructor options', function() {
       it('renders the layer', function() {
-        var layer = new _ol_layer_Layer_({
+        var layer = new Layer({
           map: map
         });
         var frameState = {
@@ -420,7 +420,7 @@ describe('ol.layer.Layer', function() {
       });
 
       it('requests a render frame', function() {
-        var layer = new _ol_layer_Layer_({});
+        var layer = new Layer({});
 
         layer.setMap(map);
         expect(mapRenderSpy.callCount).to.be(1);

test/spec/ol/layer/vector.test.js

@@ -1,4 +1,4 @@
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import VectorSource from '../../../../src/ol/source/Vector.js';
 import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -13,7 +13,7 @@ describe('ol.layer.Vector', function() {
     it('creates a new layer', function() {
       var layer = new VectorLayer({source: source});
       expect(layer).to.be.a(VectorLayer);
-      expect(layer).to.be.a(_ol_layer_Layer_);
+      expect(layer).to.be.a(Layer);
     });
 
     it('accepts a style option with a single style', function() {

test/spec/ol/renderer/layer.test.js

@@ -1,7 +1,7 @@
 import _ol_Image_ from '../../../../src/ol/Image.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import TileLayer from '../../../../src/ol/layer/Tile.js';
 import LayerRenderer from '../../../../src/ol/renderer/Layer.js';
 import XYZ from '../../../../src/ol/source/XYZ.js';
@@ -13,7 +13,7 @@ describe('ol.renderer.Layer', function() {
   var eventType = 'change';
 
   beforeEach(function() {
-    var layer = new _ol_layer_Layer_({});
+    var layer = new Layer({});
     renderer = new LayerRenderer(layer);
   });