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

Type fixes and simplifications

Browse Source
This commit is contained in:
Andreas Hocevar
2016-01-20 10:14:09 +01:00
committed by Nicholas L
parent d81af7594c
commit 2fb33ba940
2 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ol/array.js
View File

@@ -7,7 +7,7 @@ goog.require('goog.asserts');
* 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. * 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.
* https://github.com/darkskyapp/binary-search * https://github.com/darkskyapp/binary-search
* *
* @param {Array<*>} haystack Items to search through. * @param {Array.<*>} haystack Items to search through.
* @param {*} needle The item to look for. * @param {*} needle The item to look for.
* @param {Function=} opt_comparator Comparator function. * @param {Function=} opt_comparator Comparator function.
* @return {number} The index of the item if found, -1 if not. * @return {number} The index of the item if found, -1 if not.
@@ -168,7 +168,7 @@ ol.array.reverseSubArray = function(arr, begin, end) {
/** /**
* @param {Array.<*>} arr Array. * @param {Array.<*>} arr Array.
* @return {!Array<?>} Flattened Array. * @return {!Array.<?>} Flattened Array.
*/ */
ol.array.flatten = function(arr) { ol.array.flatten = function(arr) {
var data = arr.reduce(function(flattened, value) { var data = arr.reduce(function(flattened, value) {
@@ -183,8 +183,8 @@ ol.array.flatten = function(arr) {
/** /**
* @param {Array<VALUE>} arr The array to modify. * @param {Array.<VALUE>} arr The array to modify.
* @param {Array<VALUE>|VALUE} data The elements or arrays of elements * @param {Array.<VALUE>|VALUE} data The elements or arrays of elements
* to add to arr. * to add to arr.
* @template VALUE * @template VALUE
*/ */
@@ -199,7 +199,7 @@ ol.array.extend = function(arr, data) {
/** /**
* @param {Array<VALUE>} arr The array to modify. * @param {Array.<VALUE>} arr The array to modify.
* @param {VALUE} obj The element to remove. * @param {VALUE} obj The element to remove.
* @template VALUE * @template VALUE
* @return {boolean} If the element was removed. * @return {boolean} If the element was removed.
@@ -215,7 +215,7 @@ ol.array.remove = function(arr, obj) {
/** /**
* @param {Array<VALUE>} arr The array to search in. * @param {Array.<VALUE>} arr The array to search in.
* @param {function(VALUE, number, ?) : boolean} func The function to compare. * @param {function(VALUE, number, ?) : boolean} func The function to compare.
* @template VALUE * @template VALUE
* @return {VALUE} The element found. * @return {VALUE} The element found.
@@ -235,20 +235,13 @@ ol.array.find = function(arr, func) {
/** /**
* @param {Array|NodeList|Arguments|{length: number}} arr1 The first array to compare. * @param {Array|Uint8ClampedArray} arr1 The first array to compare.
* @param {Array|NodeList|Arguments|{length: number}} arr2 The second array to compare. * @param {Array|Uint8ClampedArray} arr2 The second array to compare.
* @return {boolean} Whether the two arrays are equal. * @return {boolean} Whether the two arrays are equal.
*/ */
ol.array.equals = function(arr1, arr2) { ol.array.equals = function(arr1, arr2) {
if (!goog.isArrayLike(arr1) || !goog.isArrayLike(arr2) || arr1.length !== arr2.length) { for (var i = 0, ii = arr1.length; i < ii; i++) {
return false; if (arr1[i] !== arr2[i]) {
}
var length = arr1.length;
var equalsFn = function(a, b) {
return a === b;
};
for (var i = 0; i < length; i++) {
if (!equalsFn(arr1[i], arr2[i])) {
return false; return false;
} }
} }
@@ -257,7 +250,7 @@ ol.array.equals = function(arr1, arr2) {
/** /**
* @param {Array<*>} arr The array to sort (modifies original). * @param {Array.<*>} arr The array to sort (modifies original).
* @param {Function} compareFnc Comparison function. * @param {Function} compareFnc Comparison function.
*/ */
ol.array.stableSort = function(arr, compareFnc) { ol.array.stableSort = function(arr, compareFnc) {
@@ -267,9 +260,8 @@ ol.array.stableSort = function(arr, compareFnc) {
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
tmp[i] = {index: i, value: arr[i]}; tmp[i] = {index: i, value: arr[i]};
} }
var compare = compareFnc || ol.array.numberSafeCompareFunction;
tmp.sort(function(a, b) { tmp.sort(function(a, b) {
return compare(a.value, b.value) || a.index - b.index; return compareFnc(a.value, b.value) || a.index - b.index;
}); });
for (i = 0; i < arr.length; i++) { for (i = 0; i < arr.length; i++) {
arr[i] = tmp[i].value; arr[i] = tmp[i].value;
@@ -278,7 +270,7 @@ ol.array.stableSort = function(arr, compareFnc) {
/** /**
* @param {Array<*>} arr The array to search in. * @param {Array.<*>} arr The array to search in.
* @param {Function} func Comparison function. * @param {Function} func Comparison function.
* @return {number} Return index. * @return {number} Return index.
*/ */
@@ -293,7 +285,7 @@ ol.array.findIndex = function(arr, func) {
/** /**
* @param {Array<*>} arr The array to test. * @param {Array.<*>} arr The array to test.
* @param {Function=} opt_func Comparison function. * @param {Function=} opt_func Comparison function.
* @param {boolean=} opt_strict Strictly sorted (default false). * @param {boolean=} opt_strict Strictly sorted (default false).
* @return {boolean} Return index. * @return {boolean} Return index.
@@ -305,6 +297,6 @@ ol.array.isSorted = function(arr, opt_func, opt_strict) {
return true; return true;
} }
var res = compare(arr[index - 1], currentVal); var res = compare(arr[index - 1], currentVal);
return !(res > 0 || opt_strict && res === 0); return !(res > 0 || opt_strict && res === 0);
}); });
} }

4
src/ol/interaction/modifyinteraction.js
View File

@@ -999,9 +999,7 @@ ol.interaction.Modify.prototype.updateSegmentIndices_ = function(
this.rBush_.forEachInExtent(geometry.getExtent(), function(segmentDataMatch) { this.rBush_.forEachInExtent(geometry.getExtent(), function(segmentDataMatch) {
if (segmentDataMatch.geometry === geometry && if (segmentDataMatch.geometry === geometry &&
(depth === undefined || segmentDataMatch.depth === undefined || (depth === undefined || segmentDataMatch.depth === undefined ||
ol.array.equals( ol.array.equals(segmentDataMatch.depth, depth)) &&
/** @type {null|{length: number}} */ (segmentDataMatch.depth),
depth)) &&
segmentDataMatch.index > index) { segmentDataMatch.index > index) {
segmentDataMatch.index += delta; segmentDataMatch.index += delta;
} }