diff --git a/d3.js b/d3.js index e29dfe06..b1d2e578 100644 --- a/d3.js +++ b/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) { diff --git a/d3.min.js b/d3.min.js index 87bda89e..5f3f0a15 100644 --- a/d3.min.js +++ b/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 ab?1:0};d3.descending=function(a,b){return ba?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(;++eb;)f.push(e);else for(;(e=a+c*++d)b?1:0};d3.descending=function(a,b){return ba?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(;++eb;)f.push(e);else for(;(e=a+c*++d)=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=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=^]))?([+\- ])?(#)?(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}d360)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;lf){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(mp)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(hc.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;lf){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(mp)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(ic.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=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= 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) {