diff --git a/css/map.css b/css/map.css index ee8783a5b..591214bd2 100644 --- a/css/map.css +++ b/css/map.css @@ -144,13 +144,18 @@ g.vertex.selected .shadow { /* lines */ +.preset-icon .icon.other-line { + color: #fff; + fill: #777; +} + path.line { stroke-linecap: round; stroke-linejoin: bevel; } path.stroke { - stroke: black; + stroke: #000; stroke-width: 4; } @@ -169,12 +174,12 @@ path.shadow.selected { } path.line.stroke { - stroke: white; + stroke: #fff; stroke-width: 2; } path.area.stroke { - stroke: white; + stroke: #fff; stroke-width: 1; } path.area.fill { @@ -458,6 +463,11 @@ path.stroke.area.tag-highway { /* wide highways */ +.preset-icon .icon.tag-highway.other-line { + color: #fff; + fill: #777; +} + path.shadow.tag-highway { stroke-width:16; } @@ -480,18 +490,27 @@ path.stroke.tag-highway { stroke-width:4; } +.preset-icon .icon.highway-motorway, +.preset-icon .icon.highway-motorway-link { + color: #CF2081; + fill: #70372f; +} path.stroke.tag-highway-motorway, path.stroke.tag-highway-motorway_link, path.stroke.tag-motorway { stroke:#CF2081; } - path.casing.tag-highway-motorway, path.casing.tag-highway-motorway_link, path.casing.tag-motorway { stroke:#70372f; } +.preset-icon .icon.highway-trunk, +.preset-icon .icon.highway-trunk-link { + color: #DD2F22; + fill: #70372f; +} path.stroke.tag-highway-trunk, path.stroke.tag-highway-trunk_link, path.stroke.tag-trunk { @@ -503,6 +522,11 @@ path.casing.tag-trunk { stroke:#70372f; } +.preset-icon .icon.highway-primary, +.preset-icon .icon.highway-primary-link { + color: #F99806; + fill: #70372f; +} path.stroke.tag-highway-primary, path.stroke.tag-highway-primary_link, path.stroke.tag-primary { @@ -514,6 +538,11 @@ path.casing.tag-primary { stroke:#70372f; } +.preset-icon .icon.highway-secondary, +.preset-icon .icon.highway-secondary-link { + color: #F3F312; + fill: #70372f; +} path.stroke.tag-highway-secondary, path.stroke.tag-highway-secondary_link, path.stroke.tag-secondary { @@ -525,6 +554,11 @@ path.casing.tag-secondary { stroke:#70372f; } +.preset-icon .icon.highway-tertiary, +.preset-icon .icon.highway-tertiary-link { + color: #FFF9B3; + fill: #70372f; +} path.stroke.tag-highway-tertiary, path.stroke.tag-highway-tertiary_link, path.stroke.tag-tertiary { @@ -536,18 +570,27 @@ path.casing.tag-tertiary { stroke:#70372f; } +.legacy-carto .preset-icon .icon.highway-motorway, +.legacy-carto .preset-icon .icon.highway-motorway-link { + color: #58a9ed; + fill: #2c5476; +} .legacy-carto path.stroke.tag-highway-motorway, .legacy-carto path.stroke.tag-highway-motorway_link, .legacy-carto path.stroke.tag-motorway { stroke:#58a9ed; } - .legacy-carto path.casing.tag-highway-motorway, .legacy-carto path.casing.tag-highway-motorway_link, .legacy-carto path.casing.tag-motorway { stroke:#2c5476; } +.legacy-carto .preset-icon .icon.highway-trunk, +.legacy-carto .preset-icon .icon.highway-trunk-link { + color: #8cd05f; + fill: #46682f; +} .legacy-carto path.stroke.tag-highway-trunk, .legacy-carto path.stroke.tag-highway-trunk_link, .legacy-carto path.stroke.tag-trunk { @@ -559,6 +602,11 @@ path.casing.tag-tertiary { stroke:#46682f; } +.legacy-carto .preset-icon .icon.highway-primary, +.legacy-carto .preset-icon .icon.highway-primary-link { + color: #e06d5f; + fill: #70372f; +} .legacy-carto path.stroke.tag-highway-primary, .legacy-carto path.stroke.tag-highway-primary_link, .legacy-carto path.stroke.tag-primary { @@ -570,6 +618,11 @@ path.casing.tag-tertiary { stroke:#70372f; } +.legacy-carto .preset-icon .icon.highway-secondary, +.legacy-carto .preset-icon .icon.highway-secondary-link { + color: #eab056; + fill: #75582b; +} .legacy-carto path.stroke.tag-highway-secondary, .legacy-carto path.stroke.tag-highway-secondary_link, .legacy-carto path.stroke.tag-secondary { @@ -581,6 +634,11 @@ path.casing.tag-tertiary { stroke:#75582b; } +.legacy-carto .preset-icon .icon.highway-tertiary, +.legacy-carto .preset-icon .icon.highway-tertiary-link { + color: #ffff7e; + fill: #7f7f3f; +} .legacy-carto path.stroke.tag-highway-tertiary, .legacy-carto path.stroke.tag-highway-tertiary_link, .legacy-carto path.stroke.tag-tertiary { @@ -592,6 +650,10 @@ path.casing.tag-tertiary { stroke:#7f7f3f; } +.preset-icon .icon.highway-unclassified { + color: #eaeaea; + fill: #444; +} path.stroke.tag-highway-unclassified, path.stroke.tag-unclassified { stroke:#eaeaea; @@ -601,6 +663,10 @@ path.casing.tag-unclassified { stroke:#444; } +.preset-icon .icon.highway-residential { + color: #fff; + fill: #444; +} path.stroke.tag-highway-residential, path.stroke.tag-residential { stroke:#fff; @@ -709,7 +775,10 @@ path.casing.tag-road { stroke-width:4; } - +.preset-icon .icon.highway-living-street { + color: #ccc; + fill: #fff; +} path.stroke.tag-highway-living_street, path.stroke.tag-living_street { stroke:#ccc; @@ -719,6 +788,10 @@ path.casing.tag-living_street { stroke:#fff; } +.preset-icon .icon.highway-pedestrian { + color: #8cd05f; + fill: #fff; +} path.stroke.tag-highway-corridor, path.stroke.tag-highway-pedestrian, path.stroke.tag-corridor, @@ -733,15 +806,23 @@ path.casing.tag-pedestrian { stroke:#8cd05f; } +.preset-icon .icon.highway-road { + color: #9e9e9e; + fill: #666; +} path.stroke.tag-highway-road, path.stroke.tag-road { stroke:#9e9e9e; } path.casing.tag-highway-road, path.casing.tag-road { - stroke:#444; + stroke:#666; } +.preset-icon .icon.highway-service { + color: #fff; + fill: #666; +} path.stroke.tag-highway-service, path.stroke.tag-service { stroke:#fff; @@ -751,6 +832,10 @@ path.casing.tag-service { stroke:#666; } +.preset-icon .icon.highway-track { + color: #ccc; + fill: #996600; +} path.stroke.tag-highway-track, path.stroke.tag-track { stroke: #ccc; @@ -780,19 +865,46 @@ path.casing.tag-highway-bridleway { stroke: #fff; } +.preset-icon .icon.category-path, +.preset-icon .icon.highway-path { + color: #746f6f; + fill: #c5b59f; +} path.stroke.tag-highway-path { stroke: #746f6f; } + +.preset-icon .icon.tag-route-foot, +.preset-icon .icon.tag-route-hiking, +.preset-icon .icon.highway-footway { + color: #ae8681; + fill: #fff; +} path.stroke.tag-highway-footway { stroke: #ae8681; } + +.preset-icon .icon.tag-route-bicycle, +.preset-icon .icon.highway-cycleway { + color: #58a9ed; + fill: #fff; +} path.stroke.tag-highway-cycleway { stroke: #58a9ed; } + +.preset-icon .icon.highway-bridleway { + color: #e06d5f; + fill: #fff; +} path.stroke.tag-highway-bridleway { stroke: #e06d5f; } +.preset-icon .icon.highway-steps { + color: #81d25c; + fill: #fff; +} path.stroke.tag-highway-steps { stroke: #81d25c; stroke-linecap: butt; @@ -836,19 +948,30 @@ path.fill.tag-aeroway-apron { /* railways */ - +.preset-icon .icon.tag-railway.other-line { + color: #fff; + fill: #777; +} +.preset-icon .icon.tag-railway { + color: #555; + fill: #eee; +} path.stroke.tag-railway { stroke: #eee; stroke-width: 2; stroke-linecap: butt; stroke-dasharray: 12,12; } - path.casing.tag-railway { stroke: #555; stroke-width: 4; } +.preset-icon .icon.tag-railway-disused, +.preset-icon .icon.tag-railway-abandoned { + color: #999; + fill: #eee; +} path.stroke.tag-railway-abandoned { stroke: #eee; } @@ -856,8 +979,12 @@ path.casing.tag-railway-abandoned { stroke: #999; } +.preset-icon .icon.tag-railway-subway { + color: #222; + fill: #bbb; +} path.stroke.tag-railway-subway { - stroke: #666; + stroke: #bbb; } path.casing.tag-railway-subway { stroke: #222; @@ -882,6 +1009,16 @@ path.casing.tag-railway-platform { } /* waterways */ +.preset-icon .icon.tag-waterway.other-line { + color: #77d3de; + fill: #77d3de; +} +.preset-icon .icon.category-water, +.preset-icon .icon.tag-route-ferry, +.preset-icon .icon.tag-waterway { + color: #77d3de; + fill: #fff; +} path.fill.tag-waterway { stroke: rgba(119, 211, 222, 0.3); @@ -904,6 +1041,9 @@ path.casing.tag-waterway-river { stroke-width: 6; } +.preset-icon .icon.tag-waterway-ditch { + color: #6591ff; +} path.stroke.tag-waterway-ditch { stroke: #6591ff; stroke-width: 1; @@ -914,6 +1054,11 @@ path.casing.tag-waterway-ditch { } /* power */ +.preset-icon .icon.tag-man_made-pipeline, +.preset-icon .icon.tag-power { + color: #939393; + fill: #939393; +} path.stroke.tag-power { stroke: #939393; diff --git a/data/presets/presets.json b/data/presets/presets.json index 31279f9d9..bdc855dd6 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3773,6 +3773,7 @@ "name": "Pedestrian Crosswalk" }, "footway/sidewalk": { + "icon": "highway-footway", "fields": [ "surface", "lit", @@ -5781,7 +5782,7 @@ "name": "Pier" }, "man_made/pipeline": { - "icon": "pipeline", + "icon": "pipeline-line", "fields": [ "location", "operator" @@ -7372,7 +7373,7 @@ "searchable": false }, "route/ferry": { - "icon": "ferry", + "icon": "ferry-line", "geometry": [ "line" ], diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/footway/sidewalk.json index 07ba956cc..a334df595 100644 --- a/data/presets/presets/footway/sidewalk.json +++ b/data/presets/presets/footway/sidewalk.json @@ -1,4 +1,5 @@ { + "icon": "highway-footway", "fields": [ "surface", "lit", diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json index e74676f3b..6c80564b1 100644 --- a/data/presets/presets/man_made/pipeline.json +++ b/data/presets/presets/man_made/pipeline.json @@ -1,5 +1,5 @@ { - "icon": "pipeline", + "icon": "pipeline-line", "fields": [ "location", "operator" diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json index 88d96d572..882138d8f 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -1,5 +1,5 @@ { - "icon": "ferry", + "icon": "ferry-line", "geometry": [ "line" ], @@ -7,4 +7,4 @@ "route": "ferry" }, "name": "Ferry Route" -} \ No newline at end of file +} diff --git a/dist/img/iD-sprite.svg b/dist/img/iD-sprite.svg index ac19b3296..3dfd2ea0b 100644 --- a/dist/img/iD-sprite.svg +++ b/dist/img/iD-sprite.svg @@ -406,7 +406,7 @@ - + @@ -518,11 +518,7 @@ - - - - - + @@ -543,7 +539,7 @@ - + @@ -648,45 +644,29 @@ - + - - - - - - - - - - + + + - - - - - - - - - + + + + - - - - - - + + - + @@ -695,137 +675,73 @@ - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + + + - - - - - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - @@ -833,16 +749,9 @@ - - - - - - - - + + - @@ -851,113 +760,54 @@ - - - - - - - - + + - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - + + + - - - - - - - - - - - - - + + + - - - - - - - - - - + + + - - - - - - - - - + + - - + @@ -965,38 +815,30 @@ - - - - - - - + + + + + + - - - - - - - - - + + + + + + + - + - - - - - - - - - - + + + + + @@ -1006,24 +848,18 @@ - - - - - - + + - - - - + + @@ -1034,70 +870,65 @@ - - - + + - + - - + + - - + + - - + - - + + - - + + - - - + - - + + - - + + - @@ -1105,117 +936,96 @@ - - + - - + + - - + + - - - - - - - - - + - - - - - + + + + + + + + + + + - - - - - - - - - + + - - + - - + + - - + - - + + - - - - + - - + + - - - - + - - + + - - - - + diff --git a/js/id/ui/preset_icon.js b/js/id/ui/preset_icon.js index dd85bfaf4..ed90f17e6 100644 --- a/js/id/ui/preset_icon.js +++ b/js/id/ui/preset_icon.js @@ -2,15 +2,26 @@ iD.ui.PresetIcon = function() { var preset, geometry; function presetIcon(selection) { - selection.each(setup); + selection.each(render); } - function setup() { + function render() { var selection = d3.select(this), p = preset.apply(this, arguments), geom = geometry.apply(this, arguments), icon = p.icon || (geom === 'line' ? 'other-line' : 'marker-stroked'), - isMaki = iD.data.featureIcons.hasOwnProperty(icon + '-24'); + maki = iD.data.featureIcons.hasOwnProperty(icon + '-24'); + + function tag_classes(p) { + var s = ''; + for (var i in p.tags) { + s += ' tag-' + i; + if (p.tags[i] !== '*') { + s += ' tag-' + i + '-' + p.tags[i]; + } + } + return s; + } var $fill = selection.selectAll('.preset-icon-fill') .data([0]); @@ -18,11 +29,7 @@ iD.ui.PresetIcon = function() { $fill.enter().append('div'); $fill.attr('class', function() { - var s = 'preset-icon-fill preset-icon-fill-' + geom; - for (var i in p.tags) { - s += ' tag-' + i + ' tag-' + i + '-' + p.tags[i]; - } - return s; + return 'preset-icon-fill preset-icon-fill-' + geom + tag_classes(p); }); var $frame = selection.selectAll('.preset-icon-frame') @@ -46,14 +53,15 @@ iD.ui.PresetIcon = function() { .call(iD.svg.Icon('')); $icon - .classed('preset-icon-60', !isMaki) - .classed('preset-icon-32', isMaki); + .attr('class', 'preset-icon preset-icon-' + (maki ? '32' : '60')); - $icon.selectAll('use') - .attr('href', function() { - // workaround: maki parking-24 broken? - return '#' + icon + (isMaki ? ( icon === 'parking' ? '-18' : '-24') : ''); + $icon.selectAll('svg') + .attr('class', function() { + return 'icon ' + icon + tag_classes(p); }); + + $icon.selectAll('use') // workaround: maki parking-24 broken? + .attr('href', '#' + icon + (maki ? ( icon === 'parking' ? '-18' : '-24') : '')); } presetIcon.preset = function(_) { diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json index 46080b184..8e2dc9139 100644 --- a/svg/iD-sprite.json +++ b/svg/iD-sprite.json @@ -76,6 +76,78 @@ "highway-bridleway": { "viewBox": "360 80 60 60" }, "highway-steps": { "viewBox": "420 80 60 60" }, + "highway-motorway-casing1": { "fill": "inherit" }, + "highway-motorway-stroke1": { "fill": "currentColor" }, + "highway-motorway-stroke2": { "fill": "currentColor" }, + "highway-trunk-casing1": { "fill": "inherit" }, + "highway-trunk-stroke1": { "fill": "currentColor" }, + "highway-trunk-stroke2": { "fill": "currentColor" }, + "highway-primary-casing1": { "fill": "inherit" }, + "highway-primary-stroke1": { "fill": "currentColor" }, + "highway-primary-stroke2": { "fill": "currentColor" }, + "highway-secondary-casing1": { "fill": "inherit" }, + "highway-secondary-stroke1": { "fill": "currentColor" }, + "highway-secondary-stroke2": { "fill": "currentColor" }, + "highway-tertiary-casing1": { "fill": "inherit" }, + "highway-tertiary-stroke1": { "fill": "currentColor" }, + "highway-tertiary-stroke2": { "fill": "currentColor" }, + + "highway-motorway-link-casing1": { "fill": "inherit" }, + "highway-motorway-link-casing2": { "fill": "inherit" }, + "highway-motorway-link-stroke1": { "fill": "currentColor" }, + "highway-motorway-link-stroke2": { "fill": "currentColor" }, + "highway-motorway-link-stroke3": { "fill": "currentColor" }, + "highway-trunk-link-casing1": { "fill": "inherit" }, + "highway-trunk-link-casing2": { "fill": "inherit" }, + "highway-trunk-link-stroke1": { "fill": "currentColor" }, + "highway-trunk-link-stroke2": { "fill": "currentColor" }, + "highway-trunk-link-stroke3": { "fill": "currentColor" }, + "highway-primary-link-casing1": { "fill": "inherit" }, + "highway-primary-link-casing2": { "fill": "inherit" }, + "highway-primary-link-stroke1": { "fill": "currentColor" }, + "highway-primary-link-stroke2": { "fill": "currentColor" }, + "highway-primary-link-stroke3": { "fill": "currentColor" }, + "highway-secondary-link-casing1": { "fill": "inherit" }, + "highway-secondary-link-casing2": { "fill": "inherit" }, + "highway-secondary-link-stroke1": { "fill": "currentColor" }, + "highway-secondary-link-stroke2": { "fill": "currentColor" }, + "highway-secondary-link-stroke3": { "fill": "currentColor" }, + "highway-tertiary-link-casing1": { "fill": "inherit" }, + "highway-tertiary-link-casing2": { "fill": "inherit" }, + "highway-tertiary-link-stroke1": { "fill": "currentColor" }, + "highway-tertiary-link-stroke2": { "fill": "currentColor" }, + "highway-tertiary-link-stroke3": { "fill": "currentColor" }, + + "highway-residential-casing1": { "fill": "inherit" }, + "highway-residential-stroke1": { "fill": "currentColor" }, + "highway-unclassified-casing1": { "fill": "inherit" }, + "highway-unclassified-stroke1": { "fill": "currentColor" }, + "highway-service-casing1": { "fill": "inherit" }, + "highway-service-stroke1": { "fill": "currentColor" }, + "highway-road-casing1": { "fill": "inherit" }, + "highway-road-stroke1": { "fill": "currentColor" }, + "highway-track-casing1": { "fill": "inherit" }, + "highway-track-stroke1": { "fill": "currentColor" }, + "highway-track-stroke2": { "fill": "currentColor" }, + "highway-living-street-casing1": { "fill": "inherit" }, + "highway-living-street-stroke1": { "fill": "currentColor" }, + "highway-path-dashes": { "fill": "inherit" }, + "highway-path-stroke1": { "fill": "currentColor" }, + "highway-path-stroke2": { "fill": "currentColor" }, + "highway-cycleway-dashes": { "fill": "inherit" }, + "highway-cycleway-stroke1": { "fill": "currentColor" }, + "highway-cycleway-stroke2": { "fill": "currentColor" }, + "highway-footway-dashes": { "fill": "inherit" }, + "highway-footway-stroke1": { "fill": "currentColor" }, + "highway-footway-stroke2": { "fill": "currentColor" }, + "highway-bridleway-dashes": { "fill": "inherit" }, + "highway-bridleway-stroke1": { "fill": "currentColor" }, + "highway-bridleway-stroke2": { "fill": "currentColor" }, + "highway-steps-dashes": { "fill": "inherit" }, + "highway-steps-stroke1": { "fill": "currentColor" }, + "highway-steps-stroke2": { "fill": "currentColor" }, + "highway-steps-stroke3": { "fill": "currentColor" }, + "railway-rail": { "viewBox": "480 80 60 60" }, "railway-disused": { "viewBox": "540 80 60 60" }, "railway-abandoned": { "viewBox": "600 80 60 60" }, @@ -83,21 +155,59 @@ "railway-light-rail": { "viewBox": "720 80 60 60" }, "railway-monorail": { "viewBox": "0 140 60 60" }, + "railway-rail-dashes": { "fill": "inherit" }, + "railway-rail-stroke": { "fill": "currentColor" }, + "railway-disused-dashes": { "fill": "inherit" }, + "railway-disused-stroke": { "fill": "currentColor" }, + "railway-abandoned-dashes": { "fill": "inherit" }, + "railway-abandoned-stroke": { "fill": "currentColor" }, + "railway-subway-dashes": { "fill": "inherit" }, + "railway-subway-stroke": { "fill": "currentColor" }, + "railway-light-rail-dashes": { "fill": "inherit" }, + "railway-light-rail-stroke": { "fill": "currentColor" }, + "railway-monorail-dashes": { "fill": "inherit" }, + "railway-monorail-stroke": { "fill": "currentColor" }, + "waterway-river": { "viewBox": "60 140 60 60" }, "waterway-stream": { "viewBox": "120 140 60 60" }, "waterway-canal": { "viewBox": "180 140 60 60" }, "waterway-ditch": { "viewBox": "240 140 60 60" }, + "waterway-river-stroke1": { "fill": "currentColor" }, + "waterway-river-stroke2": { "fill": "currentColor" }, + "waterway-river-stroke3": { "fill": "currentColor" }, + "waterway-stream-stroke1": { "fill": "currentColor" }, + "waterway-stream-stroke2": { "fill": "currentColor" }, + "waterway-stream-stroke3": { "fill": "currentColor" }, + "waterway-canal-stroke1": { "fill": "currentColor" }, + "waterway-canal-stroke2": { "fill": "currentColor" }, + "waterway-canal-stroke3": { "fill": "currentColor" }, + "waterway-ditch-stroke1": { "fill": "currentColor" }, + "waterway-ditch-stroke2": { "fill": "currentColor" }, + "power-line": { "viewBox": "300 140 60 60" }, "other-line": { "viewBox": "360 140 60 60" }, + "power-line-stroke": { "fill": "currentColor" }, + "other-line-casing1": { "fill": "inherit" }, + "other-line-stroke1": { "fill": "currentColor" }, + "category-roads": { "viewBox": "420 140 60 60" }, "category-rail": { "viewBox": "480 140 60 60" }, "category-path": { "viewBox": "540 140 60 60" }, "category-water": { "viewBox": "600 140 60 60" }, - "ferry": { "viewBox": "660 140 60 60" }, - "pipeline": { "viewBox": "720 140 60 60" }, + "category-path-stroke": { "fill": "currentColor" }, + "category-water-stroke1": { "fill": "currentColor" }, + "category-water-stroke2": { "fill": "currentColor" }, + + "ferry-line": { "viewBox": "660 140 60 60" }, + "pipeline-line": { "viewBox": "720 140 60 60" }, + + "ferry-line-dashes": { "fill": "inherit" }, + "ferry-line-stroke1": { "fill": "currentColor" }, + "ferry-line-stroke2": { "fill": "currentColor" }, + "pipeline-line-stroke": { "fill": "currentColor" }, "relation": { "viewBox": "0 200 60 60" }, "boundary": { "viewBox": "60 200 60 60" }, @@ -114,6 +224,10 @@ "route-pipeline": { "viewBox": "720 200 60 60" }, "route-master": { "viewBox": "0 260 60 60" }, + "route-bicycle-stroke": { "fill": "currentColor" }, + "route-foot-stroke": { "fill": "currentColor" }, + "route-ferry-stroke": { "fill": "currentColor" }, + "restriction-no-straight-on": { "viewBox": "60 260 60 60" }, "restriction-no-u-turn": { "viewBox": "120 260 60 60" }, "restriction-no-left-turn": { "viewBox": "180 260 60 60" }, diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw index 40db00886..e2ced4201 100644 Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg index 7e159dbba..76ce7911c 100644 --- a/svg/iD-sprite.src.svg +++ b/svg/iD-sprite.src.svg @@ -406,7 +406,7 @@ - + @@ -518,11 +518,7 @@ - - - - - + @@ -543,7 +539,7 @@ - + @@ -648,45 +644,29 @@ - + - - - - - - - - - - + + + - - - - - - - - - + + + + - - - - - - + + - + @@ -695,137 +675,73 @@ - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + + + - - - - - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - @@ -833,16 +749,9 @@ - - - - - - - - + + - @@ -851,113 +760,54 @@ - - - - - - - - + + - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - + + + - - - - - - - - - - - - - + + + - - - - - - - - - - + + + - - - - - - - - - + + - - + @@ -965,38 +815,30 @@ - - - - - - - + + + + + + - - - - - - - - - + + + + + + + - + - - - - - - - - - - + + + + + @@ -1006,24 +848,18 @@ - - - - - - + + - - - - + + @@ -1034,70 +870,65 @@ - - - + + - + - - + + - - + + - - + - - + + - - + + - - - + - - + + - - + + - @@ -1105,117 +936,96 @@ - - + - - + + - - + + - - - - - - - - - + - - - - - + + + + + + + + + + + - - - - - - - - - + + - - + - - + + - - + - - + + - - - - + - - + + - - - - + - - + + - - - - +