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

modules/operations/circularize.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
-import { actionCircularize } from '../actions';
-import { behaviorOperation } from '../behavior';
+import { actionCircularize } from '../actions/circularize';
+import { behaviorOperation } from '../behavior/operation';
 import { utilGetAllNodes } from '../util';
 
 

modules/operations/continue.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
-import { modeDrawLine } from '../modes';
-import { behaviorOperation } from '../behavior';
+import { modeDrawLine } from '../modes/draw_line';
+import { behaviorOperation } from '../behavior/operation';
 import { utilArrayGroupBy } from '../util';
 
 

modules/operations/delete.js

@@ -1,9 +1,10 @@
 import { t } from '../util/locale';
-import { actionDeleteMultiple } from '../actions';
-import { behaviorOperation } from '../behavior';
+import { actionDeleteMultiple } from '../actions/delete_multiple';
+import { behaviorOperation } from '../behavior/operation';
 import { geoExtent, geoSphericalDistance } from '../geo';
-import { modeBrowse, modeSelect } from '../modes';
-import { uiCmd } from '../ui';
+import { modeBrowse } from '../modes/browse';
+import { modeSelect } from '../modes/select';
+import { uiCmd } from '../ui/cmd';
 import { utilGetAllNodes } from '../util';
 
 

modules/operations/disconnect.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
-import { actionDisconnect } from '../actions/index';
-import { behaviorOperation } from '../behavior/index';
+import { actionDisconnect } from '../actions/disconnect';
+import { behaviorOperation } from '../behavior/operation';
 import { utilGetAllNodes } from '../util/index';
 
 

modules/operations/downgrade.js

@@ -1,8 +1,8 @@
-import { actionChangeTags } from '../actions';
-import { behaviorOperation } from '../behavior';
-import { modeSelect } from '../modes';
+import { actionChangeTags } from '../actions/change_tags';
+import { behaviorOperation } from '../behavior/operation';
+import { modeSelect } from '../modes/select';
 import { t } from '../util/locale';
-import { uiCmd } from '../ui';
+import { uiCmd } from '../ui/cmd';
 
 
 export function operationDowngrade(selectedIDs, context) {

modules/operations/extract.js

@@ -1,6 +1,7 @@
-import { actionExtract, actionMoveNode } from '../actions';
-import { behaviorOperation } from '../behavior';
-import { modeMove } from '../modes';
+import { actionExtract } from '../actions/extract';
+import { actionMoveNode } from '../actions/move_node';
+import { behaviorOperation } from '../behavior/operation';
+import { modeMove } from '../modes/move';
 import { t } from '../util/locale';
 
 

modules/operations/merge.js

@@ -1,12 +1,13 @@
 import { t } from '../util/locale';
 
-import {
-    actionChangePreset, actionJoin, actionMerge,
-    actionMergeNodes, actionMergePolygon
-} from '../actions';
+import { actionChangePreset } from '../actions/change_preset';
+import { actionJoin } from '../actions/join';
+import { actionMerge } from '../actions/merge';
+import { actionMergeNodes } from '../actions/merge_nodes';
+import { actionMergePolygon } from '../actions/merge_polygon';
 
-import { behaviorOperation } from '../behavior';
-import { modeSelect } from '../modes';
+import { behaviorOperation } from '../behavior/operation';
+import { modeSelect } from '../modes/select';
 
 
 export function operationMerge(selectedIDs, context) {

modules/operations/move.js

@@ -1,7 +1,7 @@
 import { t } from '../util/locale';
-import { behaviorOperation } from '../behavior';
+import { behaviorOperation } from '../behavior/operation';
 import { geoExtent } from '../geo';
-import { modeMove } from '../modes';
+import { modeMove } from '../modes/move';
 import { utilGetAllNodes } from '../util';
 
 

modules/operations/orthogonalize.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
-import { actionOrthogonalize } from '../actions/index';
-import { behaviorOperation } from '../behavior/index';
+import { actionOrthogonalize } from '../actions/orthogonalize';
+import { behaviorOperation } from '../behavior/operation';
 import { utilGetAllNodes } from '../util';
 
 
@@ -16,7 +16,7 @@ export function operationOrthogonalize(selectedIDs, context) {
             context.validator().validate();
         };
     }
-    
+
     var nodes = utilGetAllNodes(selectedIDs, context.graph());
     var coords = nodes.map(function(n) { return n.loc; });
 

modules/operations/reflect.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
-import { actionReflect } from '../actions';
-import { behaviorOperation } from '../behavior';
+import { actionReflect } from '../actions/reflect';
+import { behaviorOperation } from '../behavior/operation';
 import { geoExtent } from '../geo';
 import { utilGetAllNodes } from '../util';
 

modules/operations/reverse.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
-import { actionReverse } from '../actions/index';
-import { behaviorOperation } from '../behavior/index';
+import { actionReverse } from '../actions/reverse';
+import { behaviorOperation } from '../behavior/operation';
 
 
 export function operationReverse(selectedIDs, context) {

modules/operations/rotate.js

@@ -1,7 +1,7 @@
 import { t } from '../util/locale';
-import { behaviorOperation } from '../behavior';
+import { behaviorOperation } from '../behavior/operation';
 import { geoExtent } from '../geo';
-import { modeRotate } from '../modes';
+import { modeRotate } from '../modes/rotate';
 import { utilGetAllNodes } from '../util';
 
 

modules/operations/split.js

@@ -1,7 +1,7 @@
 import { t } from '../util/locale';
-import { actionSplit } from '../actions/index';
-import { behaviorOperation } from '../behavior/index';
-import { modeSelect } from '../modes/index';
+import { actionSplit } from '../actions/split';
+import { behaviorOperation } from '../behavior/operation';
+import { modeSelect } from '../modes/select';
 
 
 export function operationSplit(selectedIDs, context) {

modules/operations/straighten.js

@@ -1,6 +1,7 @@
 import { t } from '../util/locale';
-import { actionStraightenNodes, actionStraightenWay } from '../actions/index';
-import { behaviorOperation } from '../behavior/index';
+import { actionStraightenNodes } from '../actions/straighten_nodes';
+import { actionStraightenWay } from '../actions/straighten_way';
+import { behaviorOperation } from '../behavior/operation';
 import { utilArrayDifference, utilGetAllNodes } from '../util/index';