Add support for Röntgen icons

(re: #846)

The work I just did on #925 gives us much more flexibility to support new
spritesheets.  These get converted to WebGL textures on the fly now, so we
don't need to prepare a special spritesheet anymore.

modules/presets/index.js

@@ -22,20 +22,6 @@ export { _mainPresetIndex as presetManager };
 
 // warn about v6 preset featues we don't support currently
 const VERBOSE = true;
-// These are too hard to generate, for now we'll just replace them in code
-const ROENTGEN = {
-  'roentgen-buses':              'temaki-bus',
-  'roentgen-city_limit_sign':    'maki-information',
-  'roentgen-crane':              'temaki-crane',
-  'roentgen-crane_gantry':       'temaki-crane',
-  'roentgen-crane_portal':       'temaki-crane',
-  'roentgen-diving_1_platforms': 'temaki-diving',
-  'roentgen-pole_dancer':        'temaki-money_hand',
-  'roentgen-slide':              'temaki-slide',
-  'roentgen-slide_and_water':    'temaki-slide',
-  'roentgen-turning_loop':       'maki-circle'
-};
-
 
 //
 // `presetIndex` wraps a `presetCollection`
@@ -146,9 +132,6 @@ if (p.icon) p.icon = p.icon.replace(/^iD-/, 'rapid-');
 if (presetID === 'address') p.icon ='maki-circle-stroked';
 if (presetID === 'highway/crossing/traffic_signals') p.icon ='temaki-pedestrian_crosswalk';
 
-// No support for Roentgen icons just yet
-if (ROENTGEN[p.icon]) p.icon = ROENTGEN[p.icon];
-
           p = presetPreset(presetID, p, isAddable, _fields, _presets);
           if (p.locationSet) newLocationSets.push(p);
           _presets[presetID] = p;

modules/ui/UiDefs.js

@@ -17,7 +17,7 @@ export class UiDefs {
     this.parent = d3_select(null);
 
     this.spritesheetIDs = [
-      'rapid', 'maki', 'temaki', 'fa', 'community', 'mapillary-object', 'mapillary'
+      'rapid', 'maki', 'temaki', 'fa', 'roentgen', 'community', 'mapillary-object', 'mapillary'
     ];
 
     // Ensure methods used as callbacks always have `this` bound correctly.
@@ -73,7 +73,7 @@ export class UiDefs {
     group.appendChild(element);
 
     // For some spritesheets, allow icon fill colors to be overridden..
-    if (['maki', 'temaki', 'fa', 'community'].includes(spritesheetID)) {
+    if (['maki', 'temaki', 'fa', 'roentgen', 'community'].includes(spritesheetID)) {
       selection.selectAll('path')
         .attr('fill', 'currentColor');
     }

package.json

@@ -34,6 +34,7 @@
     "dist:svg:mapillary:signs": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/mapillary-sprite.svg node_modules/mapillary_sprite_source/package_signs/*.svg",
     "dist:svg:mapillary:objects": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/mapillary-object-sprite.svg node_modules/mapillary_sprite_source/package_objects/*.svg",
     "dist:svg:rapid": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"rapid-%s\" --symbol-sprite dist/img/rapid-sprite.svg \"svg/rapid-sprite/**/*.svg\"",
+    "dist:svg:roentgen": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"roentgen-%s\" --symbol-sprite dist/img/roentgen-sprite.svg svg/roentgen/*.svg",
     "dist:svg:temaki": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"temaki-%s\" --symbol-sprite dist/img/temaki-sprite.svg node_modules/@rapideditor/temaki/icons/*.svg",
     "docs": "jsdoc -c webdoc.conf.json -r",
     "imagery": "node scripts/update_imagery.js",

scripts/build_data.js

@@ -140,12 +140,9 @@ function writeIcons(icons) {
     const [prefix, ...rest] = icon.split('-');
     const name = rest.join('-');
 
-    if (['iD', 'rapid', 'maki', 'temaki'].includes(prefix)) {
+    if (['iD', 'rapid', 'maki', 'temaki', 'roentgen'].includes(prefix)) {
       continue;  // These are expected to live in an existing spritesheet..
 
-    } else if (prefix === 'roentgen') {
-      continue;  // These are too hard to generate, for now we'll just replace them in code..
-
     } else if (['fas', 'far', 'fab'].includes(prefix)) {   // FontAwesome, must be extracted
       const def = fontawesome.findIconDefinition({ prefix: prefix, iconName: name });
       try {

svg/fontawesome/README.md

@@ -2,3 +2,5 @@ Do not edit the files in this folder.
 
 This folder contains Font Awesome icons which are used by the presets.
 The icons are generated automatically by the `build_data.js` script.
+
+The contents of this folder are © Fontawesome ([CC BY 4.0](https://github.com/FortAwesome/Font-Awesome#license)).

svg/roentgen/LICENSE

@@ -0,0 +1,7 @@
+Röntgen icons (c) by Sergey Vartanov
+
+Röntgen icons are licensed under a Creative Commons Attribution 4.0
+International License.
+
+You should have received a copy of the license along with this work.  If not,
+see <http://creativecommons.org/licenses/by/4.0/>.

svg/roentgen/README.md

@@ -0,0 +1,6 @@
+Do not edit the files in this folder.
+
+This folder contains Roentgen icons.
+The icons are generated semi-automatically by running `map-machine icons` after [installing](https://github.com/enzet/map-machine#installation) Map Machine.
+
+The contents of this folder are © Map Machine ([CC BY 4.0](https://github.com/enzet/map-machine#r%C3%B6ntgen-icon-set)).