add Röntgen icon set

Author: tyrasd

CHANGELOG.md

@@ -37,6 +37,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 # Unreleased
 
+#### :mega: Release Highlights
+* Add [Röntgen icon set](https://github.com/enzet/map-machine#r%C3%B6ntgen-icon-set) for presets, etc.
 #### :bug: Bugfixes
 * Fix context "edit" menu on touchscreens: render labels properly and always open the touch-specific edit menu ([#9425])
 #### :hammer: Development

data/core.yaml

@@ -1468,6 +1468,7 @@ en:
       before_start: "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Press the \"{start_the_walkthrough}\" button on this screen to start the tutorial—it takes only about 15 minutes."
       open_source_h: "Open Source"
       open_source: "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD)."
+      open_source_attribution: "This project includes icons from [Maki](https://github.com/mapbox/maki) (CC0), [temaki](https://github.com/ideditor/temaki) (CC0), [Fontawesome](https://github.com/FortAwesome/Font-Awesome) (CC BY 4.0) and [Map Machine](https://github.com/enzet/map-machine) (CC BY 4.0)."
       open_source_help: "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
     overview:
       title: Overview

modules/svg/defs.js

@@ -13,7 +13,7 @@ export function svgDefs(context) {
     var _defsSelection = d3_select(null);
 
     var _spritesheetIds = [
-        'iD-sprite', 'maki-sprite', 'temaki-sprite', 'fa-sprite', 'community-sprite'
+        'iD-sprite', 'maki-sprite', 'temaki-sprite', 'fa-sprite', 'roentgen-sprite', 'community-sprite'
     ];
 
     function drawDefs(selection) {

modules/ui/panes/help.js

@@ -18,6 +18,7 @@ export function uiPaneHelp(context) {
             'before_start',
             'open_source_h',
             'open_source',
+            'open_source_attribution',
             'open_source_help'
         ]],
         ['overview', [

modules/ui/preset_icon.js

@@ -298,7 +298,8 @@ export function uiPresetIcon() {
     const isMaki = picon && /^maki-/.test(picon);
     const isTemaki = picon && /^temaki-/.test(picon);
     const isFa = picon && /^fa[srb]-/.test(picon);
-    const isiDIcon = picon && !(isMaki || isTemaki || isFa);
+    const isRöntgen = picon && /^roentgen-/.test(picon);
+    const isiDIcon = picon && !(isMaki || isTemaki || isFa || isRöntgen);
 
     let icon = container.selectAll('.preset-icon')
       .data(picon ? [0] : []);

package.json

@@ -30,6 +30,7 @@
     "dist:svg:maki": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"maki-%s\" --symbol-sprite dist/img/maki-sprite.svg node_modules/@mapbox/maki/icons/*.svg",
     "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:roentgen": "svg-sprite --shape-id-generator \"roentgen-%s\" --shape-dim-width 16 --shape-dim-height 16 --symbol --symbol-dest . --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/@ideditor/temaki/icons/*.svg",
     "imagery": "node scripts/update_imagery.js",
     "lint": "eslint scripts test/spec modules",

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)).