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

modules/actions/add_member.js

@@ -1,4 +1,5 @@
-import { osmJoinWays, osmWay } from '../osm';
+import { osmJoinWays } from '../osm/multipolygon';
+import { osmWay } from '../osm/way';
 import { utilArrayGroupBy, utilObjectOmit } from '../util';
 
 

modules/actions/circularize.js

@@ -7,7 +7,7 @@ import {
 } from 'd3-polygon';
 
 import { geoVecInterp, geoVecLength } from '../geo';
-import { osmNode } from '../osm';
+import { osmNode } from '../osm/node';
 import { utilArrayUniq } from '../util';
 
 

modules/actions/extract.js

@@ -1,6 +1,6 @@
 
 import { geoPath as d3_geoPath } from 'd3-geo';
-import { osmNode } from '../osm';
+import { osmNode } from '../osm/node';
 
 export function actionExtract(entityID, projection) {
 
@@ -73,7 +73,7 @@ export function actionExtract(entityID, projection) {
             // remove the tag from the area
             delete areaTags[key];
         }
-        
+
         if (!isBuilding) {
             // ensure that the area keeps the area geometry
             areaTags.area = 'yes';

modules/actions/join.js

@@ -1,5 +1,6 @@
 import { actionDeleteWay } from './delete_way';
-import { osmIsInterestingTag, osmJoinWays } from '../osm';
+import { osmIsInterestingTag } from '../osm/tags';
+import { osmJoinWays } from '../osm/multipolygon';
 import { geoPathIntersections } from '../geo';
 import { utilArrayGroupBy, utilArrayIntersection } from '../util';
 

modules/actions/move.js

@@ -3,7 +3,7 @@ import {
   geoVecAdd, geoVecEqual, geoVecInterp, geoVecSubtract
 } from '../geo';
 
-import { osmNode } from '../osm';
+import { osmNode } from '../osm/node';
 import { utilArrayIntersection } from '../util';
 
 

modules/actions/restrict_turn.js

@@ -1,4 +1,4 @@
-import { osmRelation } from '../osm';
+import { osmRelation } from '../osm/relation';
 
 
 // `actionRestrictTurn` creates a turn restriction relation.

modules/actions/split.js

@@ -1,6 +1,8 @@
 import { actionAddMember } from './add_member';
 import { geoSphericalDistance } from '../geo';
-import { osmIsOldMultipolygonOuterMember, osmRelation, osmWay } from '../osm';
+import { osmIsOldMultipolygonOuterMember } from '../osm/multipolygon';
+import { osmRelation } from '../osm/relation';
+import { osmWay } from '../osm/way';
 import { utilArrayIntersection, utilWrap } from '../util';