From 21c89f22dc3f83162ccfdb635aa33362513ffd54 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Fri, 19 Apr 2013 12:27:57 -0400 Subject: [PATCH] export line preset sprite straight from inkscape We could also use an svg sprite, just swapping the one line in line-presets.css, but it seemed to make scrolling the preset grid significantly less smooth in Firefox. --- Makefile | 3 +++ css/line-presets.css | 54 ++++++++++++++++++++++++++++++++++++++++ img/line-presets.png | Bin 0 -> 28843 bytes index.html | 1 + index_packaged.html | 1 + js/id/ui/preset_icon.js | 4 ++- js/id/ui/tag_editor.js | 2 -- svg/line-presets.svg | 2 +- 8 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 css/line-presets.css create mode 100644 img/line-presets.png diff --git a/Makefile b/Makefile index 0dc46f02e..91b25f8f3 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,9 @@ translations: data/locales.js: data/locales/*.js cat $^ > $@ +img/line-presets.png: svg/line-presets.svg + inkscape --export-area-page --export-png=img/line-presets.png svg/line-presets.svg + D3_FILES = \ node_modules/d3/src/start.js \ node_modules/d3/src/arrays/index.js \ diff --git a/css/line-presets.css b/css/line-presets.css new file mode 100644 index 000000000..d779b3dca --- /dev/null +++ b/css/line-presets.css @@ -0,0 +1,54 @@ +.preset-line-icon { + background-image: url(../img/line-presets.png); + width: 60px; + height: 60px; + overflow: hidden; + text-indent: -9999px; +} + +/* Roads */ +.preset-line-icon.highway-motorway { background-position: -20px -20px;} +.preset-line-icon.highway-trunk { background-position: -80px -20px;} +.preset-line-icon.highway-primary { background-position: -140px -20px;} +.preset-line-icon.highway-secondary { background-position: -200px -20px;} +.preset-line-icon.highway-tertiary { background-position: -260px -20px;} +.preset-line-icon.highway-motorway-link { background-position: -320px -20px;} +.preset-line-icon.highway-trunk-link { background-position: -380px -20px;} +.preset-line-icon.highway-primary-link { background-position: -440px -20px;} +.preset-line-icon.highway-secondary-link { background-position: -500px -20px;} +.preset-line-icon.highway-tertiary-link { background-position: -560px -20px;} +.preset-line-icon.highway-residential { background-position: -620px -20px;} +.preset-line-icon.highway-unclassified { background-position: -680px -20px;} +.preset-line-icon.highway-service { background-position: -740px -20px;} +.preset-line-icon.highway-road { background-position: -800px -20px;} +.preset-line-icon.highway-track { background-position: -860px -20px;} +.preset-line-icon.highway-living-street { background-position: -920px -20px;} +.preset-line-icon.highway-path { background-position: -980px -20px;} +.preset-line-icon.highway-cycleway { background-position: -1040px -20px;} +.preset-line-icon.highway-footway { background-position: -1100px -20px;} +.preset-line-icon.highway-bridleway { background-position: -1160px -20px;} +.preset-line-icon.highway-steps { background-position: -1220px -20px;} + +/* Railway */ +.preset-line-icon.railway-rail { background-position: -1280px -20px;} +.preset-line-icon.railway-disused { background-position: -1340px -20px;} +.preset-line-icon.railway-abandoned { background-position: -1400px -20px;} +.preset-line-icon.railway-subway { background-position: -1460px -20px;} +.preset-line-icon.railway-light-rail { background-position: -1520px -20px;} +.preset-line-icon.railway-monorail { background-position: -1580px -20px;} + +/* Waterway */ +.preset-line-icon.waterway-river { background-position: -1640px -20px;} +.preset-line-icon.waterway-stream { background-position: -1700px -20px;} +.preset-line-icon.waterway-canal { background-position: -1760px -20px;} +.preset-line-icon.waterway-ditch { background-position: -1820px -20px;} + +.preset-line-icon.power-line { background-position: -1880px -20px;} + +.preset-line-icon.other-line { background-position: -1940px -20px;} + +.preset-line-icon.category-roads { background-position: -2000px -20px;} +.preset-line-icon.category-rail { background-position: -2060px -20px;} +.preset-line-icon.category-path { background-position: -2120px -20px;} +.preset-line-icon.category-water { background-position: -2180px -20px;} + diff --git a/img/line-presets.png b/img/line-presets.png new file mode 100644 index 0000000000000000000000000000000000000000..96664a5a38abd1524bdf748fb934435a3fa9e643 GIT binary patch literal 28843 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𝔏3H&=p9$AdJb)(O>ZTic(wc573Sz__wO0%^ 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%0DCh%g9=8`V`tsH7=MlX_G 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 + diff --git a/index_packaged.html b/index_packaged.html index 670280016..1000b5b12 100644 --- a/index_packaged.html +++ b/index_packaged.html @@ -7,6 +7,7 @@ + diff --git a/js/id/ui/preset_icon.js b/js/id/ui/preset_icon.js index fb3437dae..5877bc262 100644 --- a/js/id/ui/preset_icon.js +++ b/js/id/ui/preset_icon.js @@ -13,7 +13,9 @@ iD.ui.PresetIcon = function(geometry) { selection.append('div') .attr('class', function(preset) { - return 'feature-' + (preset.icon || fallbackIcon) + ' icon preset-icon preset-icon-' + geometry; + return (geometry === 'line' ? 'preset-line-icon ' : 'feature-') + + (preset.icon || fallbackIcon) + + ' preset-icon preset-icon-' + geometry; }); }; }; diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js index 576b2fa14..ea47aae3c 100644 --- a/js/id/ui/tag_editor.js +++ b/js/id/ui/tag_editor.js @@ -36,8 +36,6 @@ iD.ui.TagEditor = function(context, entity) { .append('span') .attr('class', 'icon back'); - var icon = preset.icon || (geometry === 'line' ? 'other-line' : 'marker-stroked'); - messagewrap.append('h3') .attr('class', 'inspector-inner') .text(t('inspector.editing_feature', { feature: preset.name() })); diff --git a/svg/line-presets.svg b/svg/line-presets.svg index 405d77371..62b471f49 100644 --- a/svg/line-presets.svg +++ b/svg/line-presets.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="100" + width="3000" height="100" id="svg7013" version="1.1"