diff --git a/src/ol/array.js b/src/ol/array.js index 06185a4d8a..518538641c 100644 --- a/src/ol/array.js +++ b/src/ol/array.js @@ -208,20 +208,6 @@ export function stableSort(arr, compareFnc) { } } -/** - * @param {Array<*>} arr The array to search in. - * @param {Function} func Comparison function. - * @return {number} Return index. - */ -export function findIndex(arr, func) { - let index; - const found = !arr.every(function (el, idx) { - index = idx; - return !func(el, idx, arr); - }); - return found ? index : -1; -} - /** * @param {Array<*>} arr The array to test. * @param {Function} [opt_func] Comparison function. diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js index 72ac18b4ee..a9f2322d5f 100644 --- a/src/ol/source/WMTS.js +++ b/src/ol/source/WMTS.js @@ -9,7 +9,6 @@ import {containsExtent} from '../extent.js'; import {createFromCapabilitiesMatrixSet} from '../tilegrid/WMTS.js'; import {createFromTileUrlFunctions, expandUrl} from '../tileurlfunction.js'; import {equivalent, get as getProjection, transformExtent} from '../proj.js'; -import {findIndex} from '../array.js'; /** * Request encoding. One of 'KVP', 'REST'. @@ -382,7 +381,7 @@ export function optionsFromCapabilities(wmtsCap, config) { let idx; if (l['TileMatrixSetLink'].length > 1) { if ('projection' in config) { - idx = findIndex(l['TileMatrixSetLink'], function (elt, index, array) { + idx = l['TileMatrixSetLink'].findIndex(function (elt) { const tileMatrixSet = tileMatrixSets.find(function (el) { return el['Identifier'] == elt['TileMatrixSet']; }); @@ -396,7 +395,7 @@ export function optionsFromCapabilities(wmtsCap, config) { } }); } else { - idx = findIndex(l['TileMatrixSetLink'], function (elt, index, array) { + idx = l['TileMatrixSetLink'].findIndex(function (elt) { return elt['TileMatrixSet'] == config['matrixSet']; }); } @@ -417,7 +416,7 @@ export function optionsFromCapabilities(wmtsCap, config) { if ('format' in config) { format = config['format']; } - idx = findIndex(l['Style'], function (elt, index, array) { + idx = l['Style'].findIndex(function (elt) { if ('style' in config) { return elt['Title'] == config['style']; } else { diff --git a/test/node/ol/array.test.js b/test/node/ol/array.test.js index d314660abf..c881b808f2 100644 --- a/test/node/ol/array.test.js +++ b/test/node/ol/array.test.js @@ -3,7 +3,6 @@ import { binarySearch, equals, extend, - findIndex, isSorted, linearFindNearest, numberSafeCompareFunction, @@ -382,26 +381,6 @@ describe('ol/array.js', function () { }); }); - describe('findIndex', function () { - it('finds index of numbers in an array', function () { - const a = [0, 1, 2, 3]; - const b = findIndex(a, function (val, index, a2) { - expect(a).to.equal(a2); - expect(typeof index).to.be('number'); - return val > 1; - }); - expect(b).to.be(2); - }); - - it('returns -1 when an item in an array is not found', function () { - const a = [0, 1, 2, 3]; - const b = findIndex(a, function (val, index, a2) { - return val > 100; - }); - expect(b).to.be(-1); - }); - }); - describe('isSorted', function () { it('works with just an array as argument', function () { expect(isSorted([1, 2, 3])).to.be(true);