CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-25 15:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore iD-sprite preset icons

Browse Source
This commit is contained in:
Bryan Housel
2015-10-30 16:23:08 -04:00
parent 53deaad7af
commit 27439208b1
7 changed files with 34 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
css/app.css
View File

@@ -861,8 +861,8 @@ a:hover .icon.out-link { background-position: -500px -14px;}
.preset-icon {
position: absolute;
top: 17px;
left: 17px;
top: 0px;
left: 0px;
margin: auto;
}
@@ -883,10 +883,9 @@ a:hover .icon.out-link { background-position: -500px -14px;}
margin: auto;
}
.preset-icon-line,
.preset-icon-relation {
top: 0;
left: 0;
.preset-icon .icon {
width: 60px;
height: 60px;
}
.preset-icon-frame .icon {

1
css/feature-icons.css
View File

@@ -1,6 +1,5 @@
/* This file is generated by make. Do NOT edit manually. */
.preset-icon{background-image:url(img/maki-sprite.png);background-repeat:no-repeat;width:24px;height:24px;}
.feature-circle-stroked{background-position:-0px -0px;}
.feature-circle{background-position:-54px -0px;}
.feature-square-stroked{background-position:-108px -0px;}

2
data/maki_sprite.js
View File

@@ -6,8 +6,6 @@ var maki = require('maki/www/maki-sprite.json');
// Generate CSS
var template = '.feature-{name}{background-position:-{x}px -{y}px;}\n';
var css = "/* This file is generated by make. Do NOT edit manually. */\n\n";
css += ".preset-icon{background-image:url(img/maki-sprite.png);background-repeat:no-repeat;width:24px;height:24px;}\n";
var images = {};
_.forEach(maki, function(dimensions, name) {

40
dist/img/iD-sprite.svg vendored
View File

@@ -211,39 +211,19 @@
<symbol id="multipolygon" viewBox="540 260 60 60">
<g id="g24832">
<g id="g24743">
<g id="rect19454">
<path d="M551.5,270.5 L589.5,270.5 L589.5,308.5 L551.5,308.5 z" fill="#F2F2F2"/>
<path d="M551.5,270.5 L589.5,270.5 L589.5,308.5 L551.5,308.5 z" fill-opacity="0" stroke="#AAAAAA" stroke-width="1"/>
</g>
<g id="g20247-4">
<path d="M555,308.5 C555,310.433 553.433,312 551.5,312 C549.567,312 548,310.433 548,308.5 C548,306.567 549.567,305 551.5,305 C553.433,305 555,306.567 555,308.5 z" fill="#000000" id="path20243-7" opacity="0.2"/>
<path d="M554,308.5 C554,309.881 552.881,311 551.5,311 C550.119,311 549,309.881 549,308.5 C549,307.119 550.119,306 551.5,306 C552.881,306 554,307.119 554,308.5 z" fill="#FFFFFF" id="path20245-0"/>
</g>
<g id="g20285">
<path d="M555,270.5 C555,272.433 553.433,274 551.5,274 C549.567,274 548,272.433 548,270.5 C548,268.567 549.567,267 551.5,267 C553.433,267 555,268.567 555,270.5 z" fill="#000000" id="path20287" opacity="0.2"/>
<path d="M554,270.5 C554,271.881 552.881,273 551.5,273 C550.119,273 549,271.881 549,270.5 C549,269.119 550.119,268 551.5,268 C552.881,268 554,269.119 554,270.5 z" fill="#FFFFFF" id="path20289"/>
</g>
<g id="g20301">
<path d="M593,308.5 C593,310.433 591.433,312 589.5,312 C587.567,312 586,310.433 586,308.5 C586,306.567 587.567,305 589.5,305 C591.433,305 593,306.567 593,308.5 z" fill="#000000" id="path20303" opacity="0.2"/>
<path d="M592,308.5 C592,309.881 590.881,311 589.5,311 C588.119,311 587,309.881 587,308.5 C587,307.119 588.119,306 589.5,306 C590.881,306 592,307.119 592,308.5 z" fill="#FFFFFF" id="path20305"/>
</g>
<g id="g20309">
<path d="M593,270.5 C593,272.433 591.433,274 589.5,274 C587.567,274 586,272.433 586,270.5 C586,268.567 587.567,267 589.5,267 C591.433,267 593,268.567 593,270.5 z" fill="#000000" id="path20311" opacity="0.2"/>
<path d="M592,270.5 C592,271.881 590.881,273 589.5,273 C588.119,273 587,271.881 587,270.5 C587,269.119 588.119,268 589.5,268 C590.881,268 592,269.119 592,270.5 z" fill="#FFFFFF" id="path20313"/>
</g>
<g id="rect24790">
<path d="M561.5,280.5 L579.5,280.5 L579.5,298.5 L561.5,298.5 z" fill="#FFFFFF"/>
<path d="M561.5,280.5 L579.5,280.5 L579.5,298.5 L561.5,298.5 z" fill-opacity="0" stroke="#AAAAAA" stroke-width="1" stroke-dasharray="2,1"/>
<path d="M560.5,280.5 L578.5,280.5 L578.5,298.5 L560.5,298.5 z" fill="#FFFFFF"/>
<path d="M560.5,280.5 L578.5,280.5 L578.5,298.5 L560.5,298.5 z" fill-opacity="0" stroke="#AAAAAA" stroke-width="1" stroke-dasharray="2,1"/>
</g>
</g>
<path d="M583,280.5 C583,282.433 581.433,284 579.5,284 C577.567,284 576,282.433 576,280.5 C576,278.567 577.567,277 579.5,277 C581.433,277 583,278.567 583,280.5 z" fill="#000000" id="path20311-4" opacity="0.2"/>
<path d="M582,280.5 C582,281.881 580.881,283 579.5,283 C578.119,283 577,281.881 577,280.5 C577,279.119 578.119,278 579.5,278 C580.881,278 582,279.119 582,280.5 z" fill="#FFFFFF" id="path20313-8"/>
<path d="M565,298.5 C565,300.433 563.433,302 561.5,302 C559.567,302 558,300.433 558,298.5 C558,296.567 559.567,295 561.5,295 C563.433,295 565,296.567 565,298.5 z" fill="#000000" id="path24813" opacity="0.2"/>
<path d="M564,298.5 C564,299.881 562.881,301 561.5,301 C560.119,301 559,299.881 559,298.5 C559,297.119 560.119,296 561.5,296 C562.881,296 564,297.119 564,298.5 z" fill="#FFFFFF" id="path24815"/>
<path d="M565,280.5 C565,282.433 563.433,284 561.5,284 C559.567,284 558,282.433 558,280.5 C558,278.567 559.567,277 561.5,277 C563.433,277 565,278.567 565,280.5 z" fill="#000000" id="path24817" opacity="0.2"/>
<path d="M564,280.5 C564,281.881 562.881,283 561.5,283 C560.119,283 559,281.881 559,280.5 C559,279.119 560.119,278 561.5,278 C562.881,278 564,279.119 564,280.5 z" fill="#FFFFFF" id="path24819"/>
<path d="M583,298.5 C583,300.433 581.433,302 579.5,302 C577.567,302 576,300.433 576,298.5 C576,296.567 577.567,295 579.5,295 C581.433,295 583,296.567 583,298.5 z" fill="#000000" id="path24821" opacity="0.2"/>
<path d="M582,298.5 C582,299.881 580.881,301 579.5,301 C578.119,301 577,299.881 577,298.5 C577,297.119 578.119,296 579.5,296 C580.881,296 582,297.119 582,298.5 z" fill="#FFFFFF" id="path24823"/>
<path d="M582,280.5 C582,282.433 580.433,284 578.5,284 C576.567,284 575,282.433 575,280.5 C575,278.567 576.567,277 578.5,277 C580.433,277 582,278.567 582,280.5 z" fill="#000000" id="path20311-4" opacity="0.2"/>
<path d="M581,280.5 C581,281.881 579.881,283 578.5,283 C577.119,283 576,281.881 576,280.5 C576,279.119 577.119,278 578.5,278 C579.881,278 581,279.119 581,280.5 z" fill="#FFFFFF" id="path20313-8"/>
<path d="M564,298.5 C564,300.433 562.433,302 560.5,302 C558.567,302 557,300.433 557,298.5 C557,296.567 558.567,295 560.5,295 C562.433,295 564,296.567 564,298.5 z" fill="#000000" id="path24813" opacity="0.2"/>
<path d="M563,298.5 C563,299.881 561.881,301 560.5,301 C559.119,301 558,299.881 558,298.5 C558,297.119 559.119,296 560.5,296 C561.881,296 563,297.119 563,298.5 z" fill="#FFFFFF" id="path24815"/>
<path d="M564,280.5 C564,282.433 562.433,284 560.5,284 C558.567,284 557,282.433 557,280.5 C557,278.567 558.567,277 560.5,277 C562.433,277 564,278.567 564,280.5 z" fill="#000000" id="path24817" opacity="0.2"/>
<path d="M563,280.5 C563,281.881 561.881,283 560.5,283 C559.119,283 558,281.881 558,280.5 C558,279.119 559.119,278 560.5,278 C561.881,278 563,279.119 563,280.5 z" fill="#FFFFFF" id="path24819"/>
<path d="M582,298.5 C582,300.433 580.433,302 578.5,302 C576.567,302 575,300.433 575,298.5 C575,296.567 576.567,295 578.5,295 C580.433,295 582,296.567 582,298.5 z" fill="#000000" id="path24821" opacity="0.2"/>
<path d="M581,298.5 C581,299.881 579.881,301 578.5,301 C577.119,301 576,299.881 576,298.5 C576,297.119 577.119,296 578.5,296 C579.881,296 581,297.119 581,298.5 z" fill="#FFFFFF" id="path24823"/>
</g>
</symbol>
<symbol id="restriction" viewBox="480 260 60 60">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 KiB

After

Width:  |  Height:  |  Size: 219 KiB

24
js/id/ui/preset_icon.js
View File

@@ -38,22 +38,16 @@ iD.ui.PresetIcon = function() {
var $icon = selection.selectAll('.preset-icon')
.data([0]);
$icon.enter().append('div');
$icon.enter()
.append('div')
.attr('class', 'preset-icon')
.call(iD.svg.Icon(''));
$icon.attr('class', function() {
var icon = p.icon || (geom === 'line' ? 'other-line' : 'marker-stroked'),
klass = 'feature-' + icon + ' preset-icon';
var featureicon = iD.data.featureIcons[icon];
if (featureicon && featureicon[geom]) {
klass += ' preset-icon-' + geom;
} else if (icon === 'multipolygon') {
// Special case (geometry === 'area')
klass += ' preset-icon-relation';
}
return klass;
});
$icon.selectAll('use')
.attr('href', function() {
var icon = p.icon || (geom === 'line' ? 'other-line' : 'marker-stroked');
return '#' + icon;
});
}
presetIcon.preset = function(_) {

BIN
svg/iD-sprite.idraw
View File

Binary file not shown.

40
svg/iD-sprite.svg
View File

@@ -211,39 +211,19 @@
<g id="multipolygon">
<g id="g24832">
<g id="g24743">
<g id="rect19454">
<path d="M551.5,270.5 L589.5,270.5 L589.5,308.5 L551.5,308.5 z" fill="#F2F2F2"/>
<path d="M551.5,270.5 L589.5,270.5 L589.5,308.5 L551.5,308.5 z" fill-opacity="0" stroke="#AAAAAA" stroke-width="1"/>
</g>
<g id="g20247-4">
<path d="M555,308.5 C555,310.433 553.433,312 551.5,312 C549.567,312 548,310.433 548,308.5 C548,306.567 549.567,305 551.5,305 C553.433,305 555,306.567 555,308.5 z" fill="#000000" id="path20243-7" opacity="0.2"/>
<path d="M554,308.5 C554,309.881 552.881,311 551.5,311 C550.119,311 549,309.881 549,308.5 C549,307.119 550.119,306 551.5,306 C552.881,306 554,307.119 554,308.5 z" fill="#FFFFFF" id="path20245-0"/>
</g>
<g id="g20285">
<path d="M555,270.5 C555,272.433 553.433,274 551.5,274 C549.567,274 548,272.433 548,270.5 C548,268.567 549.567,267 551.5,267 C553.433,267 555,268.567 555,270.5 z" fill="#000000" id="path20287" opacity="0.2"/>
<path d="M554,270.5 C554,271.881 552.881,273 551.5,273 C550.119,273 549,271.881 549,270.5 C549,269.119 550.119,268 551.5,268 C552.881,268 554,269.119 554,270.5 z" fill="#FFFFFF" id="path20289"/>
</g>
<g id="g20301">
<path d="M593,308.5 C593,310.433 591.433,312 589.5,312 C587.567,312 586,310.433 586,308.5 C586,306.567 587.567,305 589.5,305 C591.433,305 593,306.567 593,308.5 z" fill="#000000" id="path20303" opacity="0.2"/>
<path d="M592,308.5 C592,309.881 590.881,311 589.5,311 C588.119,311 587,309.881 587,308.5 C587,307.119 588.119,306 589.5,306 C590.881,306 592,307.119 592,308.5 z" fill="#FFFFFF" id="path20305"/>
</g>
<g id="g20309">
<path d="M593,270.5 C593,272.433 591.433,274 589.5,274 C587.567,274 586,272.433 586,270.5 C586,268.567 587.567,267 589.5,267 C591.433,267 593,268.567 593,270.5 z" fill="#000000" id="path20311" opacity="0.2"/>
<path d="M592,270.5 C592,271.881 590.881,273 589.5,273 C588.119,273 587,271.881 587,270.5 C587,269.119 588.119,268 589.5,268 C590.881,268 592,269.119 592,270.5 z" fill="#FFFFFF" id="path20313"/>
</g>
<g id="rect24790">
<path d="M561.5,280.5 L579.5,280.5 L579.5,298.5 L561.5,298.5 z" fill="#FFFFFF"/>
<path d="M561.5,280.5 L579.5,280.5 L579.5,298.5 L561.5,298.5 z" fill-opacity="0" stroke="#AAAAAA" stroke-width="1" stroke-dasharray="2,1"/>
<path d="M560.5,280.5 L578.5,280.5 L578.5,298.5 L560.5,298.5 z" fill="#FFFFFF"/>
<path d="M560.5,280.5 L578.5,280.5 L578.5,298.5 L560.5,298.5 z" fill-opacity="0" stroke="#AAAAAA" stroke-width="1" stroke-dasharray="2,1"/>
</g>
</g>
<path d="M583,280.5 C583,282.433 581.433,284 579.5,284 C577.567,284 576,282.433 576,280.5 C576,278.567 577.567,277 579.5,277 C581.433,277 583,278.567 583,280.5 z" fill="#000000" id="path20311-4" opacity="0.2"/>
<path d="M582,280.5 C582,281.881 580.881,283 579.5,283 C578.119,283 577,281.881 577,280.5 C577,279.119 578.119,278 579.5,278 C580.881,278 582,279.119 582,280.5 z" fill="#FFFFFF" id="path20313-8"/>
<path d="M565,298.5 C565,300.433 563.433,302 561.5,302 C559.567,302 558,300.433 558,298.5 C558,296.567 559.567,295 561.5,295 C563.433,295 565,296.567 565,298.5 z" fill="#000000" id="path24813" opacity="0.2"/>
<path d="M564,298.5 C564,299.881 562.881,301 561.5,301 C560.119,301 559,299.881 559,298.5 C559,297.119 560.119,296 561.5,296 C562.881,296 564,297.119 564,298.5 z" fill="#FFFFFF" id="path24815"/>
<path d="M565,280.5 C565,282.433 563.433,284 561.5,284 C559.567,284 558,282.433 558,280.5 C558,278.567 559.567,277 561.5,277 C563.433,277 565,278.567 565,280.5 z" fill="#000000" id="path24817" opacity="0.2"/>
<path d="M564,280.5 C564,281.881 562.881,283 561.5,283 C560.119,283 559,281.881 559,280.5 C559,279.119 560.119,278 561.5,278 C562.881,278 564,279.119 564,280.5 z" fill="#FFFFFF" id="path24819"/>
<path d="M583,298.5 C583,300.433 581.433,302 579.5,302 C577.567,302 576,300.433 576,298.5 C576,296.567 577.567,295 579.5,295 C581.433,295 583,296.567 583,298.5 z" fill="#000000" id="path24821" opacity="0.2"/>
<path d="M582,298.5 C582,299.881 580.881,301 579.5,301 C578.119,301 577,299.881 577,298.5 C577,297.119 578.119,296 579.5,296 C580.881,296 582,297.119 582,298.5 z" fill="#FFFFFF" id="path24823"/>
<path d="M582,280.5 C582,282.433 580.433,284 578.5,284 C576.567,284 575,282.433 575,280.5 C575,278.567 576.567,277 578.5,277 C580.433,277 582,278.567 582,280.5 z" fill="#000000" id="path20311-4" opacity="0.2"/>
<path d="M581,280.5 C581,281.881 579.881,283 578.5,283 C577.119,283 576,281.881 576,280.5 C576,279.119 577.119,278 578.5,278 C579.881,278 581,279.119 581,280.5 z" fill="#FFFFFF" id="path20313-8"/>
<path d="M564,298.5 C564,300.433 562.433,302 560.5,302 C558.567,302 557,300.433 557,298.5 C557,296.567 558.567,295 560.5,295 C562.433,295 564,296.567 564,298.5 z" fill="#000000" id="path24813" opacity="0.2"/>
<path d="M563,298.5 C563,299.881 561.881,301 560.5,301 C559.119,301 558,299.881 558,298.5 C558,297.119 559.119,296 560.5,296 C561.881,296 563,297.119 563,298.5 z" fill="#FFFFFF" id="path24815"/>
<path d="M564,280.5 C564,282.433 562.433,284 560.5,284 C558.567,284 557,282.433 557,280.5 C557,278.567 558.567,277 560.5,277 C562.433,277 564,278.567 564,280.5 z" fill="#000000" id="path24817" opacity="0.2"/>
<path d="M563,280.5 C563,281.881 561.881,283 560.5,283 C559.119,283 558,281.881 558,280.5 C558,279.119 559.119,278 560.5,278 C561.881,278 563,279.119 563,280.5 z" fill="#FFFFFF" id="path24819"/>
<path d="M582,298.5 C582,300.433 580.433,302 578.5,302 C576.567,302 575,300.433 575,298.5 C575,296.567 576.567,295 578.5,295 C580.433,295 582,296.567 582,298.5 z" fill="#000000" id="path24821" opacity="0.2"/>
<path d="M581,298.5 C581,299.881 579.881,301 578.5,301 C577.119,301 576,299.881 576,298.5 C576,297.119 577.119,296 578.5,296 C579.881,296 581,297.119 581,298.5 z" fill="#FFFFFF" id="path24823"/>
</g>
</g>
<g id="restriction">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 KiB

After

Width:  |  Height:  |  Size: 214 KiB