github
/
d3
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix a bug when rendering certain arcs. 

Also, don't forget you need attr("fill-rule", "evenodd") for rings!
This commit is contained in:
Michael Bostock 2010-12-17 12:50:53 -08:00
Родитель 8f757c2ffe
Коммит 2cdaf6ad00
4 изменённых файлов: 96 добавлений и 64 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
d3.js поставляемый
Просмотреть файл

@ -1,4 +1,4 @@
d3 = {version: "0.28.2"}; // semver
d3 = {version: "0.28.3"}; // semver
if (!Date.now) Date.now = function() {
return +new Date();
};
@ -1928,18 +1928,34 @@ d3["svg"]["arc"] = function() {
a0 = startAngle.call(this, d, i) + d3_svg_arcOffset,
a1 = endAngle.call(this, d, i) + d3_svg_arcOffset,
da = a1 - a0,
df = da < Math.PI ? "0" : "1",
c0 = Math.cos(a0),
s0 = Math.sin(a0),
c1 = Math.cos(a1),
s1 = Math.sin(a1);
return "M" + r1 * c0 + "," + r1 * s0
+ "A" + r1 + "," + r1 + " 0 "
+ ((da < Math.PI) ? "0" : "1") + ",1 "
+ r1 * c1 + "," + r1 * s1
+ "L" + r0 * c1 + "," + r0 * s1
+ "A" + r0 + "," + r0 + " 0 "
+ ((da < Math.PI) ? "0" : "1") + ",0 "
+ r0 * c0 + "," + r0 * s0 + "Z";
return da >= 2 * Math.PI
? (r0
? "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "M0," + r0
+ "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
+ "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+ "Z"
: "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "Z")
: (r0
? "M" + r1 * c0 + "," + r1 * s0
+ "A" + r1 + "," + r1 + " 0 " + df + ",1 " + r1 * c1 + "," + r1 * s1
+ "L" + r0 * c1 + "," + r0 * s1
+ "A" + r0 + "," + r0 + " 0 " + df + ",0 " + r0 * c0 + "," + r0 * s0
+ "Z"
: "M" + r1 * c0 + "," + r1 * s0
+ "A" + r1 + "," + r1 + " 0 " + df + ",1 " + r1 * c1 + "," + r1 * s1
+ "L0,0"
+ "Z");
}
arc["innerRadius"] = function(v) {

92
d3.min.js поставляемый
Просмотреть файл

@ -1,64 +1,64 @@
(function(){var n=null;d3={version:"0.28.2"};if(!Date.now)Date.now=function(){return+new Date};if(!Object.create)Object.create=function(a){function b(){}b.prototype=a;return new b};function x(a){return Array.prototype.slice.call(a)}function y(a){return typeof a=="function"?a:function(){return a}}d3.ascending=function(a,b){return a<b?-1:a>b?1:0};d3.descending=function(a,b){return b<a?-1:b>a?1:0};d3.merge=function(a){return Array.prototype.concat.apply([],a)};
d3.split=function(a,b){var c=[],f=[],d,e=-1,h=a.length;if(arguments.length<2)b=aa;for(;++e<h;)if(b.call(f,d=a[e],e)){c.push(f);f=[]}else f.push(d);c.push(f);return c};function aa(a){return a==n}function E(a){return a.replace(/(^\s+)|(\s+$)/g,"").replace(/\s+/g," ")}function ba(a,b){b=x(arguments);b[0]=this;a.apply(this,b);return this}
d3.range=function(a,b,c){if(arguments.length==1){b=a;a=0}if(c==n)c=1;if((b-a)/c==Infinity)throw Error("infinite range");var f=[],d=-1,e;if(c<0)for(;(e=a+c*++d)>b;)f.push(e);else for(;(e=a+c*++d)<b;)f.push(e);return f};d3.requote=function(a){return a.replace(ca,"\\$&")};var ca=/[\\\^\$\*\+\?\[\]\(\)\.\{\}]/g;
d3.xhr=function(a,b,c){var f=new XMLHttpRequest;if(arguments.length<3)c=b;else b&&f.overrideMimeType(b);f.open("GET",a,true);f.onreadystatechange=function(){if(f.readyState==4)c(f.status<300?f:n)};f.send(n)};d3.text=function(a,b,c){if(arguments.length<3){c=b;b=n}d3.xhr(a,b,function(f){c(f&&f.responseText)})};d3.json=function(a,b){d3.text(a,"application/json",function(c){b(c?JSON.parse(c):n)})};
d3.html=function(a,b){d3.text(a,"text/html",function(c){if(c!=n){var f=document.createRange();f.selectNode(document.body);c=f.createContextualFragment(c)}b(c)})};d3.xml=function(a,b,c){if(arguments.length<3){c=b;b=n}d3.xhr(a,b,function(f){c(f&&f.responseXML)})};
(function(){var o=null;d3={version:"0.28.3"};if(!Date.now)Date.now=function(){return+new Date};if(!Object.create)Object.create=function(a){function b(){}b.prototype=a;return new b};function x(a){return Array.prototype.slice.call(a)}function y(a){return typeof a=="function"?a:function(){return a}}d3.ascending=function(a,b){return a<b?-1:a>b?1:0};d3.descending=function(a,b){return b<a?-1:b>a?1:0};d3.merge=function(a){return Array.prototype.concat.apply([],a)};
d3.split=function(a,b){var c=[],f=[],d,e=-1,i=a.length;if(arguments.length<2)b=aa;for(;++e<i;)if(b.call(f,d=a[e],e)){c.push(f);f=[]}else f.push(d);c.push(f);return c};function aa(a){return a==o}function E(a){return a.replace(/(^\s+)|(\s+$)/g,"").replace(/\s+/g," ")}function ba(a,b){b=x(arguments);b[0]=this;a.apply(this,b);return this}
d3.range=function(a,b,c){if(arguments.length==1){b=a;a=0}if(c==o)c=1;if((b-a)/c==Infinity)throw Error("infinite range");var f=[],d=-1,e;if(c<0)for(;(e=a+c*++d)>b;)f.push(e);else for(;(e=a+c*++d)<b;)f.push(e);return f};d3.requote=function(a){return a.replace(ca,"\\$&")};var ca=/[\\\^\$\*\+\?\[\]\(\)\.\{\}]/g;
d3.xhr=function(a,b,c){var f=new XMLHttpRequest;if(arguments.length<3)c=b;else b&&f.overrideMimeType(b);f.open("GET",a,true);f.onreadystatechange=function(){if(f.readyState==4)c(f.status<300?f:o)};f.send(o)};d3.text=function(a,b,c){if(arguments.length<3){c=b;b=o}d3.xhr(a,b,function(f){c(f&&f.responseText)})};d3.json=function(a,b){d3.text(a,"application/json",function(c){b(c?JSON.parse(c):o)})};
d3.html=function(a,b){d3.text(a,"text/html",function(c){if(c!=o){var f=document.createRange();f.selectNode(document.body);c=f.createContextualFragment(c)}b(c)})};d3.xml=function(a,b,c){if(arguments.length<3){c=b;b=o}d3.xhr(a,b,function(f){c(f&&f.responseXML)})};
d3.ns={prefix:{svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"},qualify:function(a){var b=a.indexOf(":");return b<0?a:{space:d3.ns.prefix[a.substring(0,b)],local:a.substring(b+1)}}};d3.dispatch=function(){for(var a={},b,c=0,f=arguments.length;c<f;c++){b=arguments[c];a[b]=da(b)}return a};
function da(){var a={},b=[];a.add=function(c){for(var f=0;f<b.length;f++)if(b[f].i==c)return a;b.push({i:c,on:true});return a};a.remove=function(c){for(var f=0;f<b.length;f++){var d=b[f];if(d.i==c){d.on=false;b=b.slice(0,f).concat(b.slice(f+1));break}}return a};a.dispatch=function(){for(var c=b,f=0,d=c.length;f<d;f++){var e=c[f];e.on&&e.i.apply(this,arguments)}};return a}
d3.format=function(a){a=ea.exec(a);var b=a[1]||" ",c=a[5],f=+a[6],d=a[7],e=a[8],h=a[9];if(e)e=e.substring(1);if(c)b="0";if(h=="d")e="0";return function(g){if(h=="d"&&g%1)return"";if(e)g=(+g).toFixed(e);else g+="";if(d){for(var i=g.lastIndexOf("."),j=i>=0?g.substring(i):(i=g.length,""),l=[];i>0;)l.push(g.substring(i-=3,i+3));g=l.reverse().join(",")+j}i=g.length;if(i<f)g=Array(f-i+1).join(b)+g;return g}};
d3.format=function(a){a=ea.exec(a);var b=a[1]||" ",c=a[5],f=+a[6],d=a[7],e=a[8],i=a[9];if(e)e=e.substring(1);if(c)b="0";if(i=="d")e="0";return function(g){if(i=="d"&&g%1)return"";if(e)g=(+g).toFixed(e);else g+="";if(d){for(var h=g.lastIndexOf("."),j=h>=0?g.substring(h):(h=g.length,""),l=[];h>0;)l.push(g.substring(h-=3,h+3));g=l.reverse().join(",")+j}h=g.length;if(h<f)g=Array(f-h+1).join(b)+g;return g}};
var ea=/(?:([^{])?([<>=^]))?([+\- ])?(#)?(0)?([0-9]+)?(,)?(\.[0-9]+)?([a-zA-Z%])?/,fa=F(2),ga=F(3),oa={linear:function(){return ha},poly:F,quad:function(){return fa},cubic:function(){return ga},sin:function(){return ia},exp:function(){return ja},circle:function(){return ka},elastic:la,back:ma,bounce:function(){return na}},ra={"in":function(a){return a},out:pa,"in-out":qa,"out-in":function(a){return qa(pa(a))}};
d3.ease=function(a){var b=a.indexOf("-");return ra[b>=0?a.substring(b+1):"in"](oa[b>=0?a.substring(0,b):a].apply(n,Array.prototype.slice.call(arguments,1)))};function pa(a){return function(b){return 1-a(1-b)}}function qa(a){return function(b){return 0.5*(b<0.5?a(2*b):2-a(2-2*b))}}function ha(a){return a}function F(a){return function(b){return Math.pow(b,a)}}function ia(a){return 1-Math.cos(a*Math.PI/2)}function ja(a){return a?Math.pow(2,10*(a-1))-0.0010:0}
function ka(a){return 1-Math.sqrt(1-a*a)}function la(a,b){var c;if(arguments.length<2)b=0.45;if(arguments.length<1){a=1;c=b/4}else c=b/(2*Math.PI)*Math.asin(1/a);return function(f){return 1+a*Math.pow(2,10*-f)*Math.sin((f-c)*2*Math.PI/b)}}function ma(a){a||(a=1.70158);return function(b){return b*b*((a+1)*b-a)}}function na(a){return a<1/2.75?7.5625*a*a:a<2/2.75?7.5625*(a-=1.5/2.75)*a+0.75:a<2.5/2.75?7.5625*(a-=2.25/2.75)*a+0.9375:7.5625*(a-=2.625/2.75)*a+0.984375}d3.event=n;
d3.ease=function(a){var b=a.indexOf("-");return ra[b>=0?a.substring(b+1):"in"](oa[b>=0?a.substring(0,b):a].apply(o,Array.prototype.slice.call(arguments,1)))};function pa(a){return function(b){return 1-a(1-b)}}function qa(a){return function(b){return 0.5*(b<0.5?a(2*b):2-a(2-2*b))}}function ha(a){return a}function F(a){return function(b){return Math.pow(b,a)}}function ia(a){return 1-Math.cos(a*Math.PI/2)}function ja(a){return a?Math.pow(2,10*(a-1))-0.0010:0}
function ka(a){return 1-Math.sqrt(1-a*a)}function la(a,b){var c;if(arguments.length<2)b=0.45;if(arguments.length<1){a=1;c=b/4}else c=b/(2*Math.PI)*Math.asin(1/a);return function(f){return 1+a*Math.pow(2,10*-f)*Math.sin((f-c)*2*Math.PI/b)}}function ma(a){a||(a=1.70158);return function(b){return b*b*((a+1)*b-a)}}function na(a){return a<1/2.75?7.5625*a*a:a<2/2.75?7.5625*(a-=1.5/2.75)*a+0.75:a<2.5/2.75?7.5625*(a-=2.25/2.75)*a+0.9375:7.5625*(a-=2.625/2.75)*a+0.984375}d3.event=o;
d3.interpolate=function(a,b){if(typeof b=="number")return d3.interpolateNumber(+a,b);if(typeof b=="string")return b in G||/^(#|rgb\(|hsl\()/.test(b)?d3.interpolateRgb(String(a),b):d3.interpolateString(String(a),b);if(b instanceof Array)return d3.interpolateArray(a,b);return d3.interpolateObject(a,b)};d3.interpolateNumber=function(a,b){b-=a;return function(c){return a+b*c}};
d3.interpolateString=function(a,b){var c,f,d=0,e=[],h=[],g,i;for(f=0;c=H.exec(b);++f){c.index&&e.push(b.substring(d,c.index));h.push({a:e.length,x:c[0]});e.push(n);d=H.lastIndex}d<b.length&&e.push(b.substring(d));f=0;for(g=h.length;(c=H.exec(a))&&f<g;++f){i=h[f];if(i.x==c[0]){if(i.a)if(e[i.a+1]==n){e[i.a-1]+=i.x;e.splice(i.a,1);for(c=f+1;c<g;++c)h[c].a--}else{e[i.a-1]+=i.x+e[i.a+1];e.splice(i.a,2);for(c=f+1;c<g;++c)h[c].a-=2}else if(e[i.a+1]==n)e[i.a]=i.x;else{e[i.a]=i.x+e[i.a+1];e.splice(i.a+1,1);
for(c=f+1;c<g;++c)h[c].a--}h.splice(f,1);g--;f--}else i.x=d3.interpolateNumber(parseFloat(c[0]),parseFloat(i.x))}for(;f<g;){i=h.pop();if(e[i.a+1]==n)e[i.a]=i.x;else{e[i.a]=i.x+e[i.a+1];e.splice(i.a+1,1)}g--}if(e.length==1)return e[0]==n?h[0].x:function(){return b};return function(j){for(f=0;f<g;++f)e[(i=h[f]).a]=i.x(j);return e.join("")}};
d3.interpolateRgb=function(a,b){a=d3.rgb(a);b=d3.rgb(b);var c=a.r,f=a.g,d=a.b,e=b.r-c,h=b.g-f,g=b.b-d;return function(i){return"rgb("+Math.round(c+e*i)+","+Math.round(f+h*i)+","+Math.round(d+g*i)+")"}};d3.interpolateArray=function(a,b){var c=[],f=[],d=a.length,e=b.length,h=Math.min(a.length,b.length),g;for(g=0;g<h;++g)c.push(d3.interpolate(a[g],b[g]));for(;g<d;++g)f[g]=a[g];for(;g<e;++g)f[g]=b[g];return function(i){for(g=0;g<h;++g)f[g]=c[g](i);return f}};
d3.interpolateString=function(a,b){var c,f,d=0,e=[],i=[],g,h;for(f=0;c=H.exec(b);++f){c.index&&e.push(b.substring(d,c.index));i.push({a:e.length,x:c[0]});e.push(o);d=H.lastIndex}d<b.length&&e.push(b.substring(d));f=0;for(g=i.length;(c=H.exec(a))&&f<g;++f){h=i[f];if(h.x==c[0]){if(h.a)if(e[h.a+1]==o){e[h.a-1]+=h.x;e.splice(h.a,1);for(c=f+1;c<g;++c)i[c].a--}else{e[h.a-1]+=h.x+e[h.a+1];e.splice(h.a,2);for(c=f+1;c<g;++c)i[c].a-=2}else if(e[h.a+1]==o)e[h.a]=h.x;else{e[h.a]=h.x+e[h.a+1];e.splice(h.a+1,1);
for(c=f+1;c<g;++c)i[c].a--}i.splice(f,1);g--;f--}else h.x=d3.interpolateNumber(parseFloat(c[0]),parseFloat(h.x))}for(;f<g;){h=i.pop();if(e[h.a+1]==o)e[h.a]=h.x;else{e[h.a]=h.x+e[h.a+1];e.splice(h.a+1,1)}g--}if(e.length==1)return e[0]==o?i[0].x:function(){return b};return function(j){for(f=0;f<g;++f)e[(h=i[f]).a]=h.x(j);return e.join("")}};
d3.interpolateRgb=function(a,b){a=d3.rgb(a);b=d3.rgb(b);var c=a.r,f=a.g,d=a.b,e=b.r-c,i=b.g-f,g=b.b-d;return function(h){return"rgb("+Math.round(c+e*h)+","+Math.round(f+i*h)+","+Math.round(d+g*h)+")"}};d3.interpolateArray=function(a,b){var c=[],f=[],d=a.length,e=b.length,i=Math.min(a.length,b.length),g;for(g=0;g<i;++g)c.push(d3.interpolate(a[g],b[g]));for(;g<d;++g)f[g]=a[g];for(;g<e;++g)f[g]=b[g];return function(h){for(g=0;g<i;++g)f[g]=c[g](h);return f}};
d3.interpolateObject=function(a,b){var c={},f={},d;for(d in a)if(d in b)c[d]=(d in sa||/\bcolor\b/.test(d)?d3.interpolateRgb:d3.interpolate)(a[d],b[d]);else f[d]=a[d];for(d in b)d in a||(f[d]=b[d]);return function(e){for(d in c)f[d]=c[d](e);return f}};var H=/[-+]?(?:\d+\.\d+|\d+\.|\.\d+|\d+)(?:[eE][-]?\d+)?/g,sa={background:1,fill:1,stroke:1};d3.rgb=function(a,b,c){return arguments.length==1?I(""+a,J,ta):J(~~a,~~b,~~c)};function J(a,b,c){return{r:a,g:b,b:c,toString:ua}}
function ua(){return"#"+K(this.r)+K(this.g)+K(this.b)}function K(a){return a<16?"0"+a.toString(16):a.toString(16)}
function I(a,b,c){var f,d,e,h,g;if(h=/([a-z]+)\((.*)\)/i.exec(a)){g=h[2].split(",");switch(h[1]){case "hsl":return c(parseFloat(g[0]),parseFloat(g[1])/100,parseFloat(g[2])/100);case "rgb":return b(L(g[0]),L(g[1]),L(g[2]))}}if(c=G[a])return b(c.r,c.g,c.b);if(a==n)return b(0,0,0);if(a.charAt(0)=="#"){if(a.length==4){f=a.charAt(1);f+=f;d=a.charAt(2);d+=d;e=a.charAt(3);e+=e}else if(a.length==7){f=a.substring(1,3);d=a.substring(3,5);e=a.substring(5,7)}f=parseInt(f,16);d=parseInt(d,16);e=parseInt(e,16)}return b(f,
d,e)}function va(a,b,c){var f=Math.min(a/=255,b/=255,c/=255),d=Math.max(a,b,c),e=d-f,h=(d+f)/2;if(e){f=h<0.5?e/(d+f):e/(2-d-f);a=a==d?(b-c)/e+(b<c?6:0):b==d?(c-a)/e+2:(a-b)/e+4;a*=60}else f=a=0;return M(a,f,h)}function L(a){var b=parseFloat(a);return a.charAt(a.length-1)=="%"?Math.round(b*2.55):b}
function I(a,b,c){var f,d,e,i,g;if(i=/([a-z]+)\((.*)\)/i.exec(a)){g=i[2].split(",");switch(i[1]){case "hsl":return c(parseFloat(g[0]),parseFloat(g[1])/100,parseFloat(g[2])/100);case "rgb":return b(L(g[0]),L(g[1]),L(g[2]))}}if(c=G[a])return b(c.r,c.g,c.b);if(a==o)return b(0,0,0);if(a.charAt(0)=="#"){if(a.length==4){f=a.charAt(1);f+=f;d=a.charAt(2);d+=d;e=a.charAt(3);e+=e}else if(a.length==7){f=a.substring(1,3);d=a.substring(3,5);e=a.substring(5,7)}f=parseInt(f,16);d=parseInt(d,16);e=parseInt(e,16)}return b(f,
d,e)}function va(a,b,c){var f=Math.min(a/=255,b/=255,c/=255),d=Math.max(a,b,c),e=d-f,i=(d+f)/2;if(e){f=i<0.5?e/(d+f):e/(2-d-f);a=a==d?(b-c)/e+(b<c?6:0):b==d?(c-a)/e+2:(a-b)/e+4;a*=60}else f=a=0;return M(a,f,i)}function L(a){var b=parseFloat(a);return a.charAt(a.length-1)=="%"?Math.round(b*2.55):b}
var G={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",
darkgrey:"#a9a9a9",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",
ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",grey:"#808080",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgreen:"#90ee90",lightgrey:"#d3d3d3",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",
lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",
moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",
seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"},N;for(N in G)G[N]=I(G[N],J,ta);d3.hsl=function(a,b,c){return arguments.length==1?I(""+a,va,M):M(+a,+b,+c)};
function M(a,b,c){return{h:a,s:b,l:c,toString:wa}}function wa(){return"hsl("+this.h+","+this.s*100+"%,"+this.l*100+"%)"}function ta(a,b,c){function f(h){if(h>360)h-=360;else if(h<0)h+=360;if(h<60)return d+(e-d)*h/60;if(h<180)return e;if(h<240)return d+(e-d)*(240-h)/60;return d}var d,e;a%=360;if(a<0)a+=360;b=b<0?0:b>1?1:b;c=c<0?0:c>1?1:c;e=c<=0.5?c*(1+b):c+b-c*b;d=2*c-e;return J(Math.round(f(a+120)*255),Math.round(f(a)*255),Math.round(f(a-120)*255))}var P=O([[document]]);P[0].parentNode=document.documentElement;
function M(a,b,c){return{h:a,s:b,l:c,toString:wa}}function wa(){return"hsl("+this.h+","+this.s*100+"%,"+this.l*100+"%)"}function ta(a,b,c){function f(i){if(i>360)i-=360;else if(i<0)i+=360;if(i<60)return d+(e-d)*i/60;if(i<180)return e;if(i<240)return d+(e-d)*(240-i)/60;return d}var d,e;a%=360;if(a<0)a+=360;b=b<0?0:b>1?1:b;c=c<0?0:c>1?1:c;e=c<=0.5?c*(1+b):c+b-c*b;d=2*c-e;return J(Math.round(f(a+120)*255),Math.round(f(a)*255),Math.round(f(a-120)*255))}var P=O([[document]]);P[0].parentNode=document.documentElement;
d3.select=function(a){return typeof a=="string"?P.select(a):O([[a]])};d3.selectAll=function(a){return typeof a=="string"?P.selectAll(a):O([x(a)])};
function O(a){function b(d){for(var e=[],h,g,i,j,l=0,p=a.length;l<p;l++){i=a[l];e.push(h=[]);h.parentNode=i.parentNode;h.parentData=i.parentData;for(var r=0,k=i.length;r<k;r++)if(j=i[r]){h.push(g=d(j));if(g&&"__data__"in j)g.__data__=j.__data__}else h.push(n)}return O(e)}function c(d){for(var e=[],h,g,i,j=0,l=a.length;j<l;j++){g=a[j];for(var p=0,r=g.length;p<r;p++)if(i=g[p]){e.push(h=d(i));h.parentNode=i;h.parentData=i.__data__}}return O(e)}function f(d){for(var e=0,h=a.length;e<h;e++)for(var g=a[e],
i=0,j=g.length;i<j;i++){var l=g[i];if(l)return d.call(l,l.__data__,i)}return n}a.select=function(d){return b(function(e){return e.querySelector(d)})};a.selectAll=function(d){return c(function(e){return x(e.querySelectorAll(d))})};a.filter=function(d){for(var e=[],h,g,i,j=0,l=a.length;j<l;j++){g=a[j];e.push(h=[]);h.parentNode=g.parentNode;h.parentData=g.parentData;for(var p=0,r=g.length;p<r;p++)if((i=g[p])&&d.call(i,i.__data__,p))h.push(i)}return O(e)};a.data=function(d,e){function h(k,o){function q(Ga){return k.parentNode.appendChild(Ga)}
var m=0,t=k.length,u=o.length,s=Math.min(t,u),v=Math.max(t,u),z=[],A=[],w=[],B,C;if(e){s={};v=[];var D;C=o.length;for(m=0;m<t;m++){D=e.nodeKey(B=k[m]);if(D in s)w[C++]=k[m];else{s[D]=B;v.push(D)}}for(m=0;m<u;m++){if(B=s[D=e.dataKey(C=o[m])]){B.__data__=C;z[m]=B;A[m]=w[m]=n}else{A[m]={appendChild:q,__data__:C};z[m]=w[m]=n}delete s[D]}for(m=0;m<t;m++)if(v[m]in s)w[m]=k[m]}else{for(;m<s;m++){B=k[m];C=o[m];if(B){B.__data__=C;z[m]=B;A[m]=w[m]=n}else{A[m]={appendChild:q,__data__:C};z[m]=w[m]=n}}for(;m<
u;m++){A[m]={appendChild:q,__data__:o[m]};z[m]=w[m]=n}for(;m<v;m++){w[m]=k[m];A[m]=z[m]=n}}A.parentNode=z.parentNode=w.parentNode=k.parentNode;A.parentData=z.parentData=w.parentData=k.parentData;l.push(A);p.push(z);r.push(w)}var g=-1,i=a.length,j,l=[],p=[],r=[];if(typeof e=="string")e=xa(e);if(typeof d=="function")for(;++g<i;)h(j=a[g],d.call(j,j.parentData,g));else for(;++g<i;)h(j=a[g],d);g=O(p);g.enter=function(k){return O(l).append(k)};g.exit=function(){return O(r)};return g};a.each=function(d){for(var e=
0,h=a.length;e<h;e++)for(var g=a[e],i=0,j=g.length;i<j;i++){var l=g[i];l&&d.call(l,l.__data__,i)}return a};a.node=function(){return f(function(){return this})};a.attr=function(d,e){function h(){this.removeAttribute(d)}function g(){this.removeAttributeNS(d.space,d.local)}function i(){this.setAttribute(d,e)}function j(){this.setAttributeNS(d.space,d.local,e)}function l(){var r=e.apply(this,arguments);r==n?this.removeAttribute(d):this.setAttribute(d,r)}function p(){var r=e.apply(this,arguments);r==n?
this.removeAttributeNS(d.space,d.local):this.setAttributeNS(d.space,d.local,r)}d=d3.ns.qualify(d);if(arguments.length<2)return f(d.local?function(){return this.getAttributeNS(d.space,d.local)}:function(){return this.getAttribute(d)});return a.each(e==n?d.local?g:h:typeof e=="function"?d.local?p:l:d.local?j:i)};a.classed=function(d,e){function h(){var l=this.className;j.lastIndex=0;if(!j.test(l))this.className=E(l+" "+d)}function g(){var l=E(this.className.replace(j," "));this.className=l.length?l:
n}function i(){(e.apply(this,arguments)?h:g).call(this)}var j=RegExp("(^|\\s+)"+d3.requote(d)+"(\\s+|$)","g");if(arguments.length<2)return f(function(){j.lastIndex=0;return j.test(this.className)});return a.each(typeof e=="function"?i:e?h:g)};a.style=function(d,e,h){function g(){this.style.removeProperty(d)}function i(){this.style.setProperty(d,e,h)}function j(){var l=e.apply(this,arguments);l==n?this.style.removeProperty(d):this.style.setProperty(d,l,h)}if(arguments.length<3)h=n;if(arguments.length<
2)return f(function(){return window.getComputedStyle(this,n).getPropertyValue(d)});return a.each(e==n?g:typeof e=="function"?j:i)};a.property=function(d,e){function h(){delete this[d]}function g(){this[d]=e}function i(){var j=e.apply(this,arguments);if(j==n)delete this[d];else this[d]=j}d=d3.ns.qualify(d);if(arguments.length<2)return f(function(){return this[d]});return a.each(e==n?h:typeof e=="function"?i:g)};a.text=function(d){function e(){this.appendChild(document.createTextNode(d))}function h(){var g=
d.apply(this,arguments);g!=n&&this.appendChild(document.createTextNode(g))}if(arguments.length<1)return f(function(){return this.textContent});a.each(function(){for(;this.lastChild;)this.removeChild(this.lastChild)});return d==n?a:a.each(typeof d=="function"?h:e)};a.html=function(d){function e(){this.innerHTML=d}function h(){this.innerHTML=d.apply(this,arguments)}if(arguments.length<1)return f(function(){return this.innerHTML});return a.each(typeof d=="function"?h:e)};a.append=function(d){function e(g){return g.appendChild(document.createElement(d))}
function h(g){return g.appendChild(document.createElementNS(d.space,d.local))}d=d3.ns.qualify(d);return b(d.local?h:e)};a.remove=function(){return b(function(d){var e=d.parentNode;e.removeChild(d);return e})};a.sort=function(d){d=ya.apply(this,arguments);for(var e=0,h=a.length;e<h;e++){var g=a[e];g.sort(d);for(var i=1,j=g.length,l=g[0];i<j;i++){var p=g[i];if(p){l&&l.parentNode.insertBefore(p,l.nextSibling);l=p}}}return a};a.on=function(d,e){d="on"+d;return a.each(function(h,g){this[d]=function(i){var j=
d3.event;d3.event=i;try{e.call(this,h,g)}finally{d3.event=j}}})};a.transition=function(){return Q(a)};a.call=ba;return a}function xa(a){return{nodeKey:function(b){return b.getAttribute(a)},dataKey:function(b){return b[a]}}}function ya(a){if(!arguments.length)a=d3.u;return function(b,c){return a(b&&b.__data__,c&&c.__data__)}}d3.transition=P.transition;var za=0,R=0;
function Q(a){function b(k){var o=true,q=-1;a.each(function(){if(i[++q]!=2){var m=(k-j[q])/l[q],t=this.__transition__,u,s,v=e[q];if(m<1){o=false;if(m<0)return}else m=1;if(i[q]){if(t.d!=f){i[q]=2;return}}else if(!t||t.d>f){i[q]=2;return}else{i[q]=1;g.start.dispatch.apply(this,arguments);v=e[q]={};t.d=f;for(s in d)v[s]=d[s].apply(this,arguments)}u=r(m);for(s in d)v[s].call(this,u);if(m==1){i[q]=2;if(t.d==f){m=t.o;if(m==f){delete this.__transition__;h&&this.parentNode.removeChild(this)}R=f;g.end.dispatch.apply(this,
arguments);R=0;t.o=m}}}});return o}var c={},f=R||++za,d={},e=[],h=false,g=d3.dispatch("start","end"),i=[],j=[],l=[],p,r=d3.ease("cubic-in-out");a.each(function(){(this.__transition__||(this.__transition__={})).o=f});c.delay=function(k){var o=Infinity,q=-1;if(typeof k=="function")a.each(function(){var m=j[++q]=+k.apply(this,arguments);if(m<o)o=m});else{o=+k;a.each(function(){j[++q]=o})}Aa(b,o);return c};c.duration=function(k){var o=-1;if(typeof k=="function"){p=0;a.each(function(){var q=l[++o]=+k.apply(this,
arguments);if(q>p)p=q})}else{p=+k;a.each(function(){l[++o]=p})}return c};c.ease=function(k){r=typeof k=="string"?d3.ease(k):k;return c};c.attrTween=function(k,o){function q(t,u){var s=o.call(this,t,u,this.getAttribute(k));return function(v){this.setAttribute(k,s(v))}}function m(t,u){var s=o.call(this,t,u,this.getAttributeNS(k.space,k.local));return function(v){this.setAttributeNS(k.space,k.local,s(v))}}d["attr."+k]=k.local?m:q;return c};c.attr=function(k,o){return c.attrTween(k,Ba(o))};c.styleTween=
function(k,o,q){d["style."+k]=function(m,t){var u=o.call(this,m,t,window.getComputedStyle(this,n).getPropertyValue(k));return function(s){this.style.setProperty(k,u(s),q)}};return c};c.style=function(k,o,q){return c.styleTween(k,Ba(o),q)};c.select=function(k){var o;k=Q(a.select(k)).ease(r);o=-1;k.delay(function(){return j[++o]});o=-1;k.duration(function(){return l[++o]});return k};c.selectAll=function(k){var o;k=Q(a.selectAll(k)).ease(r);o=-1;k.delay(function(q,m){return j[m?o:++o]});o=-1;k.duration(function(q,
m){return l[m?o:++o]});return k};c.remove=function(){h=true;return c};c.each=function(k,o){g[k].add(o);return c};c.call=ba;return c.delay(0).duration(250)}var S=n,T=0,U;function Aa(a,b){var c=Date.now(),f=false,d=c+b,e=S;if(isFinite(b)){for(;e;){if(e.n==a){e.j=c;e.delay=b;f=true}else{var h=e.j+e.delay;if(h<d)d=h}e=e.next}f||(S={n:a,j:c,delay:b,next:S});if(!U){clearTimeout(T);T=setTimeout(Ca,Math.max(24,d-c))}}}function Ca(){U=setInterval(Da,24);T=0}
function Da(){for(var a,b=Date.now(),c=S;c;){a=b-c.j;if(a>c.delay)c.t=c.n(a);c=c.next}a=n;for(b=S;b;)b=b.t?a?a.next=b.next:S=b.next:(a=b).next;a||(U=clearInterval(U))}function Ba(a){return typeof a=="function"?function(b,c,f){return d3.interpolate(f,a.call(this,b,c))}:function(b,c,f){return d3.interpolate(f,a)}}d3.scale={};
d3.scale.linear=function(){function a(j){return i((j-c)*h)}function b(j){var l=Math.min(c,f),p=Math.max(c,f),r=p-l,k=Math.pow(10,Math.floor(Math.log(r/j)/Math.LN10));j=j/(r/k);if(j<=0.15)k*=10;else if(j<=0.35)k*=5;else if(j<=0.75)k*=2;return{start:Math.ceil(l/k)*k,stop:Math.floor(p/k)*k+k*0.5,q:k}}var c=0,f=1,d=0,e=1,h=1/(f-c),g=(f-c)/(e-d),i=d3.interpolate(d,e);a.invert=function(j){return(j-d)*g+c};a.domain=function(j){if(!arguments.length)return[c,f];c=j[0];f=j[1];h=1/(f-c);g=(f-c)/(e-d);return a};
a.range=function(j){if(!arguments.length)return[d,e];d=j[0];e=j[1];g=(f-c)/(e-d);i=d3.interpolate(d,e);return a};a.ticks=function(j){j=b(j);return d3.range(j.start,j.stop,j.q)};a.tickFormat=function(j){return d3.format(",."+Math.max(0,-Math.floor(Math.log(b(j).q)/Math.LN10+0.01))+"f")};return a};
d3.scale.log=function(){function a(d){return Math.log(d)/Math.LN10}function b(d){return Math.pow(10,d)}function c(d){return f(a(d))}var f=d3.scale.linear();c.invert=function(d){return b(f.invert(d))};c.domain=function(d){if(!arguments.length)return f.domain().map(b);f.domain(d.map(a));return c};c.range=function(){var d=f.range.apply(f,arguments);return arguments.length?c:d};c.ticks=function(){var d=f.domain(),e=Math.floor(d[0]),h=Math.ceil(d[1]),g=[];if(d.every(isFinite)){for(;++e<=h;)for(d=1;d<10;d++)g.push(b(e)*
function O(a){function b(d){for(var e=[],i,g,h,j,l=0,p=a.length;l<p;l++){h=a[l];e.push(i=[]);i.parentNode=h.parentNode;i.parentData=h.parentData;for(var q=0,k=h.length;q<k;q++)if(j=h[q]){i.push(g=d(j));if(g&&"__data__"in j)g.__data__=j.__data__}else i.push(o)}return O(e)}function c(d){for(var e=[],i,g,h,j=0,l=a.length;j<l;j++){g=a[j];for(var p=0,q=g.length;p<q;p++)if(h=g[p]){e.push(i=d(h));i.parentNode=h;i.parentData=h.__data__}}return O(e)}function f(d){for(var e=0,i=a.length;e<i;e++)for(var g=a[e],
h=0,j=g.length;h<j;h++){var l=g[h];if(l)return d.call(l,l.__data__,h)}return o}a.select=function(d){return b(function(e){return e.querySelector(d)})};a.selectAll=function(d){return c(function(e){return x(e.querySelectorAll(d))})};a.filter=function(d){for(var e=[],i,g,h,j=0,l=a.length;j<l;j++){g=a[j];e.push(i=[]);i.parentNode=g.parentNode;i.parentData=g.parentData;for(var p=0,q=g.length;p<q;p++)if((h=g[p])&&d.call(h,h.__data__,p))i.push(h)}return O(e)};a.data=function(d,e){function i(k,n){function r(Ga){return k.parentNode.appendChild(Ga)}
var m=0,t=k.length,u=n.length,s=Math.min(t,u),v=Math.max(t,u),z=[],A=[],w=[],B,C;if(e){s={};v=[];var D;C=n.length;for(m=0;m<t;m++){D=e.nodeKey(B=k[m]);if(D in s)w[C++]=k[m];else{s[D]=B;v.push(D)}}for(m=0;m<u;m++){if(B=s[D=e.dataKey(C=n[m])]){B.__data__=C;z[m]=B;A[m]=w[m]=o}else{A[m]={appendChild:r,__data__:C};z[m]=w[m]=o}delete s[D]}for(m=0;m<t;m++)if(v[m]in s)w[m]=k[m]}else{for(;m<s;m++){B=k[m];C=n[m];if(B){B.__data__=C;z[m]=B;A[m]=w[m]=o}else{A[m]={appendChild:r,__data__:C};z[m]=w[m]=o}}for(;m<
u;m++){A[m]={appendChild:r,__data__:n[m]};z[m]=w[m]=o}for(;m<v;m++){w[m]=k[m];A[m]=z[m]=o}}A.parentNode=z.parentNode=w.parentNode=k.parentNode;A.parentData=z.parentData=w.parentData=k.parentData;l.push(A);p.push(z);q.push(w)}var g=-1,h=a.length,j,l=[],p=[],q=[];if(typeof e=="string")e=xa(e);if(typeof d=="function")for(;++g<h;)i(j=a[g],d.call(j,j.parentData,g));else for(;++g<h;)i(j=a[g],d);g=O(p);g.enter=function(k){return O(l).append(k)};g.exit=function(){return O(q)};return g};a.each=function(d){for(var e=
0,i=a.length;e<i;e++)for(var g=a[e],h=0,j=g.length;h<j;h++){var l=g[h];l&&d.call(l,l.__data__,h)}return a};a.node=function(){return f(function(){return this})};a.attr=function(d,e){function i(){this.removeAttribute(d)}function g(){this.removeAttributeNS(d.space,d.local)}function h(){this.setAttribute(d,e)}function j(){this.setAttributeNS(d.space,d.local,e)}function l(){var q=e.apply(this,arguments);q==o?this.removeAttribute(d):this.setAttribute(d,q)}function p(){var q=e.apply(this,arguments);q==o?
this.removeAttributeNS(d.space,d.local):this.setAttributeNS(d.space,d.local,q)}d=d3.ns.qualify(d);if(arguments.length<2)return f(d.local?function(){return this.getAttributeNS(d.space,d.local)}:function(){return this.getAttribute(d)});return a.each(e==o?d.local?g:i:typeof e=="function"?d.local?p:l:d.local?j:h)};a.classed=function(d,e){function i(){var l=this.className;j.lastIndex=0;if(!j.test(l))this.className=E(l+" "+d)}function g(){var l=E(this.className.replace(j," "));this.className=l.length?l:
o}function h(){(e.apply(this,arguments)?i:g).call(this)}var j=RegExp("(^|\\s+)"+d3.requote(d)+"(\\s+|$)","g");if(arguments.length<2)return f(function(){j.lastIndex=0;return j.test(this.className)});return a.each(typeof e=="function"?h:e?i:g)};a.style=function(d,e,i){function g(){this.style.removeProperty(d)}function h(){this.style.setProperty(d,e,i)}function j(){var l=e.apply(this,arguments);l==o?this.style.removeProperty(d):this.style.setProperty(d,l,i)}if(arguments.length<3)i=o;if(arguments.length<
2)return f(function(){return window.getComputedStyle(this,o).getPropertyValue(d)});return a.each(e==o?g:typeof e=="function"?j:h)};a.property=function(d,e){function i(){delete this[d]}function g(){this[d]=e}function h(){var j=e.apply(this,arguments);if(j==o)delete this[d];else this[d]=j}d=d3.ns.qualify(d);if(arguments.length<2)return f(function(){return this[d]});return a.each(e==o?i:typeof e=="function"?h:g)};a.text=function(d){function e(){this.appendChild(document.createTextNode(d))}function i(){var g=
d.apply(this,arguments);g!=o&&this.appendChild(document.createTextNode(g))}if(arguments.length<1)return f(function(){return this.textContent});a.each(function(){for(;this.lastChild;)this.removeChild(this.lastChild)});return d==o?a:a.each(typeof d=="function"?i:e)};a.html=function(d){function e(){this.innerHTML=d}function i(){this.innerHTML=d.apply(this,arguments)}if(arguments.length<1)return f(function(){return this.innerHTML});return a.each(typeof d=="function"?i:e)};a.append=function(d){function e(g){return g.appendChild(document.createElement(d))}
function i(g){return g.appendChild(document.createElementNS(d.space,d.local))}d=d3.ns.qualify(d);return b(d.local?i:e)};a.remove=function(){return b(function(d){var e=d.parentNode;e.removeChild(d);return e})};a.sort=function(d){d=ya.apply(this,arguments);for(var e=0,i=a.length;e<i;e++){var g=a[e];g.sort(d);for(var h=1,j=g.length,l=g[0];h<j;h++){var p=g[h];if(p){l&&l.parentNode.insertBefore(p,l.nextSibling);l=p}}}return a};a.on=function(d,e){d="on"+d;return a.each(function(i,g){this[d]=function(h){var j=
d3.event;d3.event=h;try{e.call(this,i,g)}finally{d3.event=j}}})};a.transition=function(){return Q(a)};a.call=ba;return a}function xa(a){return{nodeKey:function(b){return b.getAttribute(a)},dataKey:function(b){return b[a]}}}function ya(a){if(!arguments.length)a=d3.u;return function(b,c){return a(b&&b.__data__,c&&c.__data__)}}d3.transition=P.transition;var za=0,R=0;
function Q(a){function b(k){var n=true,r=-1;a.each(function(){if(h[++r]!=2){var m=(k-j[r])/l[r],t=this.__transition__,u,s,v=e[r];if(m<1){n=false;if(m<0)return}else m=1;if(h[r]){if(t.d!=f){h[r]=2;return}}else if(!t||t.d>f){h[r]=2;return}else{h[r]=1;g.start.dispatch.apply(this,arguments);v=e[r]={};t.d=f;for(s in d)v[s]=d[s].apply(this,arguments)}u=q(m);for(s in d)v[s].call(this,u);if(m==1){h[r]=2;if(t.d==f){m=t.o;if(m==f){delete this.__transition__;i&&this.parentNode.removeChild(this)}R=f;g.end.dispatch.apply(this,
arguments);R=0;t.o=m}}}});return n}var c={},f=R||++za,d={},e=[],i=false,g=d3.dispatch("start","end"),h=[],j=[],l=[],p,q=d3.ease("cubic-in-out");a.each(function(){(this.__transition__||(this.__transition__={})).o=f});c.delay=function(k){var n=Infinity,r=-1;if(typeof k=="function")a.each(function(){var m=j[++r]=+k.apply(this,arguments);if(m<n)n=m});else{n=+k;a.each(function(){j[++r]=n})}Aa(b,n);return c};c.duration=function(k){var n=-1;if(typeof k=="function"){p=0;a.each(function(){var r=l[++n]=+k.apply(this,
arguments);if(r>p)p=r})}else{p=+k;a.each(function(){l[++n]=p})}return c};c.ease=function(k){q=typeof k=="string"?d3.ease(k):k;return c};c.attrTween=function(k,n){function r(t,u){var s=n.call(this,t,u,this.getAttribute(k));return function(v){this.setAttribute(k,s(v))}}function m(t,u){var s=n.call(this,t,u,this.getAttributeNS(k.space,k.local));return function(v){this.setAttributeNS(k.space,k.local,s(v))}}d["attr."+k]=k.local?m:r;return c};c.attr=function(k,n){return c.attrTween(k,Ba(n))};c.styleTween=
function(k,n,r){d["style."+k]=function(m,t){var u=n.call(this,m,t,window.getComputedStyle(this,o).getPropertyValue(k));return function(s){this.style.setProperty(k,u(s),r)}};return c};c.style=function(k,n,r){return c.styleTween(k,Ba(n),r)};c.select=function(k){var n;k=Q(a.select(k)).ease(q);n=-1;k.delay(function(){return j[++n]});n=-1;k.duration(function(){return l[++n]});return k};c.selectAll=function(k){var n;k=Q(a.selectAll(k)).ease(q);n=-1;k.delay(function(r,m){return j[m?n:++n]});n=-1;k.duration(function(r,
m){return l[m?n:++n]});return k};c.remove=function(){i=true;return c};c.each=function(k,n){g[k].add(n);return c};c.call=ba;return c.delay(0).duration(250)}var S=o,T=0,U;function Aa(a,b){var c=Date.now(),f=false,d=c+b,e=S;if(isFinite(b)){for(;e;){if(e.n==a){e.j=c;e.delay=b;f=true}else{var i=e.j+e.delay;if(i<d)d=i}e=e.next}f||(S={n:a,j:c,delay:b,next:S});if(!U){clearTimeout(T);T=setTimeout(Ca,Math.max(24,d-c))}}}function Ca(){U=setInterval(Da,24);T=0}
function Da(){for(var a,b=Date.now(),c=S;c;){a=b-c.j;if(a>c.delay)c.t=c.n(a);c=c.next}a=o;for(b=S;b;)b=b.t?a?a.next=b.next:S=b.next:(a=b).next;a||(U=clearInterval(U))}function Ba(a){return typeof a=="function"?function(b,c,f){return d3.interpolate(f,a.call(this,b,c))}:function(b,c,f){return d3.interpolate(f,a)}}d3.scale={};
d3.scale.linear=function(){function a(j){return h((j-c)*i)}function b(j){var l=Math.min(c,f),p=Math.max(c,f),q=p-l,k=Math.pow(10,Math.floor(Math.log(q/j)/Math.LN10));j=j/(q/k);if(j<=0.15)k*=10;else if(j<=0.35)k*=5;else if(j<=0.75)k*=2;return{start:Math.ceil(l/k)*k,stop:Math.floor(p/k)*k+k*0.5,q:k}}var c=0,f=1,d=0,e=1,i=1/(f-c),g=(f-c)/(e-d),h=d3.interpolate(d,e);a.invert=function(j){return(j-d)*g+c};a.domain=function(j){if(!arguments.length)return[c,f];c=j[0];f=j[1];i=1/(f-c);g=(f-c)/(e-d);return a};
a.range=function(j){if(!arguments.length)return[d,e];d=j[0];e=j[1];g=(f-c)/(e-d);h=d3.interpolate(d,e);return a};a.ticks=function(j){j=b(j);return d3.range(j.start,j.stop,j.q)};a.tickFormat=function(j){return d3.format(",."+Math.max(0,-Math.floor(Math.log(b(j).q)/Math.LN10+0.01))+"f")};return a};
d3.scale.log=function(){function a(d){return Math.log(d)/Math.LN10}function b(d){return Math.pow(10,d)}function c(d){return f(a(d))}var f=d3.scale.linear();c.invert=function(d){return b(f.invert(d))};c.domain=function(d){if(!arguments.length)return f.domain().map(b);f.domain(d.map(a));return c};c.range=function(){var d=f.range.apply(f,arguments);return arguments.length?c:d};c.ticks=function(){var d=f.domain(),e=Math.floor(d[0]),i=Math.ceil(d[1]),g=[];if(d.every(isFinite)){for(;++e<=i;)for(d=1;d<10;d++)g.push(b(e)*
d);g.push(b(e))}return g};c.tickFormat=function(){return function(d){return d.toPrecision(1)}};return c};
d3.scale.pow=function(){function a(h){return Math.pow(h,d)}function b(h){return Math.pow(h,e)}function c(h){return f(a(h))}var f=d3.scale.linear(),d=1,e=1/d;c.invert=function(h){return b(f.invert(h))};c.domain=function(h){if(!arguments.length)return f.domain().map(b);f.domain(h.map(a));return c};c.range=function(){var h=f.range.apply(f,arguments);return arguments.length?c:h};c.ticks=function(h){return d3.scale.linear().domain(c.domain()).ticks(h)};c.tickFormat=function(h){return d3.scale.linear().domain(c.domain()).tickFormat(h)};
c.exponent=function(h){if(!arguments.length)return d;var g=c.domain();d=h;e=1/h;return c.domain(g)};return c};d3.scale.sqrt=function(){return d3.scale.pow().exponent(0.5)};
d3.scale.ordinal=function(){function a(e){e=e in c?c[e]:c[e]=b.push(e)-1;return f[e%f.length]}var b=[],c={},f=[],d=0;a.domain=function(e){if(!arguments.length)return b;b=e;c={};for(var h=-1,g=-1,i=b.length;++h<i;){e=b[h];e in c||(c[e]=++g)}return a};a.range=function(e){if(!arguments.length)return f;f=e;return a};a.rangePoints=function(e,h){if(arguments.length<2)h=0;var g=e[0],i=e[1],j=(i-g)/(b.length-1+h);f=b.length==1?[(g+i)/2]:d3.range(g+j*h/2,i+j/2,j);d=0;return a};a.rangeBands=function(e,h){if(arguments.length<
2)h=0;var g=e[0],i=e[1],j=(i-g)/(b.length+h);f=d3.range(g+j*h,i,j);d=j*(1-h);return a};a.rangeBand=function(){return d};return a};d3.scale.category10=function(){return d3.scale.ordinal().range(Ea)};d3.scale.category20=function(){return d3.scale.ordinal().range(Fa)};d3.scale.category20b=function(){return d3.scale.ordinal().range(Ha)};d3.scale.category20c=function(){return d3.scale.ordinal().range(Ia)};
d3.scale.pow=function(){function a(i){return Math.pow(i,d)}function b(i){return Math.pow(i,e)}function c(i){return f(a(i))}var f=d3.scale.linear(),d=1,e=1/d;c.invert=function(i){return b(f.invert(i))};c.domain=function(i){if(!arguments.length)return f.domain().map(b);f.domain(i.map(a));return c};c.range=function(){var i=f.range.apply(f,arguments);return arguments.length?c:i};c.ticks=function(i){return d3.scale.linear().domain(c.domain()).ticks(i)};c.tickFormat=function(i){return d3.scale.linear().domain(c.domain()).tickFormat(i)};
c.exponent=function(i){if(!arguments.length)return d;var g=c.domain();d=i;e=1/i;return c.domain(g)};return c};d3.scale.sqrt=function(){return d3.scale.pow().exponent(0.5)};
d3.scale.ordinal=function(){function a(e){e=e in c?c[e]:c[e]=b.push(e)-1;return f[e%f.length]}var b=[],c={},f=[],d=0;a.domain=function(e){if(!arguments.length)return b;b=e;c={};for(var i=-1,g=-1,h=b.length;++i<h;){e=b[i];e in c||(c[e]=++g)}return a};a.range=function(e){if(!arguments.length)return f;f=e;return a};a.rangePoints=function(e,i){if(arguments.length<2)i=0;var g=e[0],h=e[1],j=(h-g)/(b.length-1+i);f=b.length==1?[(g+h)/2]:d3.range(g+j*i/2,h+j/2,j);d=0;return a};a.rangeBands=function(e,i){if(arguments.length<
2)i=0;var g=e[0],h=e[1],j=(h-g)/(b.length+i);f=d3.range(g+j*i,h,j);d=j*(1-i);return a};a.rangeBand=function(){return d};return a};d3.scale.category10=function(){return d3.scale.ordinal().range(Ea)};d3.scale.category20=function(){return d3.scale.ordinal().range(Fa)};d3.scale.category20b=function(){return d3.scale.ordinal().range(Ha)};d3.scale.category20c=function(){return d3.scale.ordinal().range(Ia)};
var Ea=["#1f77b4","#ff7f0e","#2ca02c","#d62728","#9467bd","#8c564b","#e377c2","#7f7f7f","#bcbd22","#17becf"],Fa=["#1f77b4","#aec7e8","#ff7f0e","#ffbb78","#2ca02c","#98df8a","#d62728","#ff9896","#9467bd","#c5b0d5","#8c564b","#c49c94","#e377c2","#f7b6d2","#7f7f7f","#c7c7c7","#bcbd22","#dbdb8d","#17becf","#9edae5"],Ha=["#393b79","#5254a3","#6b6ecf","#9c9ede","#637939","#8ca252","#b5cf6b","#cedb9c","#8c6d31","#bd9e39","#e7ba52","#e7cb94","#843c39","#ad494a","#d6616b","#e7969c","#7b4173","#a55194","#ce6dbd",
"#de9ed6"],Ia=["#3182bd","#6baed6","#9ecae1","#c6dbef","#e6550d","#fd8d3c","#fdae6b","#fdd0a2","#31a354","#74c476","#a1d99b","#c7e9c0","#756bb1","#9e9ac8","#bcbddc","#dadaeb","#636363","#969696","#bdbdbd","#d9d9d9"];d3.svg={};
d3.svg.arc=function(){function a(e,h){var g=b.call(this,e,h),i=c.call(this,e,h),j=f.call(this,e,h)+V,l=d.call(this,e,h)+V,p=l-j,r=Math.cos(j);j=Math.sin(j);var k=Math.cos(l);l=Math.sin(l);return"M"+i*r+","+i*j+"A"+i+","+i+" 0 "+(p<Math.PI?"0":"1")+",1 "+i*k+","+i*l+"L"+g*k+","+g*l+"A"+g+","+g+" 0 "+(p<Math.PI?"0":"1")+",0 "+g*r+","+g*j+"Z"}var b=Ja,c=Ka,f=La,d=Ma;a.innerRadius=function(e){if(!arguments.length)return b;b=y(e);return a};a.outerRadius=function(e){if(!arguments.length)return c;c=y(e);
return a};a.startAngle=function(e){if(!arguments.length)return f;f=y(e);return a};a.endAngle=function(e){if(!arguments.length)return d;d=y(e);return a};return a};var V=-Math.PI/2;function Ja(a){return a.innerRadius}function Ka(a){return a.outerRadius}function La(a){return a.startAngle}function Ma(a){return a.endAngle}
d3.svg.line=function(){function a(e){return e.length<1?n:"M"+d(W(this,e,b,c))}var b=Na,c=Oa,f="linear",d=X[f];a.x=function(e){if(!arguments.length)return b;b=e;return a};a.y=function(e){if(!arguments.length)return c;c=e;return a};a.interpolate=function(e){if(!arguments.length)return f;d=X[f=e];return a};return a};
function W(a,b,c,f){var d=[],e=-1,h=b.length,g=typeof c=="function",i=typeof f=="function",j;if(g&&i)for(;++e<h;)d.push([c.call(a,j=b[e],e),f.call(a,j,e)]);else if(g)for(;++e<h;)d.push([c.call(a,b[e],e),f]);else if(i)for(;++e<h;)d.push([c,f.call(a,b[e],e)]);else for(;++e<h;)d.push([c,f]);return d}function Na(a){return a.x}function Oa(a){return a.y}var X={linear:Pa,basis:Qa};
function Pa(a){if(a.length<1)return n;var b=[],c=0,f=a.length,d=a[0];for(b.push(d[0],",",d[1]);++c<f;)b.push("L",(d=a[c])[0],",",d[1]);return b.join("")}function Qa(a){if(a.length<3)return Pa(a);var b=[],c=1,f=a.length,d=a[0],e=d[0],h=d[1],g=[e,e,e,(d=a[1])[0]],i=[h,h,h,d[1]];b.push(e,",",h);for(Y(b,g,i);++c<f;){d=a[c];g.shift();g.push(d[0]);i.shift();i.push(d[1]);Y(b,g,i)}for(c=-1;++c<2;){g.shift();g.push(d[0]);i.shift();i.push(d[1]);Y(b,g,i)}return b.join("")}
d3.svg.arc=function(){function a(e,i){var g=b.call(this,e,i),h=c.call(this,e,i),j=f.call(this,e,i)+V,l=d.call(this,e,i)+V,p=l-j,q=p<Math.PI?"0":"1",k=Math.cos(j);j=Math.sin(j);var n=Math.cos(l);l=Math.sin(l);return p>=2*Math.PI?g?"M0,"+h+"A"+h+","+h+" 0 1,1 0,"+-h+"A"+h+","+h+" 0 1,1 0,"+h+"M0,"+g+"A"+g+","+g+" 0 1,1 0,"+-g+"A"+g+","+g+" 0 1,1 0,"+g+"Z":"M0,"+h+"A"+h+","+h+" 0 1,1 0,"+-h+"A"+h+","+h+" 0 1,1 0,"+h+"Z":g?"M"+h*k+","+h*j+"A"+h+","+h+" 0 "+q+",1 "+h*n+","+h*l+"L"+g*n+","+g*l+"A"+g+","+
g+" 0 "+q+",0 "+g*k+","+g*j+"Z":"M"+h*k+","+h*j+"A"+h+","+h+" 0 "+q+",1 "+h*n+","+h*l+"L0,0Z"}var b=Ja,c=Ka,f=La,d=Ma;a.innerRadius=function(e){if(!arguments.length)return b;b=y(e);return a};a.outerRadius=function(e){if(!arguments.length)return c;c=y(e);return a};a.startAngle=function(e){if(!arguments.length)return f;f=y(e);return a};a.endAngle=function(e){if(!arguments.length)return d;d=y(e);return a};return a};var V=-Math.PI/2;function Ja(a){return a.innerRadius}
function Ka(a){return a.outerRadius}function La(a){return a.startAngle}function Ma(a){return a.endAngle}d3.svg.line=function(){function a(e){return e.length<1?o:"M"+d(W(this,e,b,c))}var b=Na,c=Oa,f="linear",d=X[f];a.x=function(e){if(!arguments.length)return b;b=e;return a};a.y=function(e){if(!arguments.length)return c;c=e;return a};a.interpolate=function(e){if(!arguments.length)return f;d=X[f=e];return a};return a};
function W(a,b,c,f){var d=[],e=-1,i=b.length,g=typeof c=="function",h=typeof f=="function",j;if(g&&h)for(;++e<i;)d.push([c.call(a,j=b[e],e),f.call(a,j,e)]);else if(g)for(;++e<i;)d.push([c.call(a,b[e],e),f]);else if(h)for(;++e<i;)d.push([c,f.call(a,b[e],e)]);else for(;++e<i;)d.push([c,f]);return d}function Na(a){return a.x}function Oa(a){return a.y}var X={linear:Pa,basis:Qa};
function Pa(a){if(a.length<1)return o;var b=[],c=0,f=a.length,d=a[0];for(b.push(d[0],",",d[1]);++c<f;)b.push("L",(d=a[c])[0],",",d[1]);return b.join("")}function Qa(a){if(a.length<3)return Pa(a);var b=[],c=1,f=a.length,d=a[0],e=d[0],i=d[1],g=[e,e,e,(d=a[1])[0]],h=[i,i,i,d[1]];b.push(e,",",i);for(Y(b,g,h);++c<f;){d=a[c];g.shift();g.push(d[0]);h.shift();h.push(d[1]);Y(b,g,h)}for(c=-1;++c<2;){g.shift();g.push(d[0]);h.shift();h.push(d[1]);Y(b,g,h)}return b.join("")}
function Z(a,b){return a[0]*b[0]+a[1]*b[1]+a[2]*b[2]+a[3]*b[3]}var Ra=[0,2/3,1/3,0],Sa=[0,1/3,2/3,0],Ta=[0,1/6,2/3,1/6];function Y(a,b,c){a.push("C",Z(Ra,b),",",Z(Ra,c),",",Z(Sa,b),",",Z(Sa,c),",",Z(Ta,b),",",Z(Ta,c))}
d3.svg.area=function(){function a(h){return h.length<1?n:"M"+e(W(this,h,b,f))+"L"+e(W(this,h,b,c).reverse())+"Z"}var b=Na,c=Ua,f=Oa,d="linear",e=X[d];a.x=function(h){if(!arguments.length)return b;b=h;return a};a.y0=function(h){if(!arguments.length)return c;c=h;return a};a.y1=function(h){if(!arguments.length)return f;f=h;return a};a.interpolate=function(h){if(!arguments.length)return d;e=X[d=h];return a};return a};function Ua(){return 0}
d3.svg.chord=function(){function a(g,i){var j=b(this,c,g,i),l=b(this,f,g,i);return"M"+j.c+("A"+j.r+","+j.r+" 0 0,1 "+j.p)+(j.k==l.k&&j.m==l.m?"Q 0,0 "+j.c:"Q 0,0 "+l.c+("A"+l.r+","+l.r+" 0 0,1 "+l.p)+("Q 0,0 "+j.c))+"Z"}function b(g,i,j,l){var p=i.call(g,j,l);i=d.call(g,p,l);j=e.call(g,p,l)+V;g=h.call(g,p,l)+V;return{r:i,k:j,m:g,c:[i*Math.cos(j),i*Math.sin(j)],p:[i*Math.cos(g),i*Math.sin(g)]}}var c=Va,f=Wa,d=Xa,e=La,h=Ma;a.radius=function(g){if(!arguments.length)return d;d=y(g);return a};a.source=
function(g){if(!arguments.length)return c;c=y(g);return a};a.target=function(g){if(!arguments.length)return f;f=y(g);return a};a.startAngle=function(g){if(!arguments.length)return e;e=y(g);return a};a.endAngle=function(g){if(!arguments.length)return h;h=y(g);return a};return a};function Va(a){return a.source}function Wa(a){return a.target}function Xa(a){return a.radius}
d3.svg.area=function(){function a(i){return i.length<1?o:"M"+e(W(this,i,b,f))+"L"+e(W(this,i,b,c).reverse())+"Z"}var b=Na,c=Ua,f=Oa,d="linear",e=X[d];a.x=function(i){if(!arguments.length)return b;b=i;return a};a.y0=function(i){if(!arguments.length)return c;c=i;return a};a.y1=function(i){if(!arguments.length)return f;f=i;return a};a.interpolate=function(i){if(!arguments.length)return d;e=X[d=i];return a};return a};function Ua(){return 0}
d3.svg.chord=function(){function a(g,h){var j=b(this,c,g,h),l=b(this,f,g,h);return"M"+j.c+("A"+j.r+","+j.r+" 0 0,1 "+j.p)+(j.k==l.k&&j.m==l.m?"Q 0,0 "+j.c:"Q 0,0 "+l.c+("A"+l.r+","+l.r+" 0 0,1 "+l.p)+("Q 0,0 "+j.c))+"Z"}function b(g,h,j,l){var p=h.call(g,j,l);h=d.call(g,p,l);j=e.call(g,p,l)+V;g=i.call(g,p,l)+V;return{r:h,k:j,m:g,c:[h*Math.cos(j),h*Math.sin(j)],p:[h*Math.cos(g),h*Math.sin(g)]}}var c=Va,f=Wa,d=Xa,e=La,i=Ma;a.radius=function(g){if(!arguments.length)return d;d=y(g);return a};a.source=
function(g){if(!arguments.length)return c;c=y(g);return a};a.target=function(g){if(!arguments.length)return f;f=y(g);return a};a.startAngle=function(g){if(!arguments.length)return e;e=y(g);return a};a.endAngle=function(g){if(!arguments.length)return i;i=y(g);return a};return a};function Va(a){return a.source}function Wa(a){return a.target}function Xa(a){return a.radius}
d3.svg.mouse=function(a){var b=(a.ownerSVGElement||a).createSVGPoint();if($<0&&(window.scrollX||window.scrollY)){var c=d3.select(document.body).append("svg:svg").style("position","absolute").style("top",0).style("left",0),f=c[0][0].getScreenCTM();$=!(f.f||f.e);c.remove()}if($){b.x=d3.event.pageX;b.y=d3.event.pageY}else{b.x=d3.event.clientX;b.y=d3.event.clientY}b=b.matrixTransform(a.getScreenCTM().inverse());return[b.x,b.y]};var $=/WebKit/.test(navigator.userAgent)?-1:0;})()

2
src/core/core.js
Просмотреть файл

@ -1 +1 @@
d3 = {version: "0.28.2"}; // semver
d3 = {version: "0.28.3"}; // semver

32
src/svg/arc.js
Просмотреть файл

@ -10,18 +10,34 @@ d3["svg"]["arc"] = function() {
a0 = startAngle.call(this, d, i) + d3_svg_arcOffset,
a1 = endAngle.call(this, d, i) + d3_svg_arcOffset,
da = a1 - a0,
df = da < Math.PI ? "0" : "1",
c0 = Math.cos(a0),
s0 = Math.sin(a0),
c1 = Math.cos(a1),
s1 = Math.sin(a1);
return "M" + r1 * c0 + "," + r1 * s0
+ "A" + r1 + "," + r1 + " 0 "
+ ((da < Math.PI) ? "0" : "1") + ",1 "
+ r1 * c1 + "," + r1 * s1
+ "L" + r0 * c1 + "," + r0 * s1
+ "A" + r0 + "," + r0 + " 0 "
+ ((da < Math.PI) ? "0" : "1") + ",0 "
+ r0 * c0 + "," + r0 * s0 + "Z";
return da >= 2 * Math.PI
? (r0
? "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "M0," + r0
+ "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
+ "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+ "Z"
: "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "Z")
: (r0
? "M" + r1 * c0 + "," + r1 * s0
+ "A" + r1 + "," + r1 + " 0 " + df + ",1 " + r1 * c1 + "," + r1 * s1
+ "L" + r0 * c1 + "," + r0 * s1
+ "A" + r0 + "," + r0 + " 0 " + df + ",0 " + r0 * c0 + "," + r0 * s0
+ "Z"
: "M" + r1 * c0 + "," + r1 * s0
+ "A" + r1 + "," + r1 + " 0 " + df + ",1 " + r1 * c1 + "," + r1 * s1
+ "L0,0"
+ "Z");
}
arc["innerRadius"] = function(v) {