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

modules/validations/almost_junction.js

@@ -4,10 +4,12 @@ import {
     geoSphericalClosestNode
 } from '../geo';
 
-import { actionAddMidpoint, actionChangeTags, actionMergeNodes } from '../actions';
+import { actionAddMidpoint } from '../actions/add_midpoint';
+import { actionChangeTags } from '../actions/change_tags';
+import { actionMergeNodes } from '../actions/merge_nodes';
 import { t } from '../util/locale';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 /**

modules/validations/crossing_ways.js

@@ -1,9 +1,11 @@
-import { actionAddMidpoint, actionChangeTags, actionMergeNodes } from '../actions';
+import { actionAddMidpoint } from '../actions/add_midpoint';
+import { actionChangeTags } from '../actions/change_tags';
+import { actionMergeNodes } from '../actions/merge_nodes';
 import { geoExtent, geoLineIntersection, geoSphericalClosestNode } from '../geo';
-import { osmNode } from '../osm';
+import { osmNode } from '../osm/node';
 import { t } from '../util/locale';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationCrossingWays() {

modules/validations/disconnected_way.js

@@ -1,8 +1,8 @@
 import { t } from '../util/locale';
-import { modeDrawLine } from '../modes';
+import { modeDrawLine } from '../modes/draw_line';
 import { operationDelete } from '../operations/index';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationDisconnectedWay() {

modules/validations/generic_name.js

@@ -2,8 +2,8 @@ import { filters } from 'name-suggestion-index';
 
 import { t } from '../util/locale';
 import { utilPreset } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
-import { actionChangeTags } from '../actions';
+import { validationIssue, validationIssueFix } from '../core/validation';
+import { actionChangeTags } from '../actions/change_tags';
 
 
 export function validationGenericName() {

modules/validations/incompatible_source.js

@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationIncompatibleSource() {

modules/validations/missing_role.js

@@ -1,7 +1,8 @@
-import { actionChangeMember, actionDeleteMember } from '../actions';
+import { actionChangeMember } from '../actions/change_member';
+import { actionDeleteMember } from '../actions/delete_member';
 import { t } from '../util/locale';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationMissingRole() {

modules/validations/missing_tag.js

@@ -2,7 +2,7 @@ import { operationDelete } from '../operations/index';
 import { osmIsInterestingTag } from '../osm/tags';
 import { t } from '../util/locale';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationMissingTag() {

modules/validations/old_multipolygon.js

@@ -1,8 +1,8 @@
 import { t } from '../util/locale';
-import { actionChangeTags } from '../actions';
-import { osmIsOldMultipolygonOuterMember, osmOldMultipolygonOuterMemberOfRelation } from '../osm';
+import { actionChangeTags } from '../actions/change_tags';
+import { osmIsOldMultipolygonOuterMember, osmOldMultipolygonOuterMemberOfRelation } from '../osm/multipolygon';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationOldMultipolygon() {

modules/validations/outdated_tags.js

@@ -1,7 +1,9 @@
 import { t } from '../util/locale';
-import { actionUpgradeTags, actionChangeTags, actionChangePreset } from '../actions';
+import { actionChangePreset } from '../actions/change_preset';
+import { actionChangeTags } from '../actions/change_tags';
+import { actionUpgradeTags } from '../actions/upgrade_tags';
 import { utilArrayUnion, utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationOutdatedTags() {

modules/validations/private_data.js

@@ -1,7 +1,7 @@
-import { actionChangeTags } from '../actions';
+import { actionChangeTags } from '../actions/change_tags';
 import { t } from '../util/locale';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationPrivateData() {

modules/validations/tag_suggests_area.js

@@ -1,8 +1,10 @@
-import { actionAddVertex, actionChangeTags, actionMergeNodes } from '../actions';
+import { actionAddVertex } from '../actions/add_vertex';
+import { actionChangeTags } from '../actions/change_tags';
+import { actionMergeNodes } from '../actions/merge_nodes';
 import { geoHasSelfIntersections, geoSphericalDistance } from '../geo';
 import { t } from '../util/locale';
 import { utilDisplayLabel, utilTagText } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationTagSuggestsArea() {

modules/validations/unknown_road.js

@@ -1,7 +1,7 @@
 import { t } from '../util/locale';
 import { operationDelete } from '../operations/index';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationUnknownRoad() {

modules/validations/unsquare_way.js

@@ -2,7 +2,7 @@ import { t } from '../util/locale';
 import { operationOrthogonalize } from '../operations';
 import { geoOrthoCanOrthogonalize } from '../geo';
 import { utilDisplayLabel } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validator';
+import { validationIssue, validationIssueFix } from '../core/validation';
 
 
 export function validationUnsquareWay() {