diff --git a/Makefile b/Makefile index 6f0c6f775..f3c230dda 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,6 @@ MAKI_TARGETS = \ data/feature-icons.json MAKI_SOURCES = \ - data/line-icons.json \ - data/relation-icons.json \ node_modules/maki/www/maki-sprite.json \ dist/img/maki-sprite.png diff --git a/build.js b/build.js index b5b0d9ad8..7dbb62505 100644 --- a/build.js +++ b/build.js @@ -296,7 +296,6 @@ fs.writeFileSync('data/data.js', 'iD.data = ' + stringify({ wikipedia: r('wikipedia.json'), imperial: r('imperial.json'), featureIcons: r('feature-icons.json'), - operations: r('operations-sprite.json'), locales: r('locales.json'), en: read('dist/locales/en.json'), suggestions: r('name-suggestions.json'), diff --git a/css/app.css b/css/app.css index 74585ff7a..f941353f0 100644 --- a/css/app.css +++ b/css/app.css @@ -2910,12 +2910,12 @@ div.full-screen > button:hover { } .radial-menu-item circle { - fill: white; + fill: #eee; } .radial-menu-item circle:active, .radial-menu-item circle:hover { - fill: #eaeaea; + fill: #fff; } .radial-menu-item.disabled circle { @@ -2923,12 +2923,14 @@ div.full-screen > button:hover { fill: rgba(255,255,255,.5); } -.radial-menu-item.enabled use { +.radial-menu-item use { fill: #222; + color: #79f; } .radial-menu-item.disabled use { fill: rgba(32,32,32,.5); + color: rgba(40,40,40,.5); } .lasso-box { diff --git a/css/feature-icons.css b/css/feature-icons.css index 16992c6a0..8104851ad 100644 --- a/css/feature-icons.css +++ b/css/feature-icons.css @@ -1,8 +1,6 @@ /* 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;} -.preset-icon-line{background-image:url(img/line-presets.png);background-repeat:no-repeat;width:60px;height:60px;} -.preset-icon-relation{background-image:url(img/relation-presets.png);background-repeat:no-repeat;width:60px;height:60px;} .feature-circle-stroked{background-position:-0px -0px;} .feature-circle{background-position:-54px -0px;} .feature-square-stroked{background-position:-108px -0px;} @@ -119,65 +117,3 @@ .feature-scooter{background-position:-162px -528px;} .feature-gift{background-position:-216px -528px;} .feature-ice-cream{background-position:-0px -552px;} -.preset-icon-line.feature-highway-motorway{background-position:-20px -25px;} -.preset-icon-line.feature-highway-trunk{background-position:-80px -25px;} -.preset-icon-line.feature-highway-primary{background-position:-140px -25px;} -.preset-icon-line.feature-highway-secondary{background-position:-200px -25px;} -.preset-icon-line.feature-highway-tertiary{background-position:-260px -25px;} -.preset-icon-line.feature-highway-motorway-link{background-position:-320px -25px;} -.preset-icon-line.feature-highway-trunk-link{background-position:-380px -25px;} -.preset-icon-line.feature-highway-primary-link{background-position:-440px -25px;} -.preset-icon-line.feature-highway-secondary-link{background-position:-500px -25px;} -.preset-icon-line.feature-highway-tertiary-link{background-position:-560px -25px;} -.preset-icon-line.feature-highway-residential{background-position:-620px -25px;} -.preset-icon-line.feature-highway-unclassified{background-position:-680px -25px;} -.preset-icon-line.feature-highway-service{background-position:-740px -25px;} -.preset-icon-line.feature-highway-road{background-position:-800px -25px;} -.preset-icon-line.feature-highway-track{background-position:-860px -25px;} -.preset-icon-line.feature-highway-living-street{background-position:-920px -25px;} -.preset-icon-line.feature-highway-path{background-position:-980px -25px;} -.preset-icon-line.feature-highway-cycleway{background-position:-1040px -25px;} -.preset-icon-line.feature-highway-footway{background-position:-1100px -25px;} -.preset-icon-line.feature-highway-bridleway{background-position:-1160px -25px;} -.preset-icon-line.feature-highway-steps{background-position:-1220px -25px;} -.preset-icon-line.feature-railway-rail{background-position:-1280px -25px;} -.preset-icon-line.feature-railway-disused{background-position:-1340px -25px;} -.preset-icon-line.feature-railway-abandoned{background-position:-1400px -25px;} -.preset-icon-line.feature-railway-subway{background-position:-1460px -25px;} -.preset-icon-line.feature-railway-light-rail{background-position:-1520px -25px;} -.preset-icon-line.feature-railway-monorail{background-position:-1580px -25px;} -.preset-icon-line.feature-waterway-river{background-position:-1640px -25px;} -.preset-icon-line.feature-waterway-stream{background-position:-1700px -25px;} -.preset-icon-line.feature-waterway-canal{background-position:-1760px -25px;} -.preset-icon-line.feature-waterway-ditch{background-position:-1820px -25px;} -.preset-icon-line.feature-power-line{background-position:-1880px -25px;} -.preset-icon-line.feature-other-line{background-position:-1940px -25px;} -.preset-icon-line.feature-category-roads{background-position:-2000px -25px;} -.preset-icon-line.feature-category-rail{background-position:-2060px -25px;} -.preset-icon-line.feature-category-path{background-position:-2120px -25px;} -.preset-icon-line.feature-category-water{background-position:-2180px -25px;} -.preset-icon-line.feature-ferry{background-position:-2240px -25px;} -.preset-icon-line.feature-pipeline{background-position:-2300px -25px;} -.preset-icon-relation.feature-relation{background-position:-20px -25px;} -.preset-icon-relation.feature-restriction{background-position:-80px -25px;} -.preset-icon-relation.feature-multipolygon{background-position:-141px -25px;} -.preset-icon-relation.feature-boundary{background-position:-200px -25px;} -.preset-icon-relation.feature-route{background-position:-260px -25px;} -.preset-icon-relation.feature-route-road{background-position:-320px -25px;} -.preset-icon-relation.feature-route-bicycle{background-position:-380px -25px;} -.preset-icon-relation.feature-route-foot{background-position:-440px -25px;} -.preset-icon-relation.feature-route-bus{background-position:-500px -25px;} -.preset-icon-relation.feature-route-train{background-position:-560px -25px;} -.preset-icon-relation.feature-route-detour{background-position:-620px -25px;} -.preset-icon-relation.feature-route-tram{background-position:-680px -25px;} -.preset-icon-relation.feature-route-ferry{background-position:-740px -25px;} -.preset-icon-relation.feature-route-power{background-position:-800px -25px;} -.preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;} -.preset-icon-relation.feature-route-master{background-position:-920px -25px;} -.preset-icon-relation.feature-restriction-no-straight-on{background-position:-980px -25px;} -.preset-icon-relation.feature-restriction-no-u-turn{background-position:-1040px -25px;} -.preset-icon-relation.feature-restriction-no-left-turn{background-position:-1100px -25px;} -.preset-icon-relation.feature-restriction-no-right-turn{background-position:-1160px -25px;} -.preset-icon-relation.feature-restriction-only-straight-on{background-position:-1220px -25px;} -.preset-icon-relation.feature-restriction-only-left-turn{background-position:-1280px -25px;} -.preset-icon-relation.feature-restriction-only-right-turn{background-position:-1340px -25px;} diff --git a/css/map.css b/css/map.css index 83b8bcc4c..173d4a21b 100644 --- a/css/map.css +++ b/css/map.css @@ -21,10 +21,6 @@ img.tile-removing { opacity: 0; } -/* allow overrideable fill for svg sprite icons */ -#defs path { fill: inherit; } - -/*path { fill: none; }*/ use { pointer-events: none; } /* base styles */ diff --git a/data/data_dev.js b/data/data_dev.js index 1fe20914c..28b05691c 100644 --- a/data/data_dev.js +++ b/data/data_dev.js @@ -15,7 +15,6 @@ iD.data = { path + 'data/presets/fields.json', path + 'data/imperial.json', path + 'data/feature-icons.json', - path + 'data/operations-sprite.json', path + 'data/locales.json', path + 'dist/locales/en.json', path + 'data/name-suggestions.json', @@ -35,11 +34,10 @@ iD.data = { }, imperial: data[8], featureIcons: data[9], - operations: data[10], - locales: data[11], - en: data[12], - suggestions: data[13], - addressFormats: data[14] + locales: data[10], + en: data[11], + suggestions: data[12], + addressFormats: data[13] }; callback(); diff --git a/data/feature-icons.json b/data/feature-icons.json index d70fe6b85..31b51dd52 100644 --- a/data/feature-icons.json +++ b/data/feature-icons.json @@ -1 +1 @@ -{"circle-stroked":{"12":[42,0],"18":[24,0],"24":[0,0]},"circle":{"12":[96,0],"18":[78,0],"24":[54,0]},"square-stroked":{"12":[150,0],"18":[132,0],"24":[108,0]},"square":{"12":[204,0],"18":[186,0],"24":[162,0]},"triangle-stroked":{"12":[258,0],"18":[240,0],"24":[216,0]},"triangle":{"12":[42,24],"18":[24,24],"24":[0,24]},"star-stroked":{"12":[96,24],"18":[78,24],"24":[54,24]},"star":{"12":[150,24],"18":[132,24],"24":[108,24]},"cross":{"12":[204,24],"18":[186,24],"24":[162,24]},"marker-stroked":{"12":[258,24],"18":[240,24],"24":[216,24]},"marker":{"12":[42,48],"18":[24,48],"24":[0,48]},"religious-jewish":{"12":[96,48],"18":[78,48],"24":[54,48]},"religious-christian":{"12":[150,48],"18":[132,48],"24":[108,48]},"religious-muslim":{"12":[204,48],"18":[186,48],"24":[162,48]},"cemetery":{"12":[258,48],"18":[240,48],"24":[216,48]},"rocket":{"12":[42,72],"18":[24,72],"24":[0,72]},"airport":{"12":[96,72],"18":[78,72],"24":[54,72]},"heliport":{"12":[150,72],"18":[132,72],"24":[108,72]},"rail":{"12":[204,72],"18":[186,72],"24":[162,72]},"rail-metro":{"12":[258,72],"18":[240,72],"24":[216,72]},"rail-light":{"12":[42,96],"18":[24,96],"24":[0,96]},"bus":{"12":[96,96],"18":[78,96],"24":[54,96]},"fuel":{"12":[150,96],"18":[132,96],"24":[108,96]},"parking":{"12":[204,96],"18":[186,96],"24":[162,96]},"parking-garage":{"12":[258,96],"18":[240,96],"24":[216,96]},"airfield":{"12":[42,120],"18":[24,120],"24":[0,120]},"roadblock":{"12":[96,120],"18":[78,120],"24":[54,120]},"ferry":{"12":[150,120],"18":[132,120],"24":[108,120],"line":[2240,25]},"harbor":{"12":[204,120],"18":[186,120],"24":[162,120]},"bicycle":{"12":[258,120],"18":[240,120],"24":[216,120]},"park":{"12":[42,144],"18":[24,144],"24":[0,144]},"park2":{"12":[96,144],"18":[78,144],"24":[54,144]},"museum":{"12":[150,144],"18":[132,144],"24":[108,144]},"lodging":{"12":[204,144],"18":[186,144],"24":[162,144]},"monument":{"12":[258,144],"18":[240,144],"24":[216,144]},"zoo":{"12":[42,168],"18":[24,168],"24":[0,168]},"garden":{"12":[96,168],"18":[78,168],"24":[54,168]},"campsite":{"12":[150,168],"18":[132,168],"24":[108,168]},"theatre":{"12":[204,168],"18":[186,168],"24":[162,168]},"art-gallery":{"12":[258,168],"18":[240,168],"24":[216,168]},"pitch":{"12":[42,192],"18":[24,192],"24":[0,192]},"soccer":{"12":[96,192],"18":[78,192],"24":[54,192]},"america-football":{"12":[150,192],"18":[132,192],"24":[108,192]},"tennis":{"12":[204,192],"18":[186,192],"24":[162,192]},"basketball":{"12":[258,192],"18":[240,192],"24":[216,192]},"baseball":{"12":[42,216],"18":[24,216],"24":[0,216]},"golf":{"12":[96,216],"18":[78,216],"24":[54,216]},"swimming":{"12":[150,216],"18":[132,216],"24":[108,216]},"cricket":{"12":[204,216],"18":[186,216],"24":[162,216]},"skiing":{"12":[258,216],"18":[240,216],"24":[216,216]},"school":{"12":[42,240],"18":[24,240],"24":[0,240]},"college":{"12":[96,240],"18":[78,240],"24":[54,240]},"library":{"12":[150,240],"18":[132,240],"24":[108,240]},"post":{"12":[204,240],"18":[186,240],"24":[162,240]},"fire-station":{"12":[258,240],"18":[240,240],"24":[216,240]},"town-hall":{"12":[42,264],"18":[24,264],"24":[0,264]},"police":{"12":[96,264],"18":[78,264],"24":[54,264]},"prison":{"12":[150,264],"18":[132,264],"24":[108,264]},"embassy":{"12":[204,264],"18":[186,264],"24":[162,264]},"beer":{"12":[258,264],"18":[240,264],"24":[216,264]},"restaurant":{"12":[42,288],"18":[24,288],"24":[0,288]},"cafe":{"12":[96,288],"18":[78,288],"24":[54,288]},"shop":{"12":[150,288],"18":[132,288],"24":[108,288]},"fast-food":{"12":[204,288],"18":[186,288],"24":[162,288]},"bar":{"12":[258,288],"18":[240,288],"24":[216,288]},"bank":{"12":[42,312],"18":[24,312],"24":[0,312]},"grocery":{"12":[96,312],"18":[78,312],"24":[54,312]},"cinema":{"12":[150,312],"18":[132,312],"24":[108,312]},"pharmacy":{"12":[204,312],"18":[186,312],"24":[162,312]},"hospital":{"12":[258,312],"18":[240,312],"24":[216,312]},"danger":{"12":[42,336],"18":[24,336],"24":[0,336]},"industrial":{"12":[96,336],"18":[78,336],"24":[54,336]},"warehouse":{"12":[150,336],"18":[132,336],"24":[108,336]},"commercial":{"12":[204,336],"18":[186,336],"24":[162,336]},"building":{"12":[258,336],"18":[240,336],"24":[216,336]},"place-of-worship":{"12":[42,360],"18":[24,360],"24":[0,360]},"alcohol-shop":{"12":[96,360],"18":[78,360],"24":[54,360]},"logging":{"12":[150,360],"18":[132,360],"24":[108,360]},"oil-well":{"12":[204,360],"18":[186,360],"24":[162,360]},"slaughterhouse":{"12":[258,360],"18":[240,360],"24":[216,360]},"dam":{"12":[42,384],"18":[24,384],"24":[0,384]},"water":{"12":[96,384],"18":[78,384],"24":[54,384]},"wetland":{"12":[150,384],"18":[132,384],"24":[108,384]},"disability":{"12":[204,384],"18":[186,384],"24":[162,384]},"telephone":{"12":[258,384],"18":[240,384],"24":[216,384]},"emergency-telephone":{"12":[42,408],"18":[24,408],"24":[0,408]},"toilets":{"12":[96,408],"18":[78,408],"24":[54,408]},"waste-basket":{"12":[150,408],"18":[132,408],"24":[108,408]},"music":{"12":[204,408],"18":[186,408],"24":[162,408]},"land-use":{"12":[258,408],"18":[240,408],"24":[216,408]},"city":{"12":[42,432],"18":[24,432],"24":[0,432]},"town":{"12":[96,432],"18":[78,432],"24":[54,432]},"village":{"12":[150,432],"18":[132,432],"24":[108,432]},"farm":{"12":[204,432],"18":[186,432],"24":[162,432]},"bakery":{"12":[258,432],"18":[240,432],"24":[216,432]},"dog-park":{"12":[42,456],"18":[24,456],"24":[0,456]},"lighthouse":{"12":[96,456],"18":[78,456],"24":[54,456]},"clothing-store":{"12":[150,456],"18":[132,456],"24":[108,456]},"polling-place":{"12":[204,456],"18":[186,456],"24":[162,456]},"playground":{"12":[258,456],"18":[240,456],"24":[216,456]},"entrance":{"12":[42,480],"18":[24,480],"24":[0,480]},"heart":{"12":[96,480],"18":[78,480],"24":[54,480]},"london-underground":{"12":[150,480],"18":[132,480],"24":[108,480]},"minefield":{"12":[204,480],"18":[186,480],"24":[162,480]},"rail-underground":{"12":[258,480],"18":[240,480],"24":[216,480]},"rail-above":{"12":[42,504],"18":[24,504],"24":[0,504]},"camera":{"12":[96,504],"18":[78,504],"24":[54,504]},"laundry":{"12":[150,504],"18":[132,504],"24":[108,504]},"car":{"12":[204,504],"18":[186,504],"24":[162,504]},"suitcase":{"12":[258,504],"18":[240,504],"24":[216,504]},"hairdresser":{"12":[42,528],"18":[24,528],"24":[0,528]},"chemist":{"12":[96,528],"18":[78,528],"24":[54,528]},"mobilephone":{"12":[150,528],"18":[132,528],"24":[108,528]},"scooter":{"12":[204,528],"18":[186,528],"24":[162,528]},"gift":{"12":[258,528],"18":[240,528],"24":[216,528]},"ice-cream":{"12":[42,552],"18":[24,552],"24":[0,552]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]},"pipeline":{"line":[2300,25]},"relation":{"relation":[20,25]},"restriction":{"relation":[80,25]},"multipolygon":{"relation":[141,25]},"boundary":{"relation":[200,25]},"route":{"relation":[260,25]},"route-road":{"relation":[320,25]},"route-bicycle":{"relation":[380,25]},"route-foot":{"relation":[440,25]},"route-bus":{"relation":[500,25]},"route-train":{"relation":[560,25]},"route-detour":{"relation":[620,25]},"route-tram":{"relation":[680,25]},"route-ferry":{"relation":[740,25]},"route-power":{"relation":[800,25]},"route-pipeline":{"relation":[860,25]},"route-master":{"relation":[920,25]},"restriction-no-straight-on":{"relation":[980,25]},"restriction-no-u-turn":{"relation":[1040,25]},"restriction-no-left-turn":{"relation":[1100,25]},"restriction-no-right-turn":{"relation":[1160,25]},"restriction-only-straight-on":{"relation":[1220,25]},"restriction-only-left-turn":{"relation":[1280,25]},"restriction-only-right-turn":{"relation":[1340,25]}} \ No newline at end of file +{"circle-stroked":{"12":[42,0],"18":[24,0],"24":[0,0]},"circle":{"12":[96,0],"18":[78,0],"24":[54,0]},"square-stroked":{"12":[150,0],"18":[132,0],"24":[108,0]},"square":{"12":[204,0],"18":[186,0],"24":[162,0]},"triangle-stroked":{"12":[258,0],"18":[240,0],"24":[216,0]},"triangle":{"12":[42,24],"18":[24,24],"24":[0,24]},"star-stroked":{"12":[96,24],"18":[78,24],"24":[54,24]},"star":{"12":[150,24],"18":[132,24],"24":[108,24]},"cross":{"12":[204,24],"18":[186,24],"24":[162,24]},"marker-stroked":{"12":[258,24],"18":[240,24],"24":[216,24]},"marker":{"12":[42,48],"18":[24,48],"24":[0,48]},"religious-jewish":{"12":[96,48],"18":[78,48],"24":[54,48]},"religious-christian":{"12":[150,48],"18":[132,48],"24":[108,48]},"religious-muslim":{"12":[204,48],"18":[186,48],"24":[162,48]},"cemetery":{"12":[258,48],"18":[240,48],"24":[216,48]},"rocket":{"12":[42,72],"18":[24,72],"24":[0,72]},"airport":{"12":[96,72],"18":[78,72],"24":[54,72]},"heliport":{"12":[150,72],"18":[132,72],"24":[108,72]},"rail":{"12":[204,72],"18":[186,72],"24":[162,72]},"rail-metro":{"12":[258,72],"18":[240,72],"24":[216,72]},"rail-light":{"12":[42,96],"18":[24,96],"24":[0,96]},"bus":{"12":[96,96],"18":[78,96],"24":[54,96]},"fuel":{"12":[150,96],"18":[132,96],"24":[108,96]},"parking":{"12":[204,96],"18":[186,96],"24":[162,96]},"parking-garage":{"12":[258,96],"18":[240,96],"24":[216,96]},"airfield":{"12":[42,120],"18":[24,120],"24":[0,120]},"roadblock":{"12":[96,120],"18":[78,120],"24":[54,120]},"ferry":{"12":[150,120],"18":[132,120],"24":[108,120]},"harbor":{"12":[204,120],"18":[186,120],"24":[162,120]},"bicycle":{"12":[258,120],"18":[240,120],"24":[216,120]},"park":{"12":[42,144],"18":[24,144],"24":[0,144]},"park2":{"12":[96,144],"18":[78,144],"24":[54,144]},"museum":{"12":[150,144],"18":[132,144],"24":[108,144]},"lodging":{"12":[204,144],"18":[186,144],"24":[162,144]},"monument":{"12":[258,144],"18":[240,144],"24":[216,144]},"zoo":{"12":[42,168],"18":[24,168],"24":[0,168]},"garden":{"12":[96,168],"18":[78,168],"24":[54,168]},"campsite":{"12":[150,168],"18":[132,168],"24":[108,168]},"theatre":{"12":[204,168],"18":[186,168],"24":[162,168]},"art-gallery":{"12":[258,168],"18":[240,168],"24":[216,168]},"pitch":{"12":[42,192],"18":[24,192],"24":[0,192]},"soccer":{"12":[96,192],"18":[78,192],"24":[54,192]},"america-football":{"12":[150,192],"18":[132,192],"24":[108,192]},"tennis":{"12":[204,192],"18":[186,192],"24":[162,192]},"basketball":{"12":[258,192],"18":[240,192],"24":[216,192]},"baseball":{"12":[42,216],"18":[24,216],"24":[0,216]},"golf":{"12":[96,216],"18":[78,216],"24":[54,216]},"swimming":{"12":[150,216],"18":[132,216],"24":[108,216]},"cricket":{"12":[204,216],"18":[186,216],"24":[162,216]},"skiing":{"12":[258,216],"18":[240,216],"24":[216,216]},"school":{"12":[42,240],"18":[24,240],"24":[0,240]},"college":{"12":[96,240],"18":[78,240],"24":[54,240]},"library":{"12":[150,240],"18":[132,240],"24":[108,240]},"post":{"12":[204,240],"18":[186,240],"24":[162,240]},"fire-station":{"12":[258,240],"18":[240,240],"24":[216,240]},"town-hall":{"12":[42,264],"18":[24,264],"24":[0,264]},"police":{"12":[96,264],"18":[78,264],"24":[54,264]},"prison":{"12":[150,264],"18":[132,264],"24":[108,264]},"embassy":{"12":[204,264],"18":[186,264],"24":[162,264]},"beer":{"12":[258,264],"18":[240,264],"24":[216,264]},"restaurant":{"12":[42,288],"18":[24,288],"24":[0,288]},"cafe":{"12":[96,288],"18":[78,288],"24":[54,288]},"shop":{"12":[150,288],"18":[132,288],"24":[108,288]},"fast-food":{"12":[204,288],"18":[186,288],"24":[162,288]},"bar":{"12":[258,288],"18":[240,288],"24":[216,288]},"bank":{"12":[42,312],"18":[24,312],"24":[0,312]},"grocery":{"12":[96,312],"18":[78,312],"24":[54,312]},"cinema":{"12":[150,312],"18":[132,312],"24":[108,312]},"pharmacy":{"12":[204,312],"18":[186,312],"24":[162,312]},"hospital":{"12":[258,312],"18":[240,312],"24":[216,312]},"danger":{"12":[42,336],"18":[24,336],"24":[0,336]},"industrial":{"12":[96,336],"18":[78,336],"24":[54,336]},"warehouse":{"12":[150,336],"18":[132,336],"24":[108,336]},"commercial":{"12":[204,336],"18":[186,336],"24":[162,336]},"building":{"12":[258,336],"18":[240,336],"24":[216,336]},"place-of-worship":{"12":[42,360],"18":[24,360],"24":[0,360]},"alcohol-shop":{"12":[96,360],"18":[78,360],"24":[54,360]},"logging":{"12":[150,360],"18":[132,360],"24":[108,360]},"oil-well":{"12":[204,360],"18":[186,360],"24":[162,360]},"slaughterhouse":{"12":[258,360],"18":[240,360],"24":[216,360]},"dam":{"12":[42,384],"18":[24,384],"24":[0,384]},"water":{"12":[96,384],"18":[78,384],"24":[54,384]},"wetland":{"12":[150,384],"18":[132,384],"24":[108,384]},"disability":{"12":[204,384],"18":[186,384],"24":[162,384]},"telephone":{"12":[258,384],"18":[240,384],"24":[216,384]},"emergency-telephone":{"12":[42,408],"18":[24,408],"24":[0,408]},"toilets":{"12":[96,408],"18":[78,408],"24":[54,408]},"waste-basket":{"12":[150,408],"18":[132,408],"24":[108,408]},"music":{"12":[204,408],"18":[186,408],"24":[162,408]},"land-use":{"12":[258,408],"18":[240,408],"24":[216,408]},"city":{"12":[42,432],"18":[24,432],"24":[0,432]},"town":{"12":[96,432],"18":[78,432],"24":[54,432]},"village":{"12":[150,432],"18":[132,432],"24":[108,432]},"farm":{"12":[204,432],"18":[186,432],"24":[162,432]},"bakery":{"12":[258,432],"18":[240,432],"24":[216,432]},"dog-park":{"12":[42,456],"18":[24,456],"24":[0,456]},"lighthouse":{"12":[96,456],"18":[78,456],"24":[54,456]},"clothing-store":{"12":[150,456],"18":[132,456],"24":[108,456]},"polling-place":{"12":[204,456],"18":[186,456],"24":[162,456]},"playground":{"12":[258,456],"18":[240,456],"24":[216,456]},"entrance":{"12":[42,480],"18":[24,480],"24":[0,480]},"heart":{"12":[96,480],"18":[78,480],"24":[54,480]},"london-underground":{"12":[150,480],"18":[132,480],"24":[108,480]},"minefield":{"12":[204,480],"18":[186,480],"24":[162,480]},"rail-underground":{"12":[258,480],"18":[240,480],"24":[216,480]},"rail-above":{"12":[42,504],"18":[24,504],"24":[0,504]},"camera":{"12":[96,504],"18":[78,504],"24":[54,504]},"laundry":{"12":[150,504],"18":[132,504],"24":[108,504]},"car":{"12":[204,504],"18":[186,504],"24":[162,504]},"suitcase":{"12":[258,504],"18":[240,504],"24":[216,504]},"hairdresser":{"12":[42,528],"18":[24,528],"24":[0,528]},"chemist":{"12":[96,528],"18":[78,528],"24":[54,528]},"mobilephone":{"12":[150,528],"18":[132,528],"24":[108,528]},"scooter":{"12":[204,528],"18":[186,528],"24":[162,528]},"gift":{"12":[258,528],"18":[240,528],"24":[216,528]},"ice-cream":{"12":[42,552],"18":[24,552],"24":[0,552]}} \ No newline at end of file diff --git a/data/line-icons.json b/data/line-icons.json deleted file mode 100644 index b7e3dd7da..000000000 --- a/data/line-icons.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "highway-motorway": [20, 25], - "highway-trunk": [80, 25], - "highway-primary": [140, 25], - "highway-secondary": [200, 25], - "highway-tertiary": [260, 25], - "highway-motorway-link": [320, 25], - "highway-trunk-link": [380, 25], - "highway-primary-link": [440, 25], - "highway-secondary-link": [500, 25], - "highway-tertiary-link": [560, 25], - "highway-residential": [620, 25], - "highway-unclassified": [680, 25], - "highway-service": [740, 25], - "highway-road": [800, 25], - "highway-track": [860, 25], - "highway-living-street": [920, 25], - "highway-path": [980, 25], - "highway-cycleway": [1040, 25], - "highway-footway": [1100, 25], - "highway-bridleway": [1160, 25], - "highway-steps": [1220, 25], - - "railway-rail": [1280, 25], - "railway-disused": [1340, 25], - "railway-abandoned": [1400, 25], - "railway-subway": [1460, 25], - "railway-light-rail": [1520, 25], - "railway-monorail": [1580, 25], - - "waterway-river": [1640, 25], - "waterway-stream": [1700, 25], - "waterway-canal": [1760, 25], - "waterway-ditch": [1820, 25], - - "power-line": [1880, 25], - - "other-line": [1940, 25], - - "category-roads": [2000, 25], - "category-rail": [2060, 25], - "category-path": [2120, 25], - "category-water": [2180, 25], - - "ferry": [2240, 25], - "pipeline": [2300, 25] -} diff --git a/data/maki_sprite.js b/data/maki_sprite.js index 1af307e58..f4dc08317 100644 --- a/data/maki_sprite.js +++ b/data/maki_sprite.js @@ -2,15 +2,11 @@ var fs = require('fs'); var _ = require('../js/lib/lodash'); var maki = require('maki/www/maki-sprite.json'); -var lineIcons = require('./line-icons.json'); -var relationIcons = require('./relation-icons.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"; -css += ".preset-icon-line{background-image:url(img/line-presets.png);background-repeat:no-repeat;width:60px;height:60px;}\n"; -css += ".preset-icon-relation{background-image:url(img/relation-presets.png);background-repeat:no-repeat;width:60px;height:60px;}\n"; var images = {}; @@ -28,27 +24,5 @@ _.forEach(maki, function(dimensions, name) { } }); -template = '.preset-icon-line.feature-{name}{background-position:-{x}px -{y}px;}\n'; - -_.forEach(lineIcons, function(position, name) { - css += template.replace('{name}', name) - .replace('{x}', position[0]) - .replace('{y}', position[1]); - - images[name] = images[name] || {}; - images[name].line = position; -}); - -template = '.preset-icon-relation.feature-{name}{background-position:-{x}px -{y}px;}\n'; - -_.forEach(relationIcons, function(position, name) { - css += template.replace('{name}', name) - .replace('{x}', position[0]) - .replace('{y}', position[1]); - - images[name] = images[name] || {}; - images[name].relation = position; -}); - fs.writeFileSync('./css/feature-icons.css', css); fs.writeFileSync('./data/feature-icons.json', JSON.stringify(images)); diff --git a/data/operations-sprite.json b/data/operations-sprite.json deleted file mode 100644 index 4df95996a..000000000 --- a/data/operations-sprite.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "operation-delete": [0, 140], - "operation-circularize": [20, 140], - "operation-straighten": [40, 140], - "operation-split": [60, 140], - "operation-disconnect": [80, 140], - "operation-reverse": [100, 140], - "operation-move": [120, 140], - "operation-merge": [140, 140], - "operation-orthogonalize": [160, 140], - "operation-rotate": [180, 140], - "operation-simplify": [200, 140], - "operation-continue": [220, 140], - - "icon-restriction-yes": [50, 80], - "icon-restriction-no": [95, 80], - "icon-restriction-only": [140, 80], - "icon-restriction-yes-u": [185, 80], - "icon-restriction-no-u": [230, 80], - "icon-restriction-only-u": [275, 80] -} diff --git a/data/relation-icons.json b/data/relation-icons.json deleted file mode 100644 index 9f08fcc47..000000000 --- a/data/relation-icons.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "relation": [20, 25], - "restriction": [80, 25], - "multipolygon": [141, 25], - "boundary": [200, 25], - "route": [260, 25], - "route-road": [320, 25], - "route-bicycle": [380, 25], - "route-foot": [440, 25], - "route-bus": [500, 25], - "route-train": [560, 25], - "route-detour": [620, 25], - "route-tram": [680, 25], - "route-ferry": [740, 25], - "route-power": [800, 25], - "route-pipeline": [860, 25], - "route-master": [920, 25], - "restriction-no-straight-on": [980, 25], - "restriction-no-u-turn": [1040, 25], - "restriction-no-left-turn": [1100, 25], - "restriction-no-right-turn": [1160, 25], - "restriction-only-straight-on": [1220, 25], - "restriction-only-left-turn": [1280, 25], - "restriction-only-right-turn": [1340, 25] -} diff --git a/dist/img/iD-sprite.svg b/dist/img/iD-sprite.svg index 2c48eda68..e7a819ca8 100644 --- a/dist/img/iD-sprite.svg +++ b/dist/img/iD-sprite.svg @@ -2,6 +2,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -11,7 +31,7 @@ - + @@ -22,8 +42,8 @@ - - + + @@ -36,8 +56,8 @@ - - + + @@ -46,7 +66,7 @@ - + @@ -69,259 +89,1230 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + - - - + + + - - - - - - - - - + + + - - + + - - - - - - + + + - - - + + - - - + + + - - + + - - - - - - + + + - - - - - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + - + - - - - + - + - + - - - - - - - - - - + + - + - + - + - - - - + - - - - + - + - - - - + - + - - - - - + - + - - - - - + - - - - - + - + - + - + - + \ No newline at end of file diff --git a/dist/img/line-presets.png b/dist/img/line-presets.png deleted file mode 100644 index bc20ef448..000000000 Binary files a/dist/img/line-presets.png and /dev/null differ diff --git a/dist/img/relation-presets.png b/dist/img/relation-presets.png deleted file mode 100644 index ef444fb49..000000000 Binary files a/dist/img/relation-presets.png and /dev/null differ diff --git a/dist/img/sprite.svg b/dist/img/sprite.svg deleted file mode 100644 index 7aec0cc11..000000000 --- a/dist/img/sprite.svg +++ /dev/null @@ -1,2177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/js/id/ui/radial_menu.js b/js/id/ui/radial_menu.js index cd2499e32..c945eb839 100644 --- a/js/id/ui/radial_menu.js +++ b/js/id/ui/radial_menu.js @@ -60,7 +60,8 @@ iD.ui.RadialMenu = function(context, operations) { .on('mouseout', mouseout); button.append('use') - .attr('transform', 'translate(-10, -10)') + .attr('width', '20px') + .attr('height', '20px') .attr('xlink:href', function(d) { return '#operation-' + d.id; }); tooltip = d3.select(document.body) diff --git a/svg/iD-sprite.idraw b/svg/iD-sprite.idraw index fdb581780..44438f685 100644 Binary files a/svg/iD-sprite.idraw and b/svg/iD-sprite.idraw differ diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json index 1432e085d..f806b9be9 100644 --- a/svg/iD-sprite.json +++ b/svg/iD-sprite.json @@ -24,6 +24,32 @@ "icon-full-screen": { "viewBox": "500 0 20 20" }, "icon-collapse-screen": { "viewBox": "520 0 20 20" }, + "icon-alert-shape": { "fill": "currentColor" }, + "icon-point-shape": { "fill": "currentColor" }, + "icon-line-shape": { "fill": "currentColor" }, + "icon-area-shape": { "fill": "currentColor" }, + "icon-undo-shape": { "fill": "currentColor" }, + "icon-redo-shape": { "fill": "currentColor" }, + "icon-apply-shape": { "fill": "currentColor" }, + "icon-save-shape": { "fill": "currentColor" }, + "icon-close-shape": { "fill": "currentColor" }, + "icon-out-link-shape": { "fill": "currentColor" }, + "icon-inspect-shape": { "fill": "currentColor" }, + "icon-plus-shape": { "fill": "currentColor" }, + "icon-minus-shape": { "fill": "currentColor" }, + "icon-search-shape": { "fill": "currentColor" }, + "icon-layers-shape": { "fill": "currentColor" }, + "icon-avatar-shape": { "fill": "currentColor" }, + "icon-nearby-shape": { "fill": "currentColor" }, + "icon-nearby-shape2": { "fill": "currentColor" }, + "icon-geolocate-shape": { "fill": "currentColor" }, + "icon-bug-shape": { "fill": "currentColor" }, + "icon-translate-shape": { "fill": "currentColor" }, + "icon-help-shape": { "fill": "currentColor" }, + "icon-data-shape": { "fill": "currentColor" }, + "icon-full-screen-shape": { "fill": "currentColor" }, + "icon-collapse-screen-shape": { "fill": "currentColor" }, + "highway-motorway": { "viewBox": "0 20 60 60" }, "highway-trunk": { "viewBox": "60 20 60 60" }, "highway-primary": { "viewBox": "120 20 60 60" }, @@ -104,18 +130,39 @@ "preset-icon-frame": { "viewBox": "340 320 45 45" }, - "operation-delete": { "viewBox": "200 380 20 20" }, - "operation-circularize": { "viewBox": "220 380 20 20" }, - "operation-straighten": { "viewBox": "240 380 20 20" }, - "operation-split": { "viewBox": "260 380 20 20" }, - "operation-disconnect": { "viewBox": "280 380 20 20" }, - "operation-reverse": { "viewBox": "300 380 20 20" }, - "operation-move": { "viewBox": "320 380 20 20" }, - "operation-merge": { "viewBox": "340 380 20 20" }, - "operation-orthogonalize": { "viewBox": "360 380 20 20" }, - "operation-rotate": { "viewBox": "380 380 20 20" }, - "operation-simplify": { "viewBox": "400 380 20 20" }, - "operation-continue": { "viewBox": "420 380 20 20" }, + "operation-delete": { "viewBox": "200 380 20 20", "x": "-10", "y": "-10" }, + "operation-circularize": { "viewBox": "220 380 20 20", "x": "-10", "y": "-10" }, + "operation-straighten": { "viewBox": "240 380 20 20", "x": "-10", "y": "-10" }, + "operation-split": { "viewBox": "260 380 20 20", "x": "-10", "y": "-10" }, + "operation-disconnect": { "viewBox": "280 380 20 20", "x": "-10", "y": "-10" }, + "operation-reverse": { "viewBox": "300 380 20 20", "x": "-10", "y": "-10" }, + "operation-move": { "viewBox": "320 380 20 20", "x": "-10", "y": "-10" }, + "operation-merge": { "viewBox": "340 380 20 20", "x": "-10", "y": "-10" }, + "operation-orthogonalize": { "viewBox": "360 380 20 20", "x": "-10", "y": "-10" }, + "operation-rotate": { "viewBox": "380 380 20 20", "x": "-10", "y": "-10" }, + "operation-simplify": { "viewBox": "400 380 20 20", "x": "-10", "y": "-10" }, + "operation-continue": { "viewBox": "420 380 20 20", "x": "-10", "y": "-10" }, + + "operation-delete-shape": { "fill": "inherit" }, + "operation-circularize-shape": { "fill": "inherit" }, + "operation-circularize-shape2": { "fill": "currentColor" }, + "operation-straighten-shape": { "fill": "inherit" }, + "operation-straighten-shape2": { "fill": "currentColor" }, + "operation-split-shape": { "fill": "inherit" }, + "operation-disconnect-shape": { "fill": "inherit" }, + "operation-disconnect-shape2": { "fill": "currentColor" }, + "operation-reverse-shape": { "fill": "inherit" }, + "operation-move-shape": { "fill": "inherit" }, + "operation-move-shape2": { "fill": "currentColor" }, + "operation-merge-shape": { "fill": "inherit" }, + "operation-orthogonalize-shape": { "fill": "inherit" }, + "operation-orthogonalize-shape2": { "fill": "currentColor" }, + "operation-rotate-shape": { "fill": "inherit" }, + "operation-rotate-shape2": { "fill": "currentColor" }, + "operation-simplify-shape": { "fill": "inherit" }, + "operation-simplify-shape2": { "fill": "currentColor" }, + "operation-continue-shape": { "fill": "inherit" }, + "operation-continue-shape2": { "fill": "currentColor" }, "logo-twitter": { "viewBox": "200 400 60 60" }, "logo-facebook": { "viewBox": "260 400 60 60" }, @@ -126,6 +173,15 @@ "logo-restore": { "viewBox": "500 480 80 80" }, "logo-reset": { "viewBox": "580 480 80 80" }, + "logo-twitter-shape": { "fill": "currentColor" }, + "logo-facebook-shape": { "fill": "currentColor" }, + "logo-google-shape": { "fill": "currentColor" }, + "logo-osm-shape": { "fill": "currentColor" }, + "logo-walkthrough-shape": { "fill": "currentColor" }, + "logo-features-shape": { "fill": "currentColor" }, + "logo-restore-shape": { "fill": "currentColor" }, + "logo-reset-shape": { "fill": "currentColor" }, + "poi-images": { "viewBox": "0 320 200 80" }, "landuse-images": { "viewBox": "0 400 200 80" }, "feature-images": { "viewBox": "0 480 200 80" } diff --git a/svg/iD-sprite.svg b/svg/iD-sprite.svg index 2aab0bc55..245c7d61e 100644 --- a/svg/iD-sprite.svg +++ b/svg/iD-sprite.svg @@ -2,6 +2,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -11,7 +31,7 @@ - + @@ -23,7 +43,7 @@ - + @@ -37,7 +57,7 @@ - + @@ -69,259 +89,1230 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + - - - + + - - + + - - - - - - - - + + - + - - - - - + + - - + - - + + - + - - - - - + + - - - - - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + - + - - - - + - + - + - - - - - - - - - - + + - + - + - + - - - - + - - - - + - + - - - - + - + - - - - - + - + - - - - - + - - - - - + - + - + - + - + diff --git a/svg/spriteify.js b/svg/spriteify.js index 6bdc5e048..4b93083b2 100755 --- a/svg/spriteify.js +++ b/svg/spriteify.js @@ -10,7 +10,6 @@ if (argv.help || argv.h || !argv.svg || !argv.json) { var fs = require('fs'); var json = JSON.parse(fs.readFileSync(argv.json)); var _ = require('../js/lib/lodash.js'); -var path = require('path'); var xml2js = require('xml2js'); xmlToJs(argv.svg, function (err, obj) { @@ -21,7 +20,6 @@ xmlToJs(argv.svg, function (err, obj) { }); function xmlToJs(filename, cb) { - // var filepath = path.normalize(path.join(__dirname, filename)); fs.readFile(filename, 'utf8', function (err, xmlStr) { if (err) throw (err); @@ -38,7 +36,6 @@ function xmlToJs(filename, cb) { parser = new xml2js.Parser(opts); parser.parseString(xmlStr, function (err, obj) { - // console.log(JSON.stringify(obj, null, 2)); cb(err, obj); }); });