Reduce circular dependencies caused by importing from indexes, the location of the validation models, and the location of areaKeys (close #6237)

This commit is contained in:
Quincy Morgan
2019-04-24 13:45:59 -07:00
parent 862eca9ddd
commit d01bb78707
158 changed files with 503 additions and 472 deletions

View File

@@ -1,7 +1,7 @@
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { behaviorDraw } from './draw';
import { modeBrowse } from '../modes';
import { modeBrowse } from '../modes/browse';
import { utilRebind } from '../util/rebind';

View File

@@ -1,6 +1,6 @@
import { event as d3_event } from 'd3-selection';
import { uiCmd } from '../ui';
import { uiCmd } from '../ui/cmd';
import { utilArrayGroupBy } from '../util';

View File

@@ -4,11 +4,14 @@ import {
} from 'd3-selection';
import { t } from '../util/locale';
import { actionAddMidpoint, actionMoveNode, actionNoop } from '../actions';
import { actionAddMidpoint } from '../actions/add_midpoint';
import { actionMoveNode } from '../actions/move_node';
import { actionNoop } from '../actions/noop';
import { behaviorDraw } from './draw';
import { geoChooseEdge, geoHasSelfIntersections } from '../geo';
import { modeBrowse, modeSelect } from '../modes';
import { osmNode } from '../osm';
import { modeBrowse } from '../modes/browse';
import { modeSelect } from '../modes/select';
import { osmNode } from '../osm/node';
import { utilKeybinding } from '../util';
export function behaviorDrawWay(context, wayID, index, mode, startGraph, baselineGraph) {

View File

@@ -3,7 +3,7 @@ import _throttle from 'lodash-es/throttle';
import { select as d3_select } from 'd3-selection';
import { geoSphericalDistance } from '../geo';
import { modeBrowse } from '../modes';
import { modeBrowse } from '../modes/browse';
import { utilObjectOmit, utilQsString, utilStringQs } from '../util';

View File

@@ -1,8 +1,8 @@
import { event as d3_event, select as d3_select } from 'd3-selection';
import { geoExtent, geoPointInPolygon } from '../geo';
import { modeSelect } from '../modes';
import { uiLasso } from '../ui';
import { modeSelect } from '../modes/select';
import { uiLasso } from '../ui/lasso';
export function behaviorLasso(context) {

View File

@@ -1,5 +1,5 @@
import { event as d3_event } from 'd3-selection';
import { uiFlash } from '../ui';
import { uiFlash } from '../ui/flash';
/* Creates a keybinding behavior for an operation */

View File

@@ -1,9 +1,10 @@
import { event as d3_event } from 'd3-selection';
import { actionCopyEntities, actionMove } from '../actions';
import { actionCopyEntities } from '../actions/copy_entities';
import { actionMove } from '../actions/move';
import { geoExtent, geoPointInPolygon, geoVecSubtract } from '../geo';
import { modeMove } from '../modes';
import { uiCmd } from '../ui';
import { modeMove } from '../modes/move';
import { uiCmd } from '../ui/cmd';
export function behaviorPaste(context) {

View File

@@ -6,13 +6,11 @@ import {
import { geoVecLength } from '../geo';
import {
modeBrowse,
modeSelect,
modeSelectData,
modeSelectNote,
modeSelectError
} from '../modes';
import { modeBrowse } from '../modes/browse';
import { modeSelect } from '../modes/select';
import { modeSelectData } from '../modes/select_data';
import { modeSelectNote } from '../modes/select_note';
import { modeSelectError } from '../modes/select_error';
import { osmEntity, osmNote, qaError } from '../osm';