Reduce circular dependencies caused by importing from indexes, the lo…

…cation 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';
 
 

modules/behavior/add_way.js

@@ -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';
 
 

modules/behavior/copy.js

@@ -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';
 
 

modules/behavior/draw_way.js

@@ -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) {

modules/behavior/hash.js

@@ -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';
 
 

modules/behavior/lasso.js

@@ -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) {

modules/behavior/operation.js

@@ -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 */

modules/behavior/paste.js

@@ -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) {

modules/behavior/select.js

@@ -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';
 

modules/core/area_keys.js

@@ -0,0 +1,5 @@
+export var areaKeys = {};
+
+export function setAreaKeys(value) {
+    areaKeys = value;
+}

modules/core/context.js

@@ -6,6 +6,8 @@ import { select as d3_select } from 'd3-selection';
 
 import { t, currentLocale, addTranslation, setLocale } from '../util/locale';
 
+import { setAreaKeys } from './area_keys';
+
 import { coreHistory } from './history';
 import { coreValidator } from './validator';
 import { dataLocales, dataEn } from '../../data';
@@ -19,13 +21,6 @@ import { utilDetect } from '../util/detect';
 import { utilCallWhenIdle, utilKeybinding, utilRebind, utilStringQs } from '../util';
 
 
-export var areaKeys = {};
-
-export function setAreaKeys(value) {
-    areaKeys = value;
-}
-
-
 export function coreContext() {
     var dispatch = d3_dispatch('enter', 'exit', 'change');
     var context = utilRebind({}, dispatch, 'on');
@@ -554,11 +549,11 @@ export function coreContext() {
         var external = utilStringQs(window.location.hash).presets;
         presets.fromExternal(external, function(externalPresets) {
             context.presets = function() { return externalPresets; }; // default + external presets...
-            areaKeys = presets.areaKeys();
+            setAreaKeys(presets.areaKeys());
         });
     } else {
         presets.init();
-        areaKeys = presets.areaKeys();
+        setAreaKeys(presets.areaKeys());
     }
 
     return context;

modules/core/history.js

@@ -6,7 +6,7 @@ import { coreDifference } from './difference';
 import { coreGraph } from './graph';
 import { coreTree } from './tree';
 import { osmEntity } from '../osm/entity';
-import { uiLoading } from '../ui';
+import { uiLoading } from '../ui/loading';
 import {
     utilArrayDifference, utilArrayGroupBy, utilArrayUnion,
     utilObjectOmit, utilRebind, utilSessionMutex

modules/core/validation/index.js

@@ -0,0 +1 @@
+export { validationIssue, validationIssueFix } from './models';

modules/core/validation/models.js

@@ -0,0 +1,79 @@
+import { geoExtent } from '../../geo';
+import { osmEntity } from '../../osm/entity';
+
+export function validationIssue(attrs) {
+    this.type = attrs.type;                // required - name of rule that created the issue (e.g. 'missing_tag')
+    this.severity = attrs.severity;        // required - 'warning' or 'error'
+    this.message = attrs.message;          // required - localized string
+    this.reference = attrs.reference;      // optional - function(selection) to render reference information
+    this.entities = attrs.entities;        // optional - array of entities involved in the issue
+    this.loc = attrs.loc;                  // optional - [lon, lat] to zoom in on to see the issue
+    this.data = attrs.data;                // optional - object containing extra data for the fixes
+    this.fixes = attrs.fixes;              // optional - array of validationIssueFix objects
+    this.hash = attrs.hash;                // optional - string to further differentiate the issue
+
+    this.id = generateID.apply(this);      // generated - see below
+    this.autoFix = null;                   // generated - if autofix exists, will be set below
+
+    // A unique, deterministic string hash.
+    // Issues with identical id values are considered identical.
+    function generateID() {
+        var parts = [this.type];
+
+        if (this.hash) {   // subclasses can pass in their own differentiator
+            parts.push(this.hash);
+        }
+
+        // include entities this issue is for
+        // (sort them so the id is deterministic)
+        if (this.entities) {
+            var entityKeys = this.entities.map(osmEntity.key).sort();
+            parts.push.apply(parts, entityKeys);
+        }
+
+        // include loc since two separate issues can have an
+        // idential type and entities, e.g. in crossing_ways
+        if (this.loc) {
+            parts.push.apply(parts, this.loc);
+        }
+
+        return parts.join(':');
+    }
+
+    var _extent;
+    this.extent = function(resolver) {
+        if (_extent) return _extent;
+
+        if (this.loc) {
+            return _extent = geoExtent(this.loc);
+        }
+        if (this.entities && this.entities.length) {
+            return _extent = this.entities.reduce(function(extent, entity) {
+                return extent.extend(entity.extent(resolver));
+            }, geoExtent());
+        }
+        return null;
+    };
+
+
+    if (this.fixes) {   // add a reference in the fixes to the issue for use in fix actions
+        for (var i = 0; i < this.fixes.length; i++) {
+            var fix = this.fixes[i];
+            fix.issue = this;
+            if (fix.autoArgs) {
+                this.autoFix = fix;
+            }
+        }
+    }
+}
+
+
+export function validationIssueFix(attrs) {
+    this.title = attrs.title;                 // Required
+    this.onClick = attrs.onClick;             // Required
+    this.icon = attrs.icon;                   // Optional - shows 'iD-icon-wrench' if not set
+    this.entityIds = attrs.entityIds || [];   // Optional - Used for hover-higlighting.
+    this.autoArgs = attrs.autoArgs;           // Optional - pass [actions, annotation] arglist if this fix can automatically run
+
+    this.issue = null;    // Generated link - added by ValidationIssue constructor
+}

modules/core/validator.js

@@ -1,8 +1,6 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { coreDifference } from './difference';
-import { geoExtent } from '../geo';
-import { osmEntity } from '../osm';
 import { utilArrayGroupBy, utilCallWhenIdle, utilRebind } from '../util';
 import * as Validations from '../validations/index';
 
@@ -346,82 +344,3 @@ export function coreValidator(context) {
 
     return validator;
 }
-
-
-
-export function validationIssue(attrs) {
-    this.type = attrs.type;                // required - name of rule that created the issue (e.g. 'missing_tag')
-    this.severity = attrs.severity;        // required - 'warning' or 'error'
-    this.message = attrs.message;          // required - localized string
-    this.reference = attrs.reference;      // optional - function(selection) to render reference information
-    this.entities = attrs.entities;        // optional - array of entities involved in the issue
-    this.loc = attrs.loc;                  // optional - [lon, lat] to zoom in on to see the issue
-    this.data = attrs.data;                // optional - object containing extra data for the fixes
-    this.fixes = attrs.fixes;              // optional - array of validationIssueFix objects
-    this.hash = attrs.hash;                // optional - string to further differentiate the issue
-
-    this.id = generateID.apply(this);      // generated - see below
-    this.autoFix = null;                   // generated - if autofix exists, will be set below
-
-    // A unique, deterministic string hash.
-    // Issues with identical id values are considered identical.
-    function generateID() {
-        var parts = [this.type];
-
-        if (this.hash) {   // subclasses can pass in their own differentiator
-            parts.push(this.hash);
-        }
-
-        // include entities this issue is for
-        // (sort them so the id is deterministic)
-        if (this.entities) {
-            var entityKeys = this.entities.map(osmEntity.key).sort();
-            parts.push.apply(parts, entityKeys);
-        }
-
-        // include loc since two separate issues can have an
-        // idential type and entities, e.g. in crossing_ways
-        if (this.loc) {
-            parts.push.apply(parts, this.loc);
-        }
-
-        return parts.join(':');
-    }
-
-    var _extent;
-    this.extent = function(resolver) {
-        if (_extent) return _extent;
-
-        if (this.loc) {
-            return _extent = geoExtent(this.loc);
-        }
-        if (this.entities && this.entities.length) {
-            return _extent = this.entities.reduce(function(extent, entity) {
-                return extent.extend(entity.extent(resolver));
-            }, geoExtent());
-        }
-        return null;
-    };
-
-
-    if (this.fixes) {   // add a reference in the fixes to the issue for use in fix actions
-        for (var i = 0; i < this.fixes.length; i++) {
-            var fix = this.fixes[i];
-            fix.issue = this;
-            if (fix.autoArgs) {
-                this.autoFix = fix;
-            }
-        }
-    }
-}
-
-
-export function validationIssueFix(attrs) {
-    this.title = attrs.title;                 // Required
-    this.onClick = attrs.onClick;             // Required
-    this.icon = attrs.icon;                   // Optional - shows 'iD-icon-wrench' if not set
-    this.entityIds = attrs.entityIds || [];   // Optional - Used for hover-higlighting.
-    this.autoArgs = attrs.autoArgs;           // Optional - pass [actions, annotation] arglist if this fix can automatically run
-
-    this.issue = null;    // Generated link - added by ValidationIssue constructor
-}

modules/geo/extent.js

@@ -1,4 +1,4 @@
-import { geoMetersToLat, geoMetersToLon } from './index';
+import { geoMetersToLat, geoMetersToLon } from './geo';
 
 
 export function geoExtent(min, max) {