CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-12 16:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove lodash some

Browse Source 
(re: #6087)
This commit is contained in:
Bryan Housel
2019-03-23 00:07:52 -04:00
parent 0e90167513
commit 7e6f68a1b2
23 changed files with 45 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/actions/merge_polygon.js
View File

@@ -2,14 +2,9 @@ import _extend from 'lodash-es/extend';
import _groupBy from 'lodash-es/groupBy';
import _map from 'lodash-es/map';
import _omit from 'lodash-es/omit';
import _some from 'lodash-es/some';
import { geoPolygonContainsPolygon } from '../geo';
import {
osmJoinWays,
osmRelation
} from '../osm';
import { osmJoinWays, osmRelation } from '../osm';
export function actionMergePolygon(ids, newRelationId) {
@@ -55,13 +50,14 @@ export function actionMergePolygon(ids, newRelationId) {
if (i === n) return null;
return geoPolygonContainsPolygon(
_map(d.nodes, 'loc'),
_map(w.nodes, 'loc'));
_map(w.nodes, 'loc')
);
});
});
// Sort all polygons as either outer or inner ways
var members = [],
outer = true;
var members = [];
var outer = true;
while (polygons.length) {
extractUncontained(polygons);
@@ -70,7 +66,7 @@ export function actionMergePolygon(ids, newRelationId) {
}
function isContained(d, i) {
return _some(contained[i]);
return contained[i].some(function(val) { return val; });
}
function filterContained(d) {

3
modules/actions/merge_remote_changes.js
View File

@@ -1,6 +1,5 @@
import _isEqual from 'lodash-es/isEqual';
import _isFunction from 'lodash-es/isFunction';
import _keys from 'lodash-es/keys';
import _map from 'lodash-es/map';
import _reject from 'lodash-es/reject';
import _union from 'lodash-es/union';
@@ -174,7 +173,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, formatUser
var o = base.tags || {};
var a = target.tags || {};
var b = remote.tags || {};
var keys = _reject(_union(_keys(o), _keys(a), _keys(b)), ignoreKey);
var keys = _reject(_union(Object.keys(o), Object.keys(a), Object.keys(b)), ignoreKey);
var tags = Object.assign({}, a); // shallow copy
var changed = false;

13
modules/actions/split.js
View File

@@ -1,17 +1,10 @@
import _extend from 'lodash-es/extend';
import _indexOf from 'lodash-es/indexOf';
import _intersection from 'lodash-es/intersection';
import _some from 'lodash-es/some';
import { actionAddMember } from './add_member';
import { geoSphericalDistance } from '../geo';
import {
osmIsOldMultipolygonOuterMember,
osmRelation,
osmWay
} from '../osm';
import { osmIsOldMultipolygonOuterMember, osmRelation, osmWay } from '../osm';
import { utilWrap } from '../util';
@@ -225,7 +218,9 @@ export function actionSplit(nodeId, newWayIds) {
action.ways = function(graph) {
var node = graph.entity(nodeId);
var parents = graph.parentWays(node);
var hasLines = _some(parents, function(parent) { return parent.geometry(graph) === 'line'; });
var hasLines = parents.some(function(parent) {
return parent.geometry(graph) === 'line';
});
return parents.filter(function(parent) {
if (_wayIDs && _wayIDs.indexOf(parent.id) === -1)

3
modules/geo/geom.js
View File

@@ -1,5 +1,4 @@
import _every from 'lodash-es/every';
import _some from 'lodash-es/some';
import {
geoVecAngle,
@@ -266,7 +265,7 @@ export function geoPolygonContainsPolygon(outer, inner) {
export function geoPolygonIntersectsPolygon(outer, inner, checkSegments) {
function testPoints(outer, inner) {
return _some(inner, function(point) {
return inner.some(function(point) {
return geoPointInPolygon(point, outer);
});
}

8
modules/operations/delete.js
View File

@@ -1,5 +1,3 @@
import _some from 'lodash-es/some';
import { t } from '../util/locale';
import { actionDeleteMultiple } from '../actions';
import { behaviorOperation } from '../behavior';
@@ -72,11 +70,11 @@ export function operationDelete(selectedIDs, context) {
var reason;
if (extent.area() && extent.percentContainedIn(context.extent()) < 0.8) {
reason = 'too_large';
} else if (_some(selectedIDs, context.hasHiddenConnections)) {
} else if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
} else if (_some(selectedIDs, protectedMember)) {
} else if (selectedIDs.some(protectedMember)) {
reason = 'part_of_relation';
} else if (_some(selectedIDs, incompleteRelation)) {
} else if (selectedIDs.some(incompleteRelation)) {
reason = 'incomplete_relation';
}
return reason;

4
modules/operations/detach_node.js
View File

@@ -1,5 +1,3 @@
import _some from 'lodash-es/some';
import { actionDetachNode, actionMoveNode } from '../actions';
import { behaviorOperation } from '../behavior';
import { modeMove } from '../modes';
@@ -51,7 +49,7 @@ export function operationDetachNode(selectedIDs, context) {
operation.disabled = function () {
var reason;
if (_some(selectedIDs, context.hasHiddenConnections)) {
if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
}
return action.disabled(context.graph()) || reason;

3
modules/operations/disconnect.js
View File

@@ -1,5 +1,4 @@
import _filter from 'lodash-es/filter';
import _some from 'lodash-es/some';
import _without from 'lodash-es/without';
import { t } from '../util/locale';
@@ -32,7 +31,7 @@ export function operationDisconnect(selectedIDs, context) {
operation.disabled = function() {
var reason;
if (_some(selectedIDs, context.hasHiddenConnections)) {
if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
}
return action.disabled(context.graph()) || reason;

6
modules/operations/move.js
View File

@@ -1,5 +1,3 @@
import _some from 'lodash-es/some';
import { t } from '../util/locale';
import { behaviorOperation } from '../behavior';
import { geoExtent } from '../geo';
@@ -28,9 +26,9 @@ export function operationMove(selectedIDs, context) {
var reason;
if (extent.area() && extent.percentContainedIn(context.extent()) < 0.8) {
reason = 'too_large';
} else if (_some(selectedIDs, context.hasHiddenConnections)) {
} else if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
} else if (_some(selectedIDs, incompleteRelation)) {
} else if (selectedIDs.some(incompleteRelation)) {
reason = 'incomplete_relation';
}
return reason;

5
modules/operations/reflect.js
View File

@@ -1,4 +1,3 @@
import _some from 'lodash-es/some';
import _uniqBy from 'lodash-es/uniqBy';
import { t } from '../util/locale';
@@ -43,9 +42,9 @@ export function operationReflect(selectedIDs, context, axis) {
var reason;
if (extent.area() && extent.percentContainedIn(context.extent()) < 0.8) {
reason = 'too_large';
} else if (_some(selectedIDs, context.hasHiddenConnections)) {
} else if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
} else if (_some(selectedIDs, incompleteRelation)) {
} else if (selectedIDs.some(incompleteRelation)) {
reason = 'incomplete_relation';
}
return reason;

5
modules/operations/rotate.js
View File

@@ -1,4 +1,3 @@
import _some from 'lodash-es/some';
import _uniqBy from 'lodash-es/uniqBy';
import { t } from '../util/locale';
@@ -30,9 +29,9 @@ export function operationRotate(selectedIDs, context) {
var reason;
if (extent.area() && extent.percentContainedIn(context.extent()) < 0.8) {
reason = 'too_large';
} else if (_some(selectedIDs, context.hasHiddenConnections)) {
} else if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
} else if (_some(selectedIDs, incompleteRelation)) {
} else if (selectedIDs.some(incompleteRelation)) {
reason = 'incomplete_relation';
}
return reason;

3
modules/operations/split.js
View File

@@ -1,5 +1,4 @@
import _filter from 'lodash-es/filter';
import _some from 'lodash-es/some';
import _without from 'lodash-es/without';
import { t } from '../util/locale';
@@ -38,7 +37,7 @@ export function operationSplit(selectedIDs, context) {
operation.disabled = function() {
var reason;
if (_some(selectedIDs, context.hasHiddenConnections)) {
if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
}
return action.disabled(context.graph()) || reason;

3
modules/osm/entity.js
View File

@@ -1,4 +1,3 @@
import _keys from 'lodash-es/keys';
import _every from 'lodash-es/every';
import _union from 'lodash-es/union';
import _without from 'lodash-es/without';
@@ -152,7 +151,7 @@ osmEntity.prototype = {
},
hasInterestingTags: function() {
return _keys(this.tags).some(osmIsInterestingTag);
return Object.keys(this.tags).some(osmIsInterestingTag);
},

7
modules/osm/node.js
View File

@@ -1,6 +1,5 @@
import _extend from 'lodash-es/extend';
import _map from 'lodash-es/map';
import _some from 'lodash-es/some';
import _uniq from 'lodash-es/uniq';
import { osmEntity } from './entity';
@@ -167,12 +166,12 @@ _extend(osmNode.prototype, {
}
// vertex is connected to multiple parent lines
if (parents.length > 1 && _some(parents, isLine)) {
if (parents.length > 1 && parents.some(isLine)) {
return true;
} else if (parents.length === 1) {
var way = parents[0],
nodes = way.nodes.slice();
var way = parents[0];
var nodes = way.nodes.slice();
if (way.isClosed()) { nodes.pop(); } // ignore connecting node if closed
// return true if vertex appears multiple times (way is self intersecting)

7
modules/presets/collection.js
View File

@@ -1,4 +1,3 @@
import _some from 'lodash-es/some';
import _uniq from 'lodash-es/uniq';
import _without from 'lodash-es/without';
@@ -99,13 +98,13 @@ export function presetCollection(collection) {
// matches value to preset.terms values
var leading_terms = searchable
.filter(function(a) {
return _some(a.terms() || [], leading);
return (a.terms() || []).some(leading);
});
// matches value to preset.tags values
var leading_tag_values = searchable
.filter(function(a) {
return _some(_without(Object.values(a.tags || {}), '*'), leading);
return _without(Object.values(a.tags || {}), '*').some(leading);
});
var leading_suggestions = suggestions
@@ -128,7 +127,7 @@ export function presetCollection(collection) {
// finds close matches to value in preset.terms
var similar_terms = searchable
.filter(function(a) {
return _some(a.terms() || [], function(b) {
return (a.terms() || []).some(function(b) {
return utilEditDistance(value, b) + Math.min(value.length - b.length, 0) < 3;
});
});

4
modules/renderer/background_source.js
View File

@@ -1,5 +1,3 @@
import _some from 'lodash-es/some';
import {
geoArea as d3_geoArea,
geoMercatorRaw as d3_geoMercatorRaw
@@ -246,7 +244,7 @@ rendererBackgroundSource.Bing = function(data, dispatch) {
bing.copyrightNotices = function(zoom, extent) {
zoom = Math.min(zoom, 21);
return providers.filter(function(provider) {
return _some(provider.areas, function(area) {
return provider.areas.some(function(area) {
return extent.intersects(area.extent) &&
area.zoom[0] <= zoom &&
area.zoom[1] >= zoom;

5
modules/renderer/features.js
View File

@@ -1,6 +1,5 @@
import _groupBy from 'lodash-es/groupBy';
import _reduce from 'lodash-es/reduce';
import _some from 'lodash-es/some';
import _union from 'lodash-es/union';
import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -476,9 +475,9 @@ export function rendererFeatures(context) {
return resolver.isShared(e) ? _union(result, resolver.parentWays(e)) : result;
}, connections);
return connections.length ? _some(connections, function(e) {
return connections.some(function(e) {
return features.isHidden(e, resolver, e.geometry(resolver));
}) : false;
});
};

3
modules/services/mapillary.js
View File

@@ -1,6 +1,5 @@
/* global Mapillary:false */
import _forEach from 'lodash-es/forEach';
import _some from 'lodash-es/some';
import _union from 'lodash-es/union';
import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -535,7 +534,7 @@ export default {
// if signs signs are shown, highlight the ones that appear in this image
d3_selectAll('.layer-mapillary-signs .icon-sign')
.classed('currentView', function(d) {
return _some(d.detections, function(detection) {
return d.detections.some(function(detection) {
return detection.image_key === imageKey;
});
});

5
modules/svg/labels.js
View File

@@ -1,5 +1,4 @@
import _map from 'lodash-es/map';
import _some from 'lodash-es/some';
import _throttle from 'lodash-es/throttle';
import { geoPath as d3_geoPath } from 'd3-geo';
@@ -76,7 +75,7 @@ export function svgLabels(projection, context) {
function blacklisted(preset) {
var noIcons = ['building', 'landuse', 'natural'];
return _some(noIcons, function(s) {
return noIcons.some(function(s) {
return preset.id.indexOf(s) >= 0;
});
}
@@ -400,7 +399,7 @@ export function svgLabels(projection, context) {
entity.isEndpoint(graph) ||
entity.isConnected(graph) ||
selectedIDs.indexOf(entity.id) !== -1 ||
_some(graph.parentWays(entity), function(parent) {
graph.parentWays(entity).some(function(parent) {
return selectedIDs.indexOf(parent.id) !== -1;
});
}

3
modules/svg/mapillary_signs.js
View File

@@ -1,4 +1,3 @@
import _some from 'lodash-es/some';
import _throttle from 'lodash-es/throttle';
import { select as d3_select } from 'd3-selection';
import { svgPointTransform } from './index';
@@ -105,7 +104,7 @@ export function svgMapillarySigns(projection, context, dispatch) {
.attr('y', '-12px')
.attr('xlink:href', function(d) { return '#' + d.value; })
.classed('currentView', function(d) {
return _some(d.detections, function(detection) {
return d.detections.some(function(detection) {
return detection.image_key === selectedImageKey;
});
})

5
modules/ui/field.js
View File

@@ -1,5 +1,4 @@
import _extend from 'lodash-es/extend';
import _some from 'lodash-es/some';
import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -60,14 +59,14 @@ export function uiField(context, presetField, entity, options) {
function isModified() {
if (!entity) return false;
var original = context.graph().base().entities[entity.id];
return _some(field.keys, function(key) {
return field.keys.some(function(key) {
return original ? _tags[key] !== original.tags[key] : _tags[key];
});
}
function isPresent() {
return _some(field.keys, function(key) {
return field.keys.some(function(key) {
if (field.type === 'multiCombo') {
for (var tagKey in _tags) {
if (tagKey.indexOf(key) === 0) {

3
modules/ui/fields/combo.js
View File

@@ -2,7 +2,6 @@ import _filter from 'lodash-es/filter';
import _map from 'lodash-es/map';
import _reject from 'lodash-es/reject';
import _remove from 'lodash-es/remove';
import _some from 'lodash-es/some';
import _uniq from 'lodash-es/uniq';
import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -114,7 +113,7 @@ export function uiFieldCombo(field, context) {
function objectDifference(a, b) {
return _reject(a, function(d1) {
return _some(b, function(d2) { return d1.value === d2.value; });
return b.some(function(d2) { return d1.value === d2.value; });
});
}

6
modules/ui/fields/maxspeed.js
View File

@@ -1,5 +1,3 @@
import _some from 'lodash-es/some';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
@@ -59,8 +57,8 @@ export function uiFieldMaxspeed(field, context) {
loc = childNodes[~~(childNodes.length/2)].loc;
}
_isImperial = _some(dataImperial.features, function(f) {
return _some(f.geometry.coordinates, function(d) {
_isImperial = dataImperial.features.some(function(f) {
return f.geometry.coordinates.some(function(d) {
return geoPointInPolygon(loc, d);
});
});

6
modules/ui/intro/line.js
View File

@@ -1,5 +1,3 @@
import _some from 'lodash-es/some';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import {
@@ -191,8 +189,8 @@ export function uiIntroLine(context, reveal) {
if (!entity) return false;
var drawNodes = context.graph().childNodes(entity);
return _some(drawNodes, function(node) {
return _some(context.graph().parentWays(node), function(parent) {
return drawNodes.some(function(node) {
return context.graph().parentWays(node).some(function(parent) {
return parent.id === flowerRoadID;
});
});