Remove unused sortByZIndex function

src/ol/renderer/Map.js

@@ -305,12 +305,4 @@ function getLayerStatesMap(layerStatesArray) {
   }, {});
 }
 
-/**
- * @param {import("../layer/Layer.js").State} state1 First layer state.
- * @param {import("../layer/Layer.js").State} state2 Second layer state.
- * @return {number} The zIndex difference.
- */
-export function sortByZIndex(state1, state2) {
-  return state1.zIndex - state2.zIndex;
-}
 export default MapRenderer;

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

@@ -1,11 +1,9 @@
 import {getUid} from '../../../../src/ol/util.js';
-import {stableSort} from '../../../../src/ol/array.js';
 import Collection from '../../../../src/ol/Collection.js';
 import {getIntersection} from '../../../../src/ol/extent.js';
 import LayerGroup from '../../../../src/ol/layer/Group.js';
 import Layer from '../../../../src/ol/layer/Layer.js';
 import {assign} from '../../../../src/ol/obj.js';
-import {sortByZIndex} from '../../../../src/ol/renderer/Map.js';
 import Source from '../../../../src/ol/source/Source.js';
 
 
@@ -331,22 +329,14 @@ describe('ol.layer.Group', function() {
 
   describe('#getLayerStatesArray', function() {
 
-    it('returns an empty array if no layer', function() {
+    let layer1, layer2, layer3;
-      const layerGroup = new LayerGroup();
+    beforeEach(function() {
-
+      layer1 = new Layer({
-      const layerStatesArray = layerGroup.getLayerStatesArray();
-      expect(layerStatesArray).to.be.a(Array);
-      expect(layerStatesArray.length).to.be(0);
-
-      layerGroup.dispose();
-    });
-
-    const layer1 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
-    const layer2 = new Layer({
+      layer2 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         }),
@@ -355,12 +345,29 @@ describe('ol.layer.Group', function() {
         maxResolution: 500,
         minResolution: 0.25
       });
-    const layer3 = new Layer({
+      layer3 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         }),
         extent: [-5, -2, 5, 2]
       });
+    });
+
+    afterEach(function() {
+      layer1.dispose();
+      layer2.dispose();
+      layer3.dispose();
+    });
+
+    it('returns an empty array if no layer', function() {
+      const layerGroup = new LayerGroup();
+
+      const layerStatesArray = layerGroup.getLayerStatesArray();
+      expect(layerStatesArray).to.be.a(Array);
+      expect(layerStatesArray.length).to.be(0);
+
+      layerGroup.dispose();
+    });
 
     it('does not transform layerStates by default', function() {
       const layerGroup = new LayerGroup({
@@ -444,55 +451,6 @@ describe('ol.layer.Group', function() {
       layerGroup.dispose();
     });
 
-    it('let order of layers without Z-index unchanged', function() {
-      const layerGroup = new LayerGroup({
-        layers: [layer1, layer2]
-      });
-
-      const layerStatesArray = layerGroup.getLayerStatesArray();
-      const initialArray = layerStatesArray.slice();
-      stableSort(layerStatesArray, sortByZIndex);
-      expect(layerStatesArray[0]).to.eql(initialArray[0]);
-      expect(layerStatesArray[1]).to.eql(initialArray[1]);
-
-      layerGroup.dispose();
-    });
-
-    it('orders layer with higher Z-index on top', function() {
-      const layer10 = new Layer({
-        source: new Source({
-          projection: 'EPSG:4326'
-        })
-      });
-      layer10.setZIndex(10);
-
-      const layerM1 = new Layer({
-        source: new Source({
-          projection: 'EPSG:4326'
-        })
-      });
-      layerM1.setZIndex(-1);
-
-      const layerGroup = new LayerGroup({
-        layers: [layer1, layer10, layer2, layerM1]
-      });
-
-      const layerStatesArray = layerGroup.getLayerStatesArray();
-      const initialArray = layerStatesArray.slice();
-      stableSort(layerStatesArray, sortByZIndex);
-      expect(layerStatesArray[0]).to.eql(initialArray[3]);
-      expect(layerStatesArray[1]).to.eql(initialArray[0]);
-      expect(layerStatesArray[2]).to.eql(initialArray[2]);
-      expect(layerStatesArray[3]).to.eql(initialArray[1]);
-
-      layer10.dispose();
-      layerM1.dispose();
-      layerGroup.dispose();
-    });
-
-    layer1.dispose();
-    layer2.dispose();
-    layer3.dispose();
   });
 
 });