Remove rest of the lodash iterators: map, reduce, forEach

(re: #6087)
This commit is contained in:
Bryan Housel
2019-03-29 15:14:21 -04:00
parent 0d79e3e616
commit d5abe468b9
14 changed files with 107 additions and 175 deletions
-1
View File
@@ -19,7 +19,6 @@ import { utilDetect } from '../util/detect';
import { utilCallWhenIdle, utilKeybinding, utilRebind, utilStringQs } from '../util';
export var areaKeys = {};
export function setAreaKeys(value) {
+10 -14
View File
@@ -1,13 +1,12 @@
import _map from 'lodash-es/map';
import rbush from 'rbush';
import { coreDifference } from './difference';
export function coreTree(head) {
var rtree = rbush(),
bboxes = {},
tree = {};
var rtree = rbush();
var bboxes = {};
var tree = {};
function entityBBox(entity) {
@@ -44,9 +43,7 @@ export function coreTree(head) {
for (var i = 0; i < entities.length; i++) {
var entity = entities[i];
if (!entity.visible)
continue;
if (!entity.visible) continue;
if (head.entities.hasOwnProperty(entity.id) || bboxes[entity.id]) {
if (!force) {
@@ -60,7 +57,7 @@ export function coreTree(head) {
updateParents(entity, insertions, {});
}
rtree.load(_map(insertions, entityBBox));
rtree.load(Object.values(insertions).map(entityBBox));
return tree;
};
@@ -68,8 +65,8 @@ export function coreTree(head) {
tree.intersects = function(extent, graph) {
if (graph !== head) {
var diff = coreDifference(head, graph),
insertions = {};
var diff = coreDifference(head, graph);
var insertions = {};
head = graph;
@@ -88,12 +85,11 @@ export function coreTree(head) {
insertions[entity.id] = entity;
});
rtree.load(_map(insertions, entityBBox));
rtree.load(Object.values(insertions).map(entityBBox));
}
return rtree.search(extent.bbox()).map(function(bbox) {
return head.entity(bbox.id);
});
return rtree.search(extent.bbox())
.map(function(bbox) { return head.entity(bbox.id); });
};