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

modules/ui/fields/access.js

@@ -1,7 +1,7 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 

modules/ui/fields/address.js

@@ -4,7 +4,7 @@ import { select as d3_select } from 'd3-selection';
 import { dataAddressFormats } from '../../../data';
 import { geoExtent, geoChooseEdge, geoSphericalDistance } from '../../geo';
 import { services } from '../../services';
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 import { utilArrayUniqBy, utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 

modules/ui/fields/check.js

@@ -7,9 +7,9 @@ import {
 
 import { utilRebind } from '../../util/rebind';
 import { t } from '../../util/locale';
-import { actionReverse } from '../../actions';
+import { actionReverse } from '../../actions/reverse';
 import { osmOneWayTags } from '../../osm';
-import { svgIcon } from '../../svg';
+import { svgIcon } from '../../svg/icon';
 
 export { uiFieldCheck as uiFieldDefaultCheck };
 export { uiFieldCheck as uiFieldOnewayCheck };

modules/ui/fields/combo.js

@@ -4,7 +4,7 @@ import { event as d3_event, select as d3_select } from 'd3-selection';
 import { osmEntity } from '../../osm/entity';
 import { t } from '../../util/locale';
 import { services } from '../../services';
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 import { utilArrayUniq, utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 export {

modules/ui/fields/cycleway.js

@@ -1,7 +1,7 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 

modules/ui/fields/localized.js

@@ -11,7 +11,7 @@ import { dataWikipedia } from '../../../data';
 import { services } from '../../services';
 import { svgIcon } from '../../svg';
 import { tooltip } from '../../util/tooltip';
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 import { utilDetect } from '../../util/detect';
 import { utilEditDistance, utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 

modules/ui/fields/maxspeed.js

@@ -3,7 +3,7 @@ import { select as d3_select } from 'd3-selection';
 
 import { dataImperial } from '../../../data';
 import { geoPointInPolygon } from '../../geo';
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
 
 

modules/ui/fields/restrictions.js

@@ -2,8 +2,9 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select, event as d3_event } from 'd3-selection';
 
 import { t } from '../../util/locale';
-import { actionRestrictTurn, actionUnrestrictTurn } from '../../actions';
-import { behaviorBreathe } from '../../behavior';
+import { actionRestrictTurn } from '../../actions/restrict_turn';
+import { actionUnrestrictTurn } from '../../actions/unrestrict_turn';
+import { behaviorBreathe } from '../../behavior/breathe';
 import { geoExtent, geoRawMercator, geoVecScale, geoVecSubtract, geoZoomToScale } from '../../geo';
 import { osmIntersection, osmInferRestriction, osmTurn, osmWay } from '../../osm';
 import { svgLayers, svgLines, svgTurns, svgVertices } from '../../svg';

modules/ui/fields/wikidata.js

@@ -5,12 +5,12 @@ import {
     event as d3_event
 } from 'd3-selection';
 
-import { uiCombobox } from '../index';
+import { uiCombobox } from '../combobox';
 
-import { actionChangeTags } from '../../actions/index';
+import { actionChangeTags } from '../../actions/change_tags';
 import { services } from '../../services/index';
 
-import { svgIcon } from '../../svg/index';
+import { svgIcon } from '../../svg/icon';
 import {
     utilGetSetValue,
     utilNoAuto,

modules/ui/fields/wikipedia.js

@@ -6,11 +6,11 @@ import {
 } from 'd3-selection';
 
 import { t } from '../../util/locale';
-import { actionChangeTags } from '../../actions/index';
+import { actionChangeTags } from '../../actions/change_tags';
 import { dataWikipedia } from '../../../data/index';
 import { services } from '../../services/index';
-import { svgIcon } from '../../svg/index';
-import { uiCombobox } from '../index';
+import { svgIcon } from '../../svg/icon';
+import { uiCombobox } from '../combobox';
 import { utilDetect } from '../../util/detect';
 import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';