import lodash (#3257)

.eslintrc

@@ -52,7 +52,6 @@
 
     "globals": {
         "d3": false,
-        "_": false,
         "t": false,
         "bootstrap": false,
         "Diff3": false,

Makefile

@@ -61,7 +61,6 @@ dist/iD.js: \
 	js/lib/d3.trigger.js \
 	js/lib/d3.curtain.js \
 	js/lib/d3.value.js \
-	js/lib/lodash.js \
 	$(MODULE_TARGETS) \
 	js/lib/locale.js \
 	data/introGraph.js
@@ -120,8 +119,5 @@ d3:
 	node_modules/.bin/smash $(D3_FILES) > js/lib/d3.v3.js
 	@echo 'd3 rebuilt. Please reapply 7e2485d, 4da529f, 223974d and 71a3d3e'
 
-lodash:
-	node_modules/.bin/lodash --development --output js/lib/lodash.js include="includes,toPairs,assign,bind,chunk,clone,compact,debounce,difference,each,every,extend,filter,find,first,forEach,forOwn,groupBy,indexOf,intersection,isEmpty,isEqual,isFunction,keys,last,map,omit,reject,some,throttle,union,uniq,values,without,flatten,value,chain,cloneDeep,merge,pick,reduce" exports="global,node"
-
 clean:
 	rm -f $(BUILDJS_TARGETS) $(MODULE_TARGETS) data/feature-icons.json dist/iD*.js dist/iD.css dist/img/*.svg

build.js

@@ -2,7 +2,7 @@ var fs = require('fs'),
     path = require('path'),
     glob = require('glob'),
     YAML = require('js-yaml'),
-    _ = require('./js/lib/lodash'),
+    _ = require('lodash'),
     jsonschema = require('jsonschema'),
     fieldSchema = require('./data/presets/schema/field.json'),
     presetSchema = require('./data/presets/schema/preset.json'),

data/update_locales.js

@@ -3,7 +3,7 @@
 var request = require('request').defaults({maxSockets: 1}),
     yaml = require('js-yaml'),
     fs = require('fs'),
-    _ = require('../js/lib/lodash.js');
+    _ = require('lodash');
 
 var resources = ['core', 'presets'];
 var outdir = './dist/locales/';

index.html

@@ -12,7 +12,6 @@
         <meta name='apple-mobile-web-app-capable' content='yes' />
         <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent' />
 
-        <script src='js/lib/lodash.js'></script>
         <script src='js/lib/d3.v3.js'></script>
         <script src='js/lib/d3.combobox.js'></script>
         <script src='js/lib/d3.geo.tile.js'></script>

modules/.eslintrc

@@ -7,12 +7,7 @@
         "plugin:import/errors"
     ],
     rules: {
-        "no-invalid-this": 0,
-        "sort-imports": ["error", {
-            "ignoreCase": false,
-            "ignoreMemberSort": false,
-            "memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
-        }]
+        "no-invalid-this": 0
     },
     globals: {
         "iD": false,

modules/actions/add_midpoint.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { edgeEqual } from '../geo/index';
 export function AddMidpoint(midpoint, node) {
     return function(graph) {

modules/actions/circularize.js

@@ -1,5 +1,6 @@
 import { euclideanDistance, interp } from '../geo/index';
 import { Node } from '../core/index';
+import _ from 'lodash';
 
 export function Circularize(wayId
   , projection, maxAngle) {

modules/actions/connect.js

@@ -1,4 +1,5 @@
 import { DeleteNode } from './delete_node';
+import _ from 'lodash';
 
 // Connect the ways at the given nodes.
 //

modules/actions/delete_relation.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { DeleteMultiple } from './delete_multiple';
 
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/DeleteRelationAction.as

modules/actions/delete_way.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { DeleteRelation } from './delete_relation';
 
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/DeleteWayAction.as

modules/actions/deprecate_tags.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function DeprecateTags(entityId) {
     return function(graph) {
         var entity = graph.entity(entityId),

modules/actions/discard_tags.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function DiscardTags(difference) {
     return function(graph) {
         function discardTags(entity) {

modules/actions/join.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 // Join ways at the end node they share.
 //
 // This is the inverse of `iD.actions.Split`.

modules/actions/merge.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function Merge(ids) {
     function groupEntitiesByGeometry(graph) {
         var entities = ids.map(function(id) { return graph.entity(id); });

modules/actions/merge_polygon.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { joinWays, polygonContainsPolygon } from '../geo/index';
 import { Relation } from '../core/index';
 

modules/actions/merge_remote_changes.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { DeleteMultiple } from './delete_multiple';
 import { Entity } from '../core/index';
 import { diff3_merge } from '../util/diff3';

modules/actions/move.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 // https://github.com/openstreetmap/josm/blob/mirror/src/org/openstreetmap/josm/command/MoveCommand.java
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/MoveNodeAction.as
 import {

modules/actions/orthogonalize.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { DeleteNode } from './delete_node';
 import { euclideanDistance } from '../geo/index';
 /*

modules/actions/rotate_way.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function RotateWay(wayId, pivot, angle, projection) {
     return function(graph) {
         return graph.update(function(graph) {

modules/actions/split.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Relation, Way } from '../core/index';
 import { isSimpleMultipolygonOuterMember, sphericalDistance } from '../geo/index';
 import { AddMember } from './add_member';

modules/behavior/breathe.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function Breathe(){
     var duration = 800,
         selector = '.selected.shadow, .selected .shadow',

modules/behavior/copy.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { cmd } from '../ui/index';
 export function Copy(context) {
     var keybinding = d3.keybinding('copy');

modules/behavior/draw_way.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { AddEntity, AddMidpoint, AddVertex, MoveNode } from '../actions/index';
 import { Browse, Select } from '../modes/index';
 import { Node, Way } from '../core/index';

modules/behavior/hash.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { qsString, stringQs } from '../util/index';
 export function Hash(context) {
     var s0 = null, // cached location.hash

modules/behavior/lasso.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, pointInPolygon } from '../geo/index';
 import { Select } from '../modes/index';
 import { Lasso as uiLasso } from '../ui/index';

modules/behavior/paste.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { ChangeTags, CopyEntities, Move as MoveAction} from '../actions/index';
 import { Extent, pointInPolygon } from '../geo/index';
 import { Move as MoveMode } from '../modes/index';

modules/behavior/select.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Browse, Select as SelectMode } from '../modes/index';
 import { Entity } from '../core/index';
 export function Select(context) {

modules/core/connection.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Detect } from '../util/detect';
 import { Entity } from './entity';
 import { Extent } from '../geo/index';

modules/core/context.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Background } from '../renderer/background';
 import { Connection } from './connection';
 import { Detect } from '../util/detect';

modules/core/difference.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 /*
     iD.Difference represents the difference between two graphs.
     It knows how to calculate the set of entities that were

modules/core/entity.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { interestingTag } from './tags';
 
 export function Entity(attrs) {

modules/core/graph.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { getPrototypeOf } from '../util/index';
 
 export function Graph(other, mutable) {

modules/core/history.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import * as Validations from '../validations/index';
 import { Difference } from './difference';
 import { Entity } from './entity';

modules/core/node.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 // iD.Node = iD.Entity.node;
 import { Entity } from './entity';
 import { Extent } from '../geo/index';

modules/core/relation.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, joinWays, polygonContainsPolygon, polygonIntersectsPolygon } from '../geo/index';
 import { Entity } from './entity';
 

modules/core/tree.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Difference } from './difference';
 import rbush from 'rbush';
 

modules/core/way.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, cross } from '../geo/index';
 import { Entity } from './entity';
 import { oneWayTags } from './tags';

modules/geo/extent.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { metersToLat, metersToLon } from './index';
 export function Extent(min, max) {
     if (!(this instanceof Extent)) return new Extent(min, max);

modules/geo/index.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export { Extent } from './extent.js';
 export {
         Intersection,

modules/geo/intersection.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Way } from '../core/index';
 import { angle as getAngle } from './index';
 

modules/geo/multipolygon.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Reverse } from '../actions/reverse';
 
 // For fixing up rendering of multipolygons with tags on the outer member.

modules/modes/drag_node.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { AddMidpoint, Connect, MoveNode, Noop } from '../actions/index';
 import { Browse, Select } from './index';
 import { Edit, Hover, drag } from '../behavior/index';

modules/modes/rotate_way.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Browse, Select } from './index';
 import { Noop, RotateWay as RotateWayAction } from '../actions/index';
 import { Edit } from '../behavior/index';

modules/modes/save.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Commit, Conflicts, Loading, Success } from '../ui/index';
 import { DiscardTags, MergeRemoteChanges, Noop, Revert } from '../actions/index';
 import { displayName, displayType } from '../util/index';

modules/modes/select.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import * as Operations from '../operations/index';
 import { Breathe, Copy, Hover, Lasso, Paste, Select as SelectBehavior } from '../behavior/index';
 import { Extent, chooseEdge, pointInPolygon } from '../geo/index';

modules/operations/circularize.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Circularize as CircularizeAction } from '../actions/index';
 export function Circularize(selectedIDs, context) {
     var entityId = selectedIDs[0],

modules/operations/continue.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { DrawLine } from '../modes/index';
 export function Continue(selectedIDs, context) {
     var graph = context.graph(),

modules/operations/delete.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Browse, Select } from '../modes/index';
 import { DeleteMultiple } from '../actions/index';
 import { cmd } from '../ui/index';

modules/operations/disconnect.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Disconnect as DisconnectAction } from '../actions/index';
 export function Disconnect(selectedIDs, context) {
     var vertices = _.filter(selectedIDs, function vertex(entityId) {

modules/operations/move.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent } from '../geo/index';
 import { Move as MoveAction } from '../actions/index';
 import { Move as MoveMode } from '../modes/index';

modules/operations/orthogonalize.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Orthogonalize as OrthogonalizeAction } from '../actions/index';
 export function Orthogonalize(selectedIDs, context) {
     var entityId = selectedIDs[0],

modules/operations/split.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Select } from '../modes/index';
 import { Split as SplitAction } from '../actions/index';
 export function Split(selectedIDs, context) {

modules/operations/straighten.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Straighten as StraightenAction } from '../actions/index';
 export function Straighten(selectedIDs, context) {
     var entityId = selectedIDs[0],

modules/presets/category.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Collection } from './collection';
 export function Category(id, category, all) {
     category = _.clone(category);

modules/presets/collection.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { editDistance } from '../util/index';
 
 export function Collection(collection) {

modules/presets/field.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function Field(id, field) {
     field = _.clone(field);
 

modules/presets/preset.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function Preset(id, preset, fields) {
     preset = _.clone(preset);
 

modules/presets/presets.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Category } from './category';
 import { Collection } from './collection';
 import { Field } from './field';

modules/renderer/background.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, metersToOffset, offsetToMeters} from '../geo/index';
 import { qsString, stringQs } from '../util/index';
 import { BackgroundSource } from './background_source';

modules/renderer/background_source.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, polygonIntersectsPolygon } from '../geo/index';
 
 export function BackgroundSource(data) {

modules/renderer/features.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Entity } from '../core/index';
 export function Features(context) {
     var traffic_roads = {

modules/renderer/map.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Areas, Labels, Layers, Lines, Midpoints, Points, Vertices } from '../svg/index';
 import { Extent, interp } from '../geo/index';
 import { fastMouse, setTransform } from '../util/index';

modules/services/mapillary.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Detect } from '../util/detect';
 import { Extent } from '../geo/index';
 import { Icon } from '../svg/index';

modules/services/taginfo.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { qsString } from '../util/index';
 
 var taginfo = {},

modules/svg/areas.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Path, TagClasses } from './index';
 import { Entity } from '../core/index';
 import { isSimpleMultipolygonOuterMember } from '../geo/index';

modules/svg/gpx.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, polygonIntersectsPolygon } from '../geo/index';
 import { Detect } from '../util/detect';
 import toGeoJSON from 'togeojson';

modules/svg/labels.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { displayName, getStyle } from '../util/index';
 import { Entity } from '../core/index';
 import { pathLength } from '../geo/index';

modules/svg/layers.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Debug } from './debug';
 import { Gpx } from './gpx';
 import { MapillaryImages } from './mapillary_images';

modules/svg/lines.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { OneWaySegments, Path, RelationMemberTags, TagClasses } from './index';
 import { Detect } from '../util/detect';
 import { Entity } from '../core/index';

modules/svg/mapillary_images.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { PointTransform } from './point_transform';
 
 export function MapillaryImages(projection, context, dispatch) {

modules/svg/mapillary_signs.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { PointTransform } from './point_transform';
 
 export function MapillarySigns(projection, context, dispatch) {

modules/svg/midpoints.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { PointTransform, TagClasses } from './index';
 import { angle, euclideanDistance, interp, lineIntersection } from '../geo/index';
 

modules/svg/points.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { PointTransform, TagClasses } from './index';
 import { Entity } from '../core/index';
 

modules/svg/relation_member_tags.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function RelationMemberTags(graph) {
     return function(entity) {
         var tags = entity.tags;

modules/ui/attribution.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function Attribution(context) {
     var selection;
 

modules/ui/background.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { metersToOffset, offsetToMeters } from '../geo/index';
 import { BackgroundSource } from '../renderer/index';
 import { Detect } from '../util/detect';

modules/ui/commit.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { displayName, entityOrMemberSelector } from '../util/index';
 import { Icon } from '../svg/index';
 import { Select } from '../modes/index';

modules/ui/contributors.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Icon } from '../svg/index';
 export function Contributors(context) {
     var debouncedUpdate = _.debounce(function() { update(); }, 1000),

modules/ui/entity_editor.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Browse } from '../modes/index';
 import { ChangeTags } from '../actions/index';
 import { Icon } from '../svg/index';

modules/ui/feature_info.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { tooltipHtml } from './tooltipHtml';
 export function FeatureInfo(context) {
     function update(selection) {

modules/ui/fields/access.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export function access(field) {
     var dispatch = d3.dispatch('change'),
         items;

modules/ui/fields/address.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Extent, chooseEdge, sphericalDistance } from '../../geo/index';
 
 export function address(field, context) {

modules/ui/fields/combo.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export {
     combo as typeCombo,
     combo as multiCombo

modules/ui/fields/localized.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Detect } from '../../util/detect';
 import { Icon } from '../../svg/index';
 import { SuggestNames } from '../../util/index';

modules/ui/fields/maxspeed.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { pointInPolygon } from '../../geo/index';
 
 export function maxspeed(field, context) {

modules/ui/fields/wikipedia.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { ChangeTags } from '../../actions/index';
 import { Detect } from '../../util/detect';
 import { Icon } from '../../svg/index';

modules/ui/info.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Detect } from '../util/detect';
 import { Extent } from '../geo/index';
 import { cmd } from './cmd';

modules/ui/intro/line.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { icon, pad } from './helper';
 
 import { DeleteMultiple } from '../../actions/index';

modules/ui/intro/navigation.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { icon, pointBox } from './helper';
 
 export function navigation(context, reveal) {

modules/ui/map_data.js

@@ -1,5 +1,6 @@
 import { Icon } from '../svg/index';
 import { tooltipHtml } from './tooltipHtml';
+import _ from 'lodash';
 
 export function MapData(context) {
     var key = 'F',

modules/ui/modes.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { AddArea, AddLine, AddPoint, Browse } from '../modes/index';
 import { Icon } from '../svg/index';
 import { tooltipHtml } from './tooltipHtml';

modules/ui/notice.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Icon } from '../svg/index';
 export function Notice(context) {
     return function(selection) {

modules/ui/preset.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Browse } from '../modes/index';
 import { Disclosure } from './disclosure';
 import { Icon } from '../svg/index';

modules/ui/raw_membership_editor.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { AddEntity, AddMember, ChangeMember, DeleteMember } from '../actions/index';
 import { Entity, Relation } from '../core/index';
 import { Disclosure } from './disclosure';

modules/ui/sidebar.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { FeatureList } from './feature_list';
 import { Inspector } from './inspector';
 import { Notice } from './notice';

modules/ui/tag_reference.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Detect } from '../util/detect';
 import { Icon } from '../svg/index';
 

modules/ui/zoom.js

@@ -1,6 +1,7 @@
 import { Icon } from '../svg/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';
+import _ from 'lodash';
 
 export function Zoom(context) {
     var zooms = [{

modules/util/util.js

@@ -1,5 +1,6 @@
 import { Detect } from './detect';
 import { remove as removeDiacritics } from 'diacritics';
+import _ from 'lodash';
 
 export function tagText(entity) {
     return d3.entries(entity.tags).map(function(e) {