Use blocked scoped variables

In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).

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

@@ -13,7 +13,7 @@ describe('ol.layer.Group', function() {
 
   describe('constructor (defaults)', function() {
 
-    var layerGroup;
+    let layerGroup;
 
     beforeEach(function() {
       layerGroup = new LayerGroup();
@@ -58,7 +58,7 @@ describe('ol.layer.Group', function() {
 
   describe('generic change event', function() {
 
-    var layer, group, listener;
+    let layer, group, listener;
     beforeEach(function() {
       layer = new Layer({
         source: new Source({
@@ -97,7 +97,7 @@ describe('ol.layer.Group', function() {
 
   describe('property change event', function() {
 
-    var layer, group, listener;
+    let layer, group, listener;
     beforeEach(function() {
       layer = new Layer({
         source: new Source({
@@ -137,12 +137,12 @@ describe('ol.layer.Group', function() {
   describe('constructor (options)', function() {
 
     it('accepts options', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
-      var layerGroup = new LayerGroup({
+      const layerGroup = new LayerGroup({
         layers: [layer],
         opacity: 0.5,
         visible: false,
@@ -175,14 +175,14 @@ describe('ol.layer.Group', function() {
     });
 
     it('accepts an extent option', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
 
-      var groupExtent = [-10, -5, 10, 5];
-      var layerGroup = new LayerGroup({
+      const groupExtent = [-10, -5, 10, 5];
+      const layerGroup = new LayerGroup({
         layers: [layer],
         opacity: 0.5,
         visible: false,
@@ -218,7 +218,7 @@ describe('ol.layer.Group', function() {
 
   describe('#getLayerState', function() {
 
-    var layerGroup;
+    let layerGroup;
 
     beforeEach(function() {
       layerGroup = new LayerGroup();
@@ -232,7 +232,7 @@ describe('ol.layer.Group', function() {
       layerGroup.setOpacity(0.3);
       layerGroup.setVisible(false);
       layerGroup.setZIndex(10);
-      var groupExtent = [-100, 50, 100, 50];
+      const groupExtent = [-100, 50, 100, 50];
       layerGroup.setExtent(groupExtent);
       layerGroup.setMaxResolution(500);
       layerGroup.setMinResolution(0.25);
@@ -284,16 +284,16 @@ describe('ol.layer.Group', function() {
   describe('layers events', function() {
 
     it('listen / unlisten for layers added to the collection', function() {
-      var layers = new Collection();
-      var layerGroup = new LayerGroup({
+      const layers = new Collection();
+      const layerGroup = new LayerGroup({
         layers: layers
       });
       expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(0);
-      var layer = new Layer({});
+      const layer = new Layer({});
       layers.push(layer);
       expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(1);
 
-      var listeners = layerGroup.listenerKeys_[getUid(layer)];
+      const listeners = layerGroup.listenerKeys_[getUid(layer)];
       expect(listeners.length).to.eql(2);
       expect(typeof listeners[0]).to.be('object');
       expect(typeof listeners[1]).to.be('object');
@@ -310,13 +310,13 @@ describe('ol.layer.Group', function() {
   describe('#setLayers', function() {
 
     it('sets layers property', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
-      var layers = new Collection([layer]);
-      var layerGroup = new LayerGroup();
+      const layers = new Collection([layer]);
+      const layerGroup = new LayerGroup();
 
       layerGroup.setLayers(layers);
       expect(layerGroup.getLayers()).to.be(layers);
@@ -332,21 +332,21 @@ describe('ol.layer.Group', function() {
   describe('#getLayerStatesArray', function() {
 
     it('returns an empty array if no layer', function() {
-      var layerGroup = new LayerGroup();
+      const layerGroup = new LayerGroup();
 
-      var layerStatesArray = layerGroup.getLayerStatesArray();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
       expect(layerStatesArray).to.be.a(Array);
       expect(layerStatesArray.length).to.be(0);
 
       layerGroup.dispose();
     });
 
-    var layer1 = new Layer({
+    const layer1 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       })
     });
-    var layer2 = new Layer({
+    const 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 Layer({
+    const layer3 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       }),
@@ -363,19 +363,19 @@ describe('ol.layer.Group', function() {
     });
 
     it('does not transform layerStates by default', function() {
-      var layerGroup = new LayerGroup({
+      const layerGroup = new LayerGroup({
         layers: [layer1, layer2]
       });
 
-      var layerStatesArray = layerGroup.getLayerStatesArray();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
       expect(layerStatesArray).to.be.a(Array);
       expect(layerStatesArray.length).to.be(2);
       expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
 
       // layer state should match except for layer reference
-      var layerState = _ol_obj_.assign({}, layerStatesArray[0]);
+      const layerState = _ol_obj_.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      var groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
+      const groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
@@ -385,30 +385,30 @@ describe('ol.layer.Group', function() {
     });
 
     it('uses the layer group extent if layer has no extent', function() {
-      var groupExtent = [-10, -5, 10, 5];
-      var layerGroup = new LayerGroup({
+      const groupExtent = [-10, -5, 10, 5];
+      const layerGroup = new LayerGroup({
         extent: groupExtent,
         layers: [layer1]
       });
-      var layerStatesArray = layerGroup.getLayerStatesArray();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
       expect(layerStatesArray[0].extent).to.eql(groupExtent);
       layerGroup.dispose();
     });
 
     it('uses the intersection of group and child extent', function() {
-      var groupExtent = [-10, -5, 10, 5];
-      var layerGroup = new LayerGroup({
+      const groupExtent = [-10, -5, 10, 5];
+      const layerGroup = new LayerGroup({
         extent: groupExtent,
         layers: [layer3]
       });
-      var layerStatesArray = layerGroup.getLayerStatesArray();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
       expect(layerStatesArray[0].extent).to.eql(
-          _ol_extent_.getIntersection(layer3.getExtent(), groupExtent));
+        _ol_extent_.getIntersection(layer3.getExtent(), groupExtent));
       layerGroup.dispose();
     });
 
     it('transforms layerStates correctly', function() {
-      var layerGroup = new LayerGroup({
+      const layerGroup = new LayerGroup({
         layers: [layer1, layer2],
         opacity: 0.5,
         visible: false,
@@ -416,15 +416,14 @@ describe('ol.layer.Group', function() {
         minResolution: 0.2
       });
 
-      var layerStatesArray = layerGroup.getLayerStatesArray();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
 
       // compare layer state to group state
-      var groupState, layerState;
 
       // layer state should match except for layer reference
-      layerState = _ol_obj_.assign({}, layerStatesArray[0]);
+      let layerState = _ol_obj_.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
+      const groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
@@ -446,12 +445,12 @@ describe('ol.layer.Group', function() {
     });
 
     it('let order of layers without Z-index unchanged', function() {
-      var layerGroup = new LayerGroup({
+      const layerGroup = new LayerGroup({
         layers: [layer1, layer2]
       });
 
-      var layerStatesArray = layerGroup.getLayerStatesArray();
-      var initialArray = layerStatesArray.slice();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
+      const initialArray = layerStatesArray.slice();
       stableSort(layerStatesArray, MapRenderer.sortByZIndex);
       expect(layerStatesArray[0]).to.eql(initialArray[0]);
       expect(layerStatesArray[1]).to.eql(initialArray[1]);
@@ -460,26 +459,26 @@ describe('ol.layer.Group', function() {
     });
 
     it('orders layer with higher Z-index on top', function() {
-      var layer10 = new Layer({
+      const layer10 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
       layer10.setZIndex(10);
 
-      var layerM1 = new Layer({
+      const layerM1 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
       layerM1.setZIndex(-1);
 
-      var layerGroup = new LayerGroup({
+      const layerGroup = new LayerGroup({
         layers: [layer1, layer10, layer2, layerM1]
       });
 
-      var layerStatesArray = layerGroup.getLayerStatesArray();
-      var initialArray = layerStatesArray.slice();
+      const layerStatesArray = layerGroup.getLayerStatesArray();
+      const initialArray = layerStatesArray.slice();
       stableSort(layerStatesArray, MapRenderer.sortByZIndex);
       expect(layerStatesArray[0]).to.eql(initialArray[3]);
       expect(layerStatesArray[1]).to.eql(initialArray[0]);

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

@@ -6,7 +6,7 @@ describe('ol.layer.Heatmap', function() {
   describe('constructor', function() {
 
     it('can be constructed without arguments', function() {
-      var instance = new HeatmapLayer();
+      const instance = new HeatmapLayer();
       expect(instance).to.be.an(HeatmapLayer);
     });
 

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

@@ -10,7 +10,7 @@ describe('ol.layer.Layer', function() {
 
   describe('constructor (defaults)', function() {
 
-    var layer;
+    let layer;
 
     beforeEach(function() {
       layer = new Layer({
@@ -63,7 +63,7 @@ describe('ol.layer.Layer', function() {
   describe('constructor (options)', function() {
 
     it('accepts options', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         }),
@@ -98,7 +98,7 @@ describe('ol.layer.Layer', function() {
   });
 
   describe('visibleAtResolution', function() {
-    var layer;
+    let layer;
 
     beforeEach(function() {
       layer = new Layer({
@@ -116,7 +116,7 @@ describe('ol.layer.Layer', function() {
       layer.setVisible(false);
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
-      var layerState = layer.getLayerState();
+      const layerState = layer.getLayerState();
       expect(Layer.visibleAtResolution(layerState, 4)).to.be(false);
     });
 
@@ -124,7 +124,7 @@ describe('ol.layer.Layer', function() {
       layer.setVisible(true);
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
-      var layerState = layer.getLayerState();
+      const layerState = layer.getLayerState();
       expect(Layer.visibleAtResolution(layerState, 2)).to.be(false);
     });
 
@@ -132,7 +132,7 @@ describe('ol.layer.Layer', function() {
       layer.setVisible(true);
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
-      var layerState = layer.getLayerState();
+      const layerState = layer.getLayerState();
       expect(Layer.visibleAtResolution(layerState, 6)).to.be(false);
     });
 
@@ -140,7 +140,7 @@ describe('ol.layer.Layer', function() {
       layer.setVisible(true);
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
-      var layerState = layer.getLayerState();
+      const layerState = layer.getLayerState();
       expect(Layer.visibleAtResolution(layerState, 4)).to.be(true);
     });
 
@@ -148,7 +148,7 @@ describe('ol.layer.Layer', function() {
 
   describe('#getLayerState', function() {
 
-    var layer;
+    let layer;
 
     beforeEach(function() {
       layer = new Layer({
@@ -216,33 +216,33 @@ describe('ol.layer.Layer', function() {
   describe('#getSource', function() {
 
     it('gets the layer source', function() {
-      var source = new Source({projection: getProjection('EPSG:4326')});
-      var layer = new Layer({source: source});
+      const source = new Source({projection: getProjection('EPSG:4326')});
+      const layer = new Layer({source: source});
       expect(layer.getSource()).to.be(source);
     });
 
   });
 
   describe('#set("source", source)', function() {
-    var projection = getProjection('EPSG:4326');
+    const projection = getProjection('EPSG:4326');
 
     it('sets the layer source', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({projection: projection})
       });
 
-      var source = new Source({projection: projection});
+      const source = new Source({projection: projection});
       layer.set('source', source);
       expect(layer.getSource()).to.be(source);
     });
 
     it('calls changed', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({projection: projection})
       });
       sinon.spy(layer, 'changed');
 
-      var source = new Source({projection: projection});
+      const source = new Source({projection: projection});
       layer.set('source', source);
       expect(layer.changed.calledOnce).to.be(true);
     });
@@ -250,13 +250,13 @@ describe('ol.layer.Layer', function() {
     it('sets up event listeners', function() {
       sinon.spy(Layer.prototype, 'handleSourceChange_');
 
-      var first = new Source({projection: projection});
-      var layer = new Layer({source: first});
+      const first = new Source({projection: projection});
+      const layer = new Layer({source: first});
 
       first.setState('ready');
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
 
-      var second = new Source({projection: projection});
+      const second = new Source({projection: projection});
       layer.set('source', second);
 
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -270,25 +270,25 @@ describe('ol.layer.Layer', function() {
   });
 
   describe('#setSource()', function() {
-    var projection = getProjection('EPSG:4326');
+    const projection = getProjection('EPSG:4326');
 
     it('sets the layer source', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({projection: projection})
       });
 
-      var source = new Source({projection: projection});
+      const source = new Source({projection: projection});
       layer.setSource(source);
       expect(layer.getSource()).to.be(source);
     });
 
     it('calls changed', function() {
-      var layer = new Layer({
+      const layer = new Layer({
         source: new Source({projection: projection})
       });
       sinon.spy(layer, 'changed');
 
-      var source = new Source({projection: projection});
+      const source = new Source({projection: projection});
       layer.setSource(source);
       expect(layer.changed.calledOnce).to.be(true);
     });
@@ -296,13 +296,13 @@ describe('ol.layer.Layer', function() {
     it('sets up event listeners', function() {
       sinon.spy(Layer.prototype, 'handleSourceChange_');
 
-      var first = new Source({projection: projection});
-      var layer = new Layer({source: first});
+      const first = new Source({projection: projection});
+      const layer = new Layer({source: first});
 
       first.setState('ready');
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
 
-      var second = new Source({projection: projection});
+      const second = new Source({projection: projection});
       layer.setSource(second);
 
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -318,7 +318,7 @@ describe('ol.layer.Layer', function() {
 
   describe('#setOpacity', function() {
 
-    var layer;
+    let layer;
 
     beforeEach(function() {
       layer = new Layer({
@@ -338,7 +338,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('triggers a change event', function() {
-      var listener = sinon.spy();
+      const listener = sinon.spy();
       layer.on('propertychange', listener);
       layer.setOpacity(0.4);
       expect(listener.calledOnce).to.be(true);
@@ -349,7 +349,7 @@ describe('ol.layer.Layer', function() {
 
   describe('#setVisible', function() {
 
-    var layer;
+    let layer;
     beforeEach(function() {
       layer = new Layer({
         source: new Source({
@@ -371,7 +371,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('fires a change event', function() {
-      var listener = sinon.spy();
+      const listener = sinon.spy();
       layer.on('propertychange', listener);
 
       layer.setVisible(false);
@@ -384,7 +384,7 @@ describe('ol.layer.Layer', function() {
   });
 
   describe('#setMap (unmanaged layer)', function() {
-    var map;
+    let map;
 
     beforeEach(function() {
       map = new Map({});
@@ -392,24 +392,24 @@ describe('ol.layer.Layer', function() {
 
     describe('with map in constructor options', function() {
       it('renders the layer', function() {
-        var layer = new Layer({
+        const layer = new Layer({
           map: map
         });
-        var frameState = {
+        const frameState = {
           layerStatesArray: [],
           layerStates: {}
         };
         map.dispatchEvent(new RenderEvent('precompose', null,
-            frameState, null, null));
+          frameState, null, null));
         expect(frameState.layerStatesArray.length).to.be(1);
-        var layerState = frameState.layerStatesArray[0];
+        const layerState = frameState.layerStatesArray[0];
         expect(layerState.layer).to.equal(layer);
         expect(frameState.layerStates[getUid(layer)]).to.equal(layerState);
       });
     });
 
     describe('setMap sequences', function() {
-      var mapRenderSpy;
+      let mapRenderSpy;
 
       beforeEach(function() {
         mapRenderSpy = sinon.spy(map, 'render');
@@ -420,7 +420,7 @@ describe('ol.layer.Layer', function() {
       });
 
       it('requests a render frame', function() {
-        var layer = new Layer({});
+        const layer = new Layer({});
 
         layer.setMap(map);
         expect(mapRenderSpy.callCount).to.be(1);

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

@@ -6,7 +6,7 @@ describe('ol.layer.Tile', function() {
 
   describe('constructor (defaults)', function() {
 
-    var layer;
+    let layer;
 
     beforeEach(function() {
       layer = new TileLayer({

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

@@ -7,44 +7,44 @@ import Style from '../../../../src/ol/style/Style.js';
 describe('ol.layer.Vector', function() {
 
   describe('constructor', function() {
-    var source = new VectorSource();
-    var style = new Style();
+    const source = new VectorSource();
+    const style = new Style();
 
     it('creates a new layer', function() {
-      var layer = new VectorLayer({source: source});
+      const layer = new VectorLayer({source: source});
       expect(layer).to.be.a(VectorLayer);
       expect(layer).to.be.a(Layer);
     });
 
     it('accepts a style option with a single style', function() {
-      var layer = new VectorLayer({
+      const layer = new VectorLayer({
         source: source,
         style: style
       });
 
-      var styleFunction = layer.getStyleFunction();
+      const styleFunction = layer.getStyleFunction();
       expect(styleFunction()).to.eql([style]);
     });
 
     it('accepts a style option with an array of styles', function() {
-      var layer = new VectorLayer({
+      const layer = new VectorLayer({
         source: source,
         style: [style]
       });
 
-      var styleFunction = layer.getStyleFunction();
+      const styleFunction = layer.getStyleFunction();
       expect(styleFunction()).to.eql([style]);
     });
 
     it('accepts a style option with a style function', function() {
-      var layer = new VectorLayer({
+      const layer = new VectorLayer({
         source: source,
         style: function(feature, resolution) {
           return [style];
         }
       });
 
-      var styleFunction = layer.getStyleFunction();
+      const styleFunction = layer.getStyleFunction();
       expect(styleFunction()).to.eql([style]);
     });
 
@@ -52,7 +52,7 @@ describe('ol.layer.Vector', function() {
 
   describe('#setStyle()', function() {
 
-    var layer, style;
+    let layer, style;
 
     beforeEach(function() {
       layer = new VectorLayer({
@@ -77,7 +77,7 @@ describe('ol.layer.Vector', function() {
       expect(layer.getStyleFunction()).to.be(Style.defaultFunction);
       layer.setStyle(style);
       expect(layer.getStyleFunction()).not.to.be(
-          Style.defaultFunction);
+        Style.defaultFunction);
     });
 
     it('allows setting an null style', function() {
@@ -97,11 +97,11 @@ describe('ol.layer.Vector', function() {
 
   describe('#getStyle()', function() {
 
-    var source = new VectorSource();
-    var style = new Style();
+    const source = new VectorSource();
+    const style = new Style();
 
     it('returns what is provided to setStyle', function() {
-      var layer = new VectorLayer({
+      const layer = new VectorLayer({
         source: source
       });
 
@@ -113,7 +113,7 @@ describe('ol.layer.Vector', function() {
       layer.setStyle([style]);
       expect(layer.getStyle()).to.eql([style]);
 
-      var styleFunction = function(feature, resolution) {
+      const styleFunction = function(feature, resolution) {
         return [style];
       };
       layer.setStyle(styleFunction);

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

@@ -6,7 +6,7 @@ describe('ol.layer.VectorTile', function() {
 
   describe('constructor (defaults)', function() {
 
-    var layer;
+    let layer;
 
     beforeEach(function() {
       layer = new VectorTileLayer({
@@ -38,7 +38,7 @@ describe('ol.layer.VectorTile', function() {
 
   describe('constructor (options)', function() {
     it('works with options', function() {
-      var layer = new VectorTileLayer({
+      let layer = new VectorTileLayer({
         renderMode: 'vector',
         source: new VectorTileSource({})
       });