Move the final few things from modules/svg folder

- svgIcon -> uiIcon (and remove unused 3rd useklass argument)
- svgDefs -> uiDefs

modules/svg/index.js

@@ -1,3 +1 @@
-export { svgDefs } from './defs.js';
-export { svgIcon } from './icon.js';
 export { svgTagClasses } from './tag_classes.js';

modules/ui/account.js

@@ -1,5 +1,5 @@
 import { t } from '../core/localizer';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 
 
 export function uiAccount(context) {
@@ -38,7 +38,7 @@ export function uiAccount(context) {
           .attr('src', user.image_url);
       } else {
         userLink
-          .call(svgIcon('#rapid-icon-avatar', 'pre-text light'));
+          .call(uiIcon('#rapid-icon-avatar', 'pre-text light'));
       }
 
       // Add user name

modules/ui/changeset_editor.js

@@ -3,7 +3,7 @@ import { utilArrayUniqBy } from '@rapid-sdk/util';
 
 import { presetManager } from '../presets';
 import { t } from '../core/localizer';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { uiCombobox} from './combobox';
 import { uiField } from './field';
 import { uiFormFields } from './form_fields';
@@ -105,7 +105,7 @@ export function uiChangesetEditor(context) {
         commentEnter
             .append('a')
             .attr('target', '_blank')
-            .call(svgIcon('#rapid-icon-alert', 'inline'))
+            .call(uiIcon('#rapid-icon-alert', 'inline'))
             .attr('href', t('commit.google_warning_link'))
             .append('span')
             .html(t.html('commit.google_warning'));

modules/ui/commit.js

@@ -6,7 +6,7 @@ import deepEqual from 'fast-deep-equal';
 import { prefs } from '../core/preferences';
 import { t, localizer } from '../core/localizer';
 import { osmChangeset } from '../osm';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { services } from '../services';
 import { uiTooltip } from './tooltip';
 import { uiChangesetEditor } from './changeset_editor';
@@ -243,7 +243,7 @@ export function uiCommit(context) {
             .on('click', function() {
                 dispatch.call('cancel', this);
             })
-            .call(svgIcon('#rapid-icon-close'));
+            .call(uiIcon('#rapid-icon-close'));
 
         var body = selection.selectAll('.body')
             .data([0]);

modules/ui/commit_warnings.js

@@ -1,7 +1,7 @@
 import { utilEntityOrMemberSelector } from '@rapid-sdk/util';
 
 import { t } from '../core/localizer';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { uiTooltip } from './tooltip';
 
 
@@ -74,7 +74,7 @@ export function uiCommitWarnings(context) {
                 });
 
             buttons
-                .call(svgIcon('#rapid-icon-alert', 'pre-text'));
+                .call(uiIcon('#rapid-icon-alert', 'pre-text'));
 
             buttons
                 .append('strong')

modules/ui/conflicts.js

@@ -6,7 +6,7 @@ import { utilEntityOrMemberSelector } from '@rapid-sdk/util';
 import { t } from '../core/localizer';
 import { JXON } from '../util/jxon';
 import { osmChangeset } from '../osm';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { utilDetect, utilKeybinding, utilRebind, utilWrap } from '../util';
 
 
@@ -52,7 +52,7 @@ export function uiConflicts(context) {
             .append('button')
             .attr('class', 'fr')
             .on('click', cancel)
-            .call(svgIcon('#rapid-icon-close'));
+            .call(uiIcon('#rapid-icon-close'));
 
         headerEnter
             .append('h3')
@@ -98,7 +98,7 @@ export function uiConflicts(context) {
         }
 
         linkEnter
-            .call(svgIcon('#rapid-icon-load', 'inline'))
+            .call(uiIcon('#rapid-icon-load', 'inline'))
             .append('span')
             .html(t.html('save.conflict.download_changes'));
 

modules/ui/contributors.js

@@ -2,7 +2,7 @@ import _debounce from 'lodash-es/debounce';
 import { select as d3_select } from 'd3-selection';
 
 import { t } from '../core/localizer';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 
 
 export function uiContributors(context) {
@@ -27,7 +27,7 @@ export function uiContributors(context) {
             subset = u.slice(0, u.length > limit ? limit - 1 : limit);
 
         wrap.html('')
-            .call(svgIcon('#rapid-icon-nearby', 'pre-text light'));
+            .call(uiIcon('#rapid-icon-nearby', 'pre-text light'));
 
         var userList = d3_select(document.createElement('span'));
 

modules/ui/data_editor.js

@@ -1,5 +1,5 @@
 import { t } from '../core/localizer';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 
 import { uiDataHeader } from './data_header';
 import { uiSectionRawTagEditor } from './sections/raw_tag_editor';
@@ -28,7 +28,7 @@ export function uiDataEditor(context) {
             .on('click', function() {
                 context.enter('browse');
             })
-            .call(svgIcon('#rapid-icon-close'));
+            .call(uiIcon('#rapid-icon-close'));
 
         headerEnter
             .append('h3')

modules/ui/data_header.js

@@ -1,5 +1,5 @@
 import { t } from '../core/localizer';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 
 
 export function uiDataHeader() {
@@ -26,7 +26,7 @@ export function uiDataHeader() {
 
         iconEnter
             .append('div')
-            .call(svgIcon('#rapid-icon-data', 'note-fill'));
+            .call(uiIcon('#rapid-icon-data', 'note-fill'));
 
         headerEnter
             .append('div')

modules/svg/defs.js → modules/ui/defs.js

@@ -4,7 +4,7 @@ import { select as d3_select } from 'd3-selection';
 /*
  * A standalone SVG `defs` element that contains the icon spritesheets for the user interface
  */
-export function svgDefs(context) {
+export function uiDefs(context) {
   const spritesheetIDs = ['rapid-sprite', 'maki-sprite', 'temaki-sprite', 'fa-sprite', 'community-sprite'];
 
   function render(selection) {

modules/ui/disclosure.js

@@ -2,7 +2,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { localizer } from '../core/localizer';
 import { prefs } from '../core/preferences';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { utilFunctor } from '../util';
 import { utilRebind } from '../util/rebind';
 import { uiToggle } from './toggle';
@@ -31,7 +31,7 @@ export function uiDisclosure(context, key, expandedDefault) {
       .append('a')
       .attr('href', '#')
       .attr('class', `hide-toggle hide-toggle-${key}`)
-      .call(svgIcon('', 'pre-text', 'hide-toggle-icon'));
+      .call(uiIcon('', 'pre-text', 'hide-toggle-icon'));
 
     hideToggleEnter
       .append('span')

modules/ui/edit_menu.js

@@ -6,7 +6,7 @@ import { localizer } from '../core/localizer';
 import { uiTooltip } from './tooltip';
 import { utilRebind } from '../util/rebind';
 import { utilHighlightEntities } from '../util/util';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 
 
 export function uiEditMenu(context) {
@@ -106,7 +106,7 @@ export function uiEditMenu(context) {
         .call(tooltip)
         .append('div')
         .attr('class', 'icon-wrap')
-        .call(svgIcon(`#rapid-operation-${d.id}`, 'operation'));
+        .call(uiIcon(`#rapid-operation-${d.id}`, 'operation'));
     });
 
     if (showLabels) {

modules/ui/entity_editor.js

@@ -5,7 +5,7 @@ import deepEqual from 'fast-deep-equal';
 import { presetManager } from '../presets';
 import { t, localizer } from '../core/localizer';
 import { actionChangeTags } from '../actions/change_tags';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { utilRebind } from '../util';
 
 import { uiSectionEntityIssues } from './sections/entity_issues';
@@ -131,13 +131,13 @@ export function uiEntityEditor(context) {
         headerEnter
             .append('button')
             .attr('class', 'preset-reset preset-choose')
-            .call(svgIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-forward' : '#rapid-icon-backward'));
+            .call(uiIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-forward' : '#rapid-icon-backward'));
 
         headerEnter
             .append('button')
             .attr('class', 'close')
             .on('click', function() { context.enter('browse'); })
-            .call(svgIcon(_modified ? '#rapid-icon-apply' : '#rapid-icon-close'));
+            .call(uiIcon(_modified ? '#rapid-icon-apply' : '#rapid-icon-close'));
 
         headerEnter
             .append('h3');

modules/ui/feature_list.js

@@ -9,7 +9,7 @@ import { Graph } from '../core/Graph';
 import { modeSelect } from '../modes/select';
 import { osmEntity } from '../osm/entity';
 import { services } from '../services';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { uiCmd } from './cmd';
 
 import {
@@ -38,7 +38,7 @@ export function uiFeatureList(context) {
             .attr('class', 'search-header');
 
         searchWrap
-            .call(svgIcon('#rapid-icon-search', 'pre-text'));
+            .call(uiIcon('#rapid-icon-search', 'pre-text'));
 
         var search = searchWrap
             .append('input')
@@ -254,7 +254,7 @@ export function uiFeatureList(context) {
                 .append('button')
                 .property('disabled', true)
                 .attr('class', 'no-results-item')
-                .call(svgIcon('#rapid-icon-alert', 'pre-text'));
+                .call(uiIcon('#rapid-icon-alert', 'pre-text'));
 
             resultsIndicator.append('span')
                 .attr('class', 'entity-name');
@@ -303,7 +303,7 @@ export function uiFeatureList(context) {
             label
                 .each(function(d) {
                     d3_select(this)
-                        .call(svgIcon('#rapid-icon-' + d.geometry, 'pre-text'));
+                        .call(uiIcon('#rapid-icon-' + d.geometry, 'pre-text'));
                 });
 
             label

modules/ui/field.js

@@ -4,7 +4,7 @@ import { utilUniqueString } from '@rapid-sdk/util';
 
 import { t, localizer } from '../core/localizer';
 import { locationManager } from '../core/LocationManager';
-import { svgIcon } from '../svg/icon';
+import { uiIcon } from './icon';
 import { uiTooltip } from './tooltip';
 // import { uiFieldHelp } from './field_help';
 import { uiFields } from './fields';
@@ -160,15 +160,15 @@ export function uiField(context, presetField, entityIDs, options) {
                     .append('button')
                     .attr('class', 'remove-icon')
                     .attr('title', t('icons.remove'))
-                    .call(svgIcon('#rapid-operation-delete'));
+                    .call(uiIcon('#rapid-operation-delete'));
             }
 
             if (options.revert) {
                 labelEnter
                     .append('button')
                     .attr('class', 'modified-icon')
                     .attr('title', t('icons.undo'))
-                    .call(svgIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-redo' : '#rapid-icon-undo'));
+                    .call(uiIcon((localizer.textDirection() === 'rtl') ? '#rapid-icon-redo' : '#rapid-icon-undo'));
             }
         }
 

modules/ui/field_help.js

@@ -2,7 +2,7 @@
 //
 //import { marked } from 'marked';
 //import { t, localizer } from '../core/localizer';
-//import { svgIcon } from '../svg/icon';
+//import { uiIcon } from './icon';
 //import { icon } from './intro/helper';
 //
 //
@@ -146,7 +146,7 @@
 //        button.enter()
 //            .append('button')
 //            .attr('class', 'field-help-button')
-//            .call(svgIcon('#rapid-icon-help'))
+//            .call(uiIcon('#rapid-icon-help'))
 //            .merge(button)
 //            .on('click', function (d3_event) {
 //                d3_event.stopPropagation();
@@ -204,7 +204,7 @@
 //                d3_event.preventDefault();
 //                hide();
 //            })
-//            .call(svgIcon('#rapid-icon-close'));
+//            .call(uiIcon('#rapid-icon-close'));
 //
 //        var navEnter = enter
 //            .append('div')

modules/ui/fields/check.js

@@ -8,7 +8,7 @@ import { utilRebind } from '../../util/rebind';
 import { t } from '../../core/localizer';
 import { actionReverse } from '../../actions/reverse';
 import { osmOneWayTags } from '../../osm';
-import { svgIcon } from '../../svg/icon';
+import { uiIcon } from '../icon';
 
 export { uiFieldCheck as uiFieldDefaultCheck };
 export { uiFieldCheck as uiFieldOnewayCheck };
@@ -84,7 +84,7 @@ export function uiFieldCheck(field, context) {
 
         selection.selectAll('.reverser-span')
             .html(t.html('inspector.check.reverser'))
-            .call(svgIcon(icon, 'inline'));
+            .call(uiIcon(icon, 'inline'));
 
         return selection;
     }

modules/ui/fields/input.js

@@ -6,7 +6,7 @@ import { presetManager } from '../../presets';
 import { fileFetcher } from '../../core/file_fetcher';
 import { t, localizer } from '../../core/localizer';
 import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
-import { svgIcon } from '../../svg/icon';
+import { uiIcon } from '../icon';
 
 export {
     uiFieldText as uiFieldUrl,
@@ -129,7 +129,7 @@ export function uiFieldText(field, context) {
 
             outlinkButton.enter()
                 .append('button')
-                .call(svgIcon('#rapid-icon-out-link'))
+                .call(uiIcon('#rapid-icon-out-link'))
                 .attr('class', 'form-field-button foreign-id-permalink')
                 .attr('title', function() {
                     var domainResults = /^https?:\/\/(.{1,}?)\//.exec(field.urlFormat);
@@ -157,7 +157,7 @@ export function uiFieldText(field, context) {
 
             outlinkButton.enter()
                 .append('button')
-                .call(svgIcon('#rapid-icon-out-link'))
+                .call(uiIcon('#rapid-icon-out-link'))
                 .attr('class', 'form-field-button foreign-id-permalink')
                 .attr('title', () => t('icons.visit_website'))
                 .on('click', function(d3_event) {

modules/ui/fields/localized.js

@@ -7,7 +7,7 @@ import { presetManager } from '../../presets';
 import { fileFetcher } from '../../core/file_fetcher';
 import { t, localizer } from '../../core/localizer';
 import { services } from '../../services';
-import { svgIcon } from '../../svg/icon';
+import { uiIcon } from '../icon';
 import { uiTooltip } from '../tooltip';
 import { uiCombobox } from '../combobox';
 import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util';
@@ -190,7 +190,7 @@ export function uiFieldLocalized(field, context) {
         translateButton = translateButton.enter()
             .append('button')
             .attr('class', 'localized-add form-field-button')
-            .call(svgIcon('#rapid-icon-plus'))
+            .call(uiIcon('#rapid-icon-plus'))
             .merge(translateButton);
 
         translateButton
@@ -405,7 +405,7 @@ export function uiFieldLocalized(field, context) {
 
                         renderMultilingual(selection);
                     })
-                    .call(svgIcon('#rapid-operation-delete'));
+                    .call(uiIcon('#rapid-operation-delete'));
 
                 wrap
                     .append('input')