ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove low and high from binarysearch, use numberSafeCompareFunction

Browse Source
This commit is contained in:
Nicholas L
2016-01-19 09:08:24 +13:00
parent ef0e95847f
commit e08a88b76c
1 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ol/array.js
View File

@@ -2,9 +2,6 @@ goog.provide('ol.array');
goog.require('goog.asserts');
function defaultCompare(a, b) {
return a > b ? 1 : a < b ? -1 : 0;
}
/**
* Performs a binary search on the provided sorted list and returns the index of the item if found. If it can't be found it'll return -1.
@@ -12,31 +9,14 @@ function defaultCompare(a, b) {
*
* @param {Array<*>} haystack Items to search through.
* @param {*} needle The item to look for.
* @param {Function=} opt_comparator Comparator function
* @param {number=} low Lower bounds.
* @param {number=} high Higher bounds.
* @param {Function=} opt_comparator Comparator function.
* @return {number} The index of the item if found, -1 if not.
*/
ol.array.binarySearch = function(haystack, needle, opt_comparator, low, high) {
ol.array.binarySearch = function(haystack, needle, opt_comparator) {
var mid, cmp;
var comparator = opt_comparator || defaultCompare;
if (low === undefined)
low = 0;
else {
low = low | 0;
if (low < 0 || low >= haystack.length)
throw new RangeError('invalid lower bound');
}
if (high === undefined)
high = haystack.length - 1;
else {
high = high | 0;
if (high < low || high >= haystack.length)
throw new RangeError('invalid upper bound');
}
var comparator = opt_comparator || ol.array.numberSafeCompareFunction;
var low = 0;
var high = haystack.length - 1;
while (low <= high) {
/* Note that "(low + high) >>> 1" may overflow, and results in a typecast
@@ -185,6 +165,7 @@ ol.array.reverseSubArray = function(arr, begin, end) {
}
};
/**
* @param {Array.<*>} arr Array.
* @return {!Array<?>} Flattened Array.