From 01ec0945bee4c2dbfa35b54aeaca18bd86554509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fran=C3=A7ois=20GUILLEM?= Date: Thu, 17 Aug 2017 13:42:54 +0200 Subject: [PATCH 1/2] BUGFIX: cannot update color palette (#19) --- inst/leaflet.minicharts.min.js | 4 ++-- javascript/minichart_bindings.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/inst/leaflet.minicharts.min.js b/inst/leaflet.minicharts.min.js index f91ef15..25245b3 100644 --- a/inst/leaflet.minicharts.min.js +++ b/inst/leaflet.minicharts.min.js @@ -1,7 +1,7 @@ -/*! leaflet.minicharts 0.2.0 2017-07-07 +/*! leaflet.minicharts 0.2.0 2017-08-17 Copyright © 2016 RTE Réseau de transport d’électricité */ -!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c||a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g=0?(f>=Zj?10:f>=$j?5:f>=_j?2:1)*Math.pow(10,e):-Math.pow(10,-e)/(f>=Zj?10:f>=$j?5:f>=_j?2:1)}function e(a,b,c){var d=Math.abs(b-a)/Math.max(0,c),e=Math.pow(10,Math.floor(Math.log(d)/Math.LN10)),f=d/e;return f>=Zj?e*=10:f>=$j?e*=5:f>=_j&&(e*=2),b=0&&(c=a.slice(d+1),a=a.slice(0,d)),a&&!b.hasOwnProperty(a))throw new Error("unknown type: "+a);return{type:a,name:c}})}function s(a,b){for(var c,d=0,e=a.length;d=0&&(b=a.slice(c+1),a=a.slice(0,c)),{type:a,name:b}})}function B(a){return function(){var b=this.__on;if(b){for(var c,d=0,e=-1,f=b.length;db?1:a>=b?0:NaN}function K(a){return function(){this.removeAttribute(a)}}function L(a){return function(){this.removeAttributeNS(a.space,a.local)}}function M(a,b){return function(){this.setAttribute(a,b)}}function N(a,b){return function(){this.setAttributeNS(a.space,a.local,b)}}function O(a,b){return function(){var c=b.apply(this,arguments);null==c?this.removeAttribute(a):this.setAttribute(a,c)}}function P(a,b){return function(){var c=b.apply(this,arguments);null==c?this.removeAttributeNS(a.space,a.local):this.setAttributeNS(a.space,a.local,c)}}function Q(a){return function(){this.style.removeProperty(a)}}function R(a,b,c){return function(){this.style.setProperty(a,b,c)}}function S(a,b,c){return function(){var d=b.apply(this,arguments);null==d?this.style.removeProperty(a):this.style.setProperty(a,d,c)}}function T(a){return function(){delete this[a]}}function U(a,b){return function(){this[a]=b}}function V(a,b){return function(){var c=b.apply(this,arguments);null==c?delete this[a]:this[a]=c}}function W(a){return a.trim().split(/^|\s+/)}function X(a){return a.classList||new Y(a)}function Y(a){this._node=a,this._names=W(a.getAttribute("class")||"")}function Z(a,b){for(var c=X(a),d=-1,e=b.length;++d>8&15|b>>4&240,b>>4&15|240&b,(15&b)<<4|15&b,1)):(b=Hl.exec(a))?Aa(parseInt(b[1],16)):(b=Il.exec(a))?new Ea(b[1],b[2],b[3],1):(b=Jl.exec(a))?new Ea(255*b[1]/100,255*b[2]/100,255*b[3]/100,1):(b=Kl.exec(a))?Ba(b[1],b[2],b[3],b[4]):(b=Ll.exec(a))?Ba(255*b[1]/100,255*b[2]/100,255*b[3]/100,b[4]):(b=Ml.exec(a))?Fa(b[1],b[2]/100,b[3]/100,1):(b=Nl.exec(a))?Fa(b[1],b[2]/100,b[3]/100,b[4]):Ol.hasOwnProperty(a)?Aa(Ol[a]):"transparent"===a?new Ea(NaN,NaN,NaN,0):null}function Aa(a){return new Ea(a>>16&255,a>>8&255,255&a,1)}function Ba(a,b,c,d){return d<=0&&(a=b=c=NaN),new Ea(a,b,c,d)}function Ca(a){return a instanceof ya||(a=za(a)),a?(a=a.rgb(),new Ea(a.r,a.g,a.b,a.opacity)):new Ea}function Da(a,b,c,d){return 1===arguments.length?Ca(a):new Ea(a,b,c,null==d?1:d)}function Ea(a,b,c,d){this.r=+a,this.g=+b,this.b=+c,this.opacity=+d}function Fa(a,b,c,d){return d<=0?a=b=c=NaN:c<=0||c>=1?a=b=NaN:b<=0&&(a=NaN),new Ia(a,b,c,d)}function Ga(a){if(a instanceof Ia)return new Ia(a.h,a.s,a.l,a.opacity);if(a instanceof ya||(a=za(a)),!a)return new Ia;if(a instanceof Ia)return a;a=a.rgb();var b=a.r/255,c=a.g/255,d=a.b/255,e=Math.min(b,c,d),f=Math.max(b,c,d),g=NaN,h=f-e,i=(f+e)/2;return h?(g=b===f?(c-d)/h+6*(c0&&i<1?0:g,new Ia(g,h,i,a.opacity)}function Ha(a,b,c,d){return 1===arguments.length?Ga(a):new Ia(a,b,c,null==d?1:d)}function Ia(a,b,c,d){this.h=+a,this.s=+b,this.l=+c,this.opacity=+d}function Ja(a,b,c){return 255*(a<60?b+(c-b)*a/60:a<180?c:a<240?b+(c-b)*(240-a)/60:b)}function Ka(a){if(a instanceof Ma)return new Ma(a.l,a.a,a.b,a.opacity);if(a instanceof Ta){var b=a.h*Pl;return new Ma(a.l,Math.cos(b)*a.c,Math.sin(b)*a.c,a.opacity)}a instanceof Ea||(a=Ca(a));var c=Qa(a.r),d=Qa(a.g),e=Qa(a.b),f=Na((.4124564*c+.3575761*d+.1804375*e)/Rl),g=Na((.2126729*c+.7151522*d+.072175*e)/Sl);return new Ma(116*g-16,500*(f-g),200*(g-Na((.0193339*c+.119192*d+.9503041*e)/Tl)),a.opacity)}function La(a,b,c,d){return 1===arguments.length?Ka(a):new Ma(a,b,c,null==d?1:d)}function Ma(a,b,c,d){this.l=+a,this.a=+b,this.b=+c,this.opacity=+d}function Na(a){return a>Xl?Math.pow(a,1/3):a/Wl+Ul}function Oa(a){return a>Vl?a*a*a:Wl*(a-Ul)}function Pa(a){return 255*(a<=.0031308?12.92*a:1.055*Math.pow(a,1/2.4)-.055)}function Qa(a){return(a/=255)<=.04045?a/12.92:Math.pow((a+.055)/1.055,2.4)}function Ra(a){if(a instanceof Ta)return new Ta(a.h,a.c,a.l,a.opacity);a instanceof Ma||(a=Ka(a));var b=Math.atan2(a.b,a.a)*Ql;return new Ta(b<0?b+360:b,Math.sqrt(a.a*a.a+a.b*a.b),a.l,a.opacity)}function Sa(a,b,c,d){return 1===arguments.length?Ra(a):new Ta(a,b,c,null==d?1:d)}function Ta(a,b,c,d){this.h=+a,this.c=+b,this.l=+c,this.opacity=+d}function Ua(a){if(a instanceof Wa)return new Wa(a.h,a.s,a.l,a.opacity);a instanceof Ea||(a=Ca(a));var b=a.r/255,c=a.g/255,d=a.b/255,e=(dm*d+bm*b-cm*c)/(dm+bm-cm),f=d-e,g=(am*(c-e)-$l*f)/_l,h=Math.sqrt(g*g+f*f)/(am*e*(1-e)),i=h?Math.atan2(g,f)*Ql-120:NaN;return new Wa(i<0?i+360:i,h,e,a.opacity)}function Va(a,b,c,d){return 1===arguments.length?Ua(a):new Wa(a,b,c,null==d?1:d)}function Wa(a,b,c,d){this.h=+a,this.s=+b,this.l=+c,this.opacity=+d}function Xa(a,b,c,d,e){var f=a*a,g=f*a;return((1-3*a+3*f-g)*b+(4-6*f+3*g)*c+(1+3*a+3*f-3*g)*d+g*e)/6}function Ya(a,b){return function(c){return a+c*b}}function Za(a,b,c){return a=Math.pow(a,c),b=Math.pow(b,c)-a,c=1/c,function(d){return Math.pow(a+d*b,c)}}function $a(a,b){var c=b-a;return c?Ya(a,c>180||c<-180?c-360*Math.round(c/360):c):mm(isNaN(a)?b:a)}function _a(a){return 1==(a=+a)?ab:function(b,c){return c-b?Za(b,c,a):mm(isNaN(b)?c:b)}}function ab(a,b){var c=b-a;return c?Ya(a,c):mm(isNaN(a)?b:a)}function bb(a){return function(b){var c,d,e=b.length,f=new Array(e),g=new Array(e),h=new Array(e);for(c=0;c180?b+=360:b-a>180&&(a+=360),f.push({i:c.push(e(c)+"rotate(",null,d)-2,x:sm(a,b)})):b&&c.push(e(c)+"rotate("+b+d)}function h(a,b,c,f){a!==b?f.push({i:c.push(e(c)+"skewX(",null,d)-2,x:sm(a,b)}):b&&c.push(e(c)+"skewX("+b+d)}function i(a,b,c,d,f,g){if(a!==c||b!==d){var h=f.push(e(f)+"scale(",null,",",null,")");g.push({i:h-4,x:sm(a,c)},{i:h-2,x:sm(b,d)})}else 1===c&&1===d||f.push(e(f)+"scale("+c+","+d+")")}return function(b,c){var d=[],e=[];return b=a(b),c=a(c),f(b.translateX,b.translateY,c.translateX,c.translateY,d,e),g(b.rotate,c.rotate,d,e),h(b.skewX,c.skewX,d,e),i(b.scaleX,b.scaleY,c.scaleX,c.scaleY,d,e),b=c=null,function(a){for(var b,c=-1,f=e.length;++c=0&&b._call.call(null,a),b=b._next;--Nm}function tb(){Sm=(Rm=Um.now())+Tm,Nm=Om=0;try{sb()}finally{Nm=0,vb(),Sm=0}}function ub(){var a=Um.now(),b=a-Rm;b>Qm&&(Tm-=b,Rm=a)}function vb(){for(var a,b,c=im,d=1/0;c;)c._call?(d>c._time&&(d=c._time),a=c,c=c._next):(b=c._next,c._next=null,c=a?a._next=b:im=b);jm=a,wb(d)}function wb(a){if(!Nm){Om&&(Om=clearTimeout(Om));var b=a-Sm;b>24?(a<1/0&&(Om=setTimeout(tb,b)),Pm&&(Pm=clearInterval(Pm))):(Pm||(Rm=Sm,Pm=setInterval(ub,Qm)),Nm=1,Vm(tb))}}function xb(a,b){var c=a.__transition;if(!c||!(c=c[b])||c.state>$m)throw new Error("too late");return c}function yb(a,b){var c=a.__transition;if(!c||!(c=c[b])||c.state>an)throw new Error("too late");return c}function zb(a,b){var c=a.__transition;if(!c||!(c=c[b]))throw new Error("too late");return c}function Ab(a,b,c){function d(a){c.state=_m,c.timer.restart(e,c.delay,c.time),c.delay<=a&&e(a-c.delay)}function e(d){var j,k,l,m;if(c.state!==_m)return g();for(j in i)if(m=i[j],m.name===c.name){if(m.state===bn)return Wm(e);m.state===cn?(m.state=en,m.timer.stop(),m.on.call("interrupt",a,a.__data__,m.index,m.group),delete i[j]):+j=0&&(a=a.slice(0,b)),!a||"start"===a})}function Sb(a,b,c){var d,e,f=Rb(b)?xb:yb;return function(){var g=f(this,a),h=g.on;h!==d&&(e=(d=h).copy()).on(b,c),g.on=e}}function Tb(a){return function(){var b=this.parentNode;for(var c in this.__transition)if(+c!==a)return;b&&b.removeChild(this)}}function Ub(a,b){var c,d,e;return function(){var f=gl(this).getComputedStyle(this,null),g=f.getPropertyValue(a),h=(this.style.removeProperty(a),f.getPropertyValue(a));return g===h?null:g===c&&h===d?e:e=b(c=g,d=h)}}function Vb(a){return function(){this.style.removeProperty(a)}}function Wb(a,b,c){var d,e;return function(){var f=gl(this).getComputedStyle(this,null).getPropertyValue(a);return f===c?null:f===d?e:e=b(d=f,c)}}function Xb(a,b,c){var d,e,f;return function(){var g=gl(this).getComputedStyle(this,null),h=g.getPropertyValue(a),i=c(this);return null==i&&(this.style.removeProperty(a),i=g.getPropertyValue(a)),h===i?null:h===d&&i===e?f:f=b(d=h,e=i)}}function Yb(a,b,c){function d(){var d=this,e=b.apply(d,arguments);return e&&function(b){d.style.setProperty(a,e(b),c)}}return d._value=b,d}function Zb(a){return function(){this.textContent=a}}function $b(a){return function(){var b=a(this);this.textContent=null==b?"":b}}function _b(a,b,c,d){this._groups=a,this._parents=b,this._name=c,this._id=d}function ac(a){return qa().transition(a)}function bc(){return++Cn}function cc(a){return+a}function dc(a){return a*a}function ec(a){return a*(2-a)}function fc(a){return((a*=2)<=1?a*a:--a*(2-a)+1)/2}function gc(a){return a*a*a}function hc(a){return--a*a*a+1}function ic(a){return((a*=2)<=1?a*a*a:(a-=2)*a*a+2)/2}function jc(a){return 1-Math.cos(a*In)}function kc(a){return Math.sin(a*In)}function lc(a){return(1-Math.cos(Hn*a))/2}function mc(a){return Math.pow(2,10*a-10)}function nc(a){return 1-Math.pow(2,-10*a)}function oc(a){return((a*=2)<=1?Math.pow(2,10*a-10):2-Math.pow(2,10-10*a))/2}function pc(a){return 1-Math.sqrt(1-a*a)}function qc(a){return Math.sqrt(1- --a*a)}function rc(a){return((a*=2)<=1?1-Math.sqrt(1-a*a):Math.sqrt(1-(a-=2)*a)+1)/2}function sc(a){return 1-tc(1-a)}function tc(a){return(a=+a)Math.abs(a[1]-M[1])?x=!0:w=!0),M=a,v=!0,fo(),f()}function f(){var a;switch(t=M[0]-L[0],u=M[1]-L[1],A){case ho:case go:B&&(t=Math.max(G-l,Math.min(I-p,t)),m=l+t,q=p+t),C&&(u=Math.max(H-n,Math.min(J-r,u)),o=n+u,s=r+u);break;case io:B<0?(t=Math.max(G-l,Math.min(I-l,t)),m=l+t,q=p):B>0&&(t=Math.max(G-p,Math.min(I-p,t)),m=l,q=p+t),C<0?(u=Math.max(H-n,Math.min(J-n,u)),o=n+u,s=r):C>0&&(u=Math.max(H-r,Math.min(J-r,u)),o=n,s=r+u);break;case jo:B&&(m=Math.max(G,Math.min(I,l-t*B)),q=Math.max(G,Math.min(I,p+t*B))),C&&(o=Math.max(H,Math.min(J,n-u*C)),s=Math.max(H,Math.min(J,r+u*C)))}q0&&(l=m-t),C<0?r=s-u:C>0&&(n=o-u),A=ho,P.attr("cursor",no.selection),f());break;default:return}fo()}function j(){switch(a.event.keyCode){case 16:K&&(w=x=K=!1,f());break;case 18:A===jo&&(B<0?p=q:B>0&&(l=m),C<0?r=s:C>0&&(n=o),A=io,f());break;case 32:A===ho&&(a.event.altKey?(B&&(p=q-t*B,l=m+t*B),C&&(r=s-u*C,n=o+u*C),A=jo):(B<0?p=q:B>0&&(l=m),C<0?r=s:C>0&&(n=o),A=io),P.attr("cursor",no[z]),f());break;default:return}fo()}if(a.event.touches){if(a.event.changedTouches.length=0?(f>=Zj?10:f>=$j?5:f>=_j?2:1)*Math.pow(10,e):-Math.pow(10,-e)/(f>=Zj?10:f>=$j?5:f>=_j?2:1)}function e(a,b,c){var d=Math.abs(b-a)/Math.max(0,c),e=Math.pow(10,Math.floor(Math.log(d)/Math.LN10)),f=d/e;return f>=Zj?e*=10:f>=$j?e*=5:f>=_j&&(e*=2),b=0&&(c=a.slice(d+1),a=a.slice(0,d)),a&&!b.hasOwnProperty(a))throw new Error("unknown type: "+a);return{type:a,name:c}})}function s(a,b){for(var c,d=0,e=a.length;d=0&&(b=a.slice(c+1),a=a.slice(0,c)),{type:a,name:b}})}function B(a){return function(){var b=this.__on;if(b){for(var c,d=0,e=-1,f=b.length;db?1:a>=b?0:NaN}function K(a){return function(){this.removeAttribute(a)}}function L(a){return function(){this.removeAttributeNS(a.space,a.local)}}function M(a,b){return function(){this.setAttribute(a,b)}}function N(a,b){return function(){this.setAttributeNS(a.space,a.local,b)}}function O(a,b){return function(){var c=b.apply(this,arguments);null==c?this.removeAttribute(a):this.setAttribute(a,c)}}function P(a,b){return function(){var c=b.apply(this,arguments);null==c?this.removeAttributeNS(a.space,a.local):this.setAttributeNS(a.space,a.local,c)}}function Q(a){return function(){this.style.removeProperty(a)}}function R(a,b,c){return function(){this.style.setProperty(a,b,c)}}function S(a,b,c){return function(){var d=b.apply(this,arguments);null==d?this.style.removeProperty(a):this.style.setProperty(a,d,c)}}function T(a){return function(){delete this[a]}}function U(a,b){return function(){this[a]=b}}function V(a,b){return function(){var c=b.apply(this,arguments);null==c?delete this[a]:this[a]=c}}function W(a){return a.trim().split(/^|\s+/)}function X(a){return a.classList||new Y(a)}function Y(a){this._node=a,this._names=W(a.getAttribute("class")||"")}function Z(a,b){for(var c=X(a),d=-1,e=b.length;++d>8&15|b>>4&240,b>>4&15|240&b,(15&b)<<4|15&b,1)):(b=Hl.exec(a))?Aa(parseInt(b[1],16)):(b=Il.exec(a))?new Ea(b[1],b[2],b[3],1):(b=Jl.exec(a))?new Ea(255*b[1]/100,255*b[2]/100,255*b[3]/100,1):(b=Kl.exec(a))?Ba(b[1],b[2],b[3],b[4]):(b=Ll.exec(a))?Ba(255*b[1]/100,255*b[2]/100,255*b[3]/100,b[4]):(b=Ml.exec(a))?Fa(b[1],b[2]/100,b[3]/100,1):(b=Nl.exec(a))?Fa(b[1],b[2]/100,b[3]/100,b[4]):Ol.hasOwnProperty(a)?Aa(Ol[a]):"transparent"===a?new Ea(NaN,NaN,NaN,0):null}function Aa(a){return new Ea(a>>16&255,a>>8&255,255&a,1)}function Ba(a,b,c,d){return d<=0&&(a=b=c=NaN),new Ea(a,b,c,d)}function Ca(a){return a instanceof ya||(a=za(a)),a?(a=a.rgb(),new Ea(a.r,a.g,a.b,a.opacity)):new Ea}function Da(a,b,c,d){return 1===arguments.length?Ca(a):new Ea(a,b,c,null==d?1:d)}function Ea(a,b,c,d){this.r=+a,this.g=+b,this.b=+c,this.opacity=+d}function Fa(a,b,c,d){return d<=0?a=b=c=NaN:c<=0||c>=1?a=b=NaN:b<=0&&(a=NaN),new Ia(a,b,c,d)}function Ga(a){if(a instanceof Ia)return new Ia(a.h,a.s,a.l,a.opacity);if(a instanceof ya||(a=za(a)),!a)return new Ia;if(a instanceof Ia)return a;a=a.rgb();var b=a.r/255,c=a.g/255,d=a.b/255,e=Math.min(b,c,d),f=Math.max(b,c,d),g=NaN,h=f-e,i=(f+e)/2;return h?(g=b===f?(c-d)/h+6*(c0&&i<1?0:g,new Ia(g,h,i,a.opacity)}function Ha(a,b,c,d){return 1===arguments.length?Ga(a):new Ia(a,b,c,null==d?1:d)}function Ia(a,b,c,d){this.h=+a,this.s=+b,this.l=+c,this.opacity=+d}function Ja(a,b,c){return 255*(a<60?b+(c-b)*a/60:a<180?c:a<240?b+(c-b)*(240-a)/60:b)}function Ka(a){if(a instanceof Ma)return new Ma(a.l,a.a,a.b,a.opacity);if(a instanceof Ta){var b=a.h*Pl;return new Ma(a.l,Math.cos(b)*a.c,Math.sin(b)*a.c,a.opacity)}a instanceof Ea||(a=Ca(a));var c=Qa(a.r),d=Qa(a.g),e=Qa(a.b),f=Na((.4124564*c+.3575761*d+.1804375*e)/Rl),g=Na((.2126729*c+.7151522*d+.072175*e)/Sl);return new Ma(116*g-16,500*(f-g),200*(g-Na((.0193339*c+.119192*d+.9503041*e)/Tl)),a.opacity)}function La(a,b,c,d){return 1===arguments.length?Ka(a):new Ma(a,b,c,null==d?1:d)}function Ma(a,b,c,d){this.l=+a,this.a=+b,this.b=+c,this.opacity=+d}function Na(a){return a>Xl?Math.pow(a,1/3):a/Wl+Ul}function Oa(a){return a>Vl?a*a*a:Wl*(a-Ul)}function Pa(a){return 255*(a<=.0031308?12.92*a:1.055*Math.pow(a,1/2.4)-.055)}function Qa(a){return(a/=255)<=.04045?a/12.92:Math.pow((a+.055)/1.055,2.4)}function Ra(a){if(a instanceof Ta)return new Ta(a.h,a.c,a.l,a.opacity);a instanceof Ma||(a=Ka(a));var b=Math.atan2(a.b,a.a)*Ql;return new Ta(b<0?b+360:b,Math.sqrt(a.a*a.a+a.b*a.b),a.l,a.opacity)}function Sa(a,b,c,d){return 1===arguments.length?Ra(a):new Ta(a,b,c,null==d?1:d)}function Ta(a,b,c,d){this.h=+a,this.c=+b,this.l=+c,this.opacity=+d}function Ua(a){if(a instanceof Wa)return new Wa(a.h,a.s,a.l,a.opacity);a instanceof Ea||(a=Ca(a));var b=a.r/255,c=a.g/255,d=a.b/255,e=(dm*d+bm*b-cm*c)/(dm+bm-cm),f=d-e,g=(am*(c-e)-$l*f)/_l,h=Math.sqrt(g*g+f*f)/(am*e*(1-e)),i=h?Math.atan2(g,f)*Ql-120:NaN;return new Wa(i<0?i+360:i,h,e,a.opacity)}function Va(a,b,c,d){return 1===arguments.length?Ua(a):new Wa(a,b,c,null==d?1:d)}function Wa(a,b,c,d){this.h=+a,this.s=+b,this.l=+c,this.opacity=+d}function Xa(a,b,c,d,e){var f=a*a,g=f*a;return((1-3*a+3*f-g)*b+(4-6*f+3*g)*c+(1+3*a+3*f-3*g)*d+g*e)/6}function Ya(a,b){return function(c){return a+c*b}}function Za(a,b,c){return a=Math.pow(a,c),b=Math.pow(b,c)-a,c=1/c,function(d){return Math.pow(a+d*b,c)}}function $a(a,b){var c=b-a;return c?Ya(a,c>180||c<-180?c-360*Math.round(c/360):c):mm(isNaN(a)?b:a)}function _a(a){return 1==(a=+a)?ab:function(b,c){return c-b?Za(b,c,a):mm(isNaN(b)?c:b)}}function ab(a,b){var c=b-a;return c?Ya(a,c):mm(isNaN(a)?b:a)}function bb(a){return function(b){var c,d,e=b.length,f=new Array(e),g=new Array(e),h=new Array(e);for(c=0;c180?b+=360:b-a>180&&(a+=360),f.push({i:c.push(e(c)+"rotate(",null,d)-2,x:sm(a,b)})):b&&c.push(e(c)+"rotate("+b+d)}function h(a,b,c,f){a!==b?f.push({i:c.push(e(c)+"skewX(",null,d)-2,x:sm(a,b)}):b&&c.push(e(c)+"skewX("+b+d)}function i(a,b,c,d,f,g){if(a!==c||b!==d){var h=f.push(e(f)+"scale(",null,",",null,")");g.push({i:h-4,x:sm(a,c)},{i:h-2,x:sm(b,d)})}else 1===c&&1===d||f.push(e(f)+"scale("+c+","+d+")")}return function(b,c){var d=[],e=[];return b=a(b),c=a(c),f(b.translateX,b.translateY,c.translateX,c.translateY,d,e),g(b.rotate,c.rotate,d,e),h(b.skewX,c.skewX,d,e),i(b.scaleX,b.scaleY,c.scaleX,c.scaleY,d,e),b=c=null,function(a){for(var b,c=-1,f=e.length;++c=0&&b._call.call(null,a),b=b._next;--Nm}function tb(){Sm=(Rm=Um.now())+Tm,Nm=Om=0;try{sb()}finally{Nm=0,vb(),Sm=0}}function ub(){var a=Um.now(),b=a-Rm;b>Qm&&(Tm-=b,Rm=a)}function vb(){for(var a,b,c=im,d=1/0;c;)c._call?(d>c._time&&(d=c._time),a=c,c=c._next):(b=c._next,c._next=null,c=a?a._next=b:im=b);jm=a,wb(d)}function wb(a){if(!Nm){Om&&(Om=clearTimeout(Om));var b=a-Sm;b>24?(a<1/0&&(Om=setTimeout(tb,b)),Pm&&(Pm=clearInterval(Pm))):(Pm||(Rm=Sm,Pm=setInterval(ub,Qm)),Nm=1,Vm(tb))}}function xb(a,b){var c=a.__transition;if(!c||!(c=c[b])||c.state>$m)throw new Error("too late");return c}function yb(a,b){var c=a.__transition;if(!c||!(c=c[b])||c.state>an)throw new Error("too late");return c}function zb(a,b){var c=a.__transition;if(!c||!(c=c[b]))throw new Error("too late");return c}function Ab(a,b,c){function d(a){c.state=_m,c.timer.restart(e,c.delay,c.time),c.delay<=a&&e(a-c.delay)}function e(d){var j,k,l,m;if(c.state!==_m)return g();for(j in i)if(m=i[j],m.name===c.name){if(m.state===bn)return Wm(e);m.state===cn?(m.state=en,m.timer.stop(),m.on.call("interrupt",a,a.__data__,m.index,m.group),delete i[j]):+j=0&&(a=a.slice(0,b)),!a||"start"===a})}function Sb(a,b,c){var d,e,f=Rb(b)?xb:yb;return function(){var g=f(this,a),h=g.on;h!==d&&(e=(d=h).copy()).on(b,c),g.on=e}}function Tb(a){return function(){var b=this.parentNode;for(var c in this.__transition)if(+c!==a)return;b&&b.removeChild(this)}}function Ub(a,b){var c,d,e;return function(){var f=gl(this).getComputedStyle(this,null),g=f.getPropertyValue(a),h=(this.style.removeProperty(a),f.getPropertyValue(a));return g===h?null:g===c&&h===d?e:e=b(c=g,d=h)}}function Vb(a){return function(){this.style.removeProperty(a)}}function Wb(a,b,c){var d,e;return function(){var f=gl(this).getComputedStyle(this,null).getPropertyValue(a);return f===c?null:f===d?e:e=b(d=f,c)}}function Xb(a,b,c){var d,e,f;return function(){var g=gl(this).getComputedStyle(this,null),h=g.getPropertyValue(a),i=c(this);return null==i&&(this.style.removeProperty(a),i=g.getPropertyValue(a)),h===i?null:h===d&&i===e?f:f=b(d=h,e=i)}}function Yb(a,b,c){function d(){var d=this,e=b.apply(d,arguments);return e&&function(b){d.style.setProperty(a,e(b),c)}}return d._value=b,d}function Zb(a){return function(){this.textContent=a}}function $b(a){return function(){var b=a(this);this.textContent=null==b?"":b}}function _b(a,b,c,d){this._groups=a,this._parents=b,this._name=c,this._id=d}function ac(a){return qa().transition(a)}function bc(){return++Cn}function cc(a){return+a}function dc(a){return a*a}function ec(a){return a*(2-a)}function fc(a){return((a*=2)<=1?a*a:--a*(2-a)+1)/2}function gc(a){return a*a*a}function hc(a){return--a*a*a+1}function ic(a){return((a*=2)<=1?a*a*a:(a-=2)*a*a+2)/2}function jc(a){return 1-Math.cos(a*In)}function kc(a){return Math.sin(a*In)}function lc(a){return(1-Math.cos(Hn*a))/2}function mc(a){return Math.pow(2,10*a-10)}function nc(a){return 1-Math.pow(2,-10*a)}function oc(a){return((a*=2)<=1?Math.pow(2,10*a-10):2-Math.pow(2,10-10*a))/2}function pc(a){return 1-Math.sqrt(1-a*a)}function qc(a){return Math.sqrt(1- --a*a)}function rc(a){return((a*=2)<=1?1-Math.sqrt(1-a*a):Math.sqrt(1-(a-=2)*a)+1)/2}function sc(a){return 1-tc(1-a)}function tc(a){return(a=+a)Math.abs(a[1]-M[1])?x=!0:w=!0),M=a,v=!0,fo(),f()}function f(){var a;switch(t=M[0]-L[0],u=M[1]-L[1],A){case ho:case go:B&&(t=Math.max(G-l,Math.min(I-p,t)),m=l+t,q=p+t),C&&(u=Math.max(H-n,Math.min(J-r,u)),o=n+u,s=r+u);break;case io:B<0?(t=Math.max(G-l,Math.min(I-l,t)),m=l+t,q=p):B>0&&(t=Math.max(G-p,Math.min(I-p,t)),m=l,q=p+t),C<0?(u=Math.max(H-n,Math.min(J-n,u)),o=n+u,s=r):C>0&&(u=Math.max(H-r,Math.min(J-r,u)),o=n,s=r+u);break;case jo:B&&(m=Math.max(G,Math.min(I,l-t*B)),q=Math.max(G,Math.min(I,p+t*B))),C&&(o=Math.max(H,Math.min(J,n-u*C)),s=Math.max(H,Math.min(J,r+u*C)))}q0&&(l=m-t),C<0?r=s-u:C>0&&(n=o-u),A=ho,P.attr("cursor",no.selection),f());break;default:return}fo()}function j(){switch(a.event.keyCode){case 16:K&&(w=x=K=!1,f());break;case 18:A===jo&&(B<0?p=q:B>0&&(l=m),C<0?r=s:C>0&&(n=o),A=io,f());break;case 32:A===ho&&(a.event.altKey?(B&&(p=q-t*B,l=m+t*B),C&&(r=s-u*C,n=o+u*C),A=jo):(B<0?p=q:B>0&&(l=m),C<0?r=s:C>0&&(n=o),A=io),P.attr("cursor",no[z]),f());break;default:return}fo()}if(a.event.touches){if(a.event.changedTouches.length=(f=(p+r)/2))?p=f:r=f,(k=c>=(g=(q+s)/2))?q=g:s=g,e=n,!(n=n[l=k<<1|j]))return e[l]=o,a;if(h=+a._x.call(null,n.data),i=+a._y.call(null,n.data),b===h&&c===i)return o.next=n,e?e[l]=o:a._root=o,a;do{e=e?e[l]=new Array(4):a._root=new Array(4),(j=b>=(f=(p+r)/2))?p=f:r=f,(k=c>=(g=(q+s)/2))?q=g:s=g}while((l=k<<1|j)==(m=(i>=g)<<1|h>=f));return e[m]=n,e[l]=o,a}function $c(a){var b,c,d,e,f=a.length,g=new Array(f),h=new Array(f),i=1/0,j=1/0,k=-1/0,l=-1/0;for(c=0;ck&&(k=d),el&&(l=e));for(k",e=b[3]||"-",f=b[4]||"",g=!!b[5],h=b[6]&&+b[6],i=!!b[7],j=b[8]&&+b[8].slice(1),k=b[9]||"";"n"===k?(i=!0,k="g"):Bp[k]||(k=""),(g||"0"===c&&"="===d)&&(g=!0,c="0",d="="),this.fill=c,this.align=d,this.sign=e,this.symbol=f,this.zero=g,this.width=h,this.comma=i,this.precision=j,this.type=k}function nd(b){return Dp=Gp(b),a.format=Dp.format,a.formatPrefix=Dp.formatPrefix,Dp}function od(){this.reset()}function pd(a,b,c){var d=a.s=b+c,e=d-b,f=d-e;a.t=b-f+(c-e)}function qd(a){return a>1?0:a<-1?qq:Math.acos(a)}function rd(a){return a>1?rq:a<-1?-rq:Math.asin(a)}function sd(a){return(a=Eq(a/2))*a}function td(){}function ud(a,b){a&&Jq.hasOwnProperty(a.type)&&Jq[a.type](a,b)}function vd(a,b,c){var d,e=-1,f=a.length-c;for(b.lineStart();++e=0?1:-1,e=d*c,f=zq(b),g=Eq(b),h=Pp*g,i=Op*f+h*zq(e),j=h*d*Eq(e);Lq.add(yq(j,i)),Np=a,Op=f,Pp=g}function Bd(a){return[yq(a[1],a[0]),rd(a[2])]}function Cd(a){var b=a[0],c=a[1],d=zq(c);return[d*zq(b),d*Eq(b),Eq(c)]}function Dd(a,b){return a[0]*b[0]+a[1]*b[1]+a[2]*b[2]}function Ed(a,b){return[a[1]*b[2]-a[2]*b[1],a[2]*b[0]-a[0]*b[2],a[0]*b[1]-a[1]*b[0]]}function Fd(a,b){a[0]+=b[0],a[1]+=b[1],a[2]+=b[2]}function Gd(a,b){return[a[0]*b,a[1]*b,a[2]*b]}function Hd(a){var b=Gq(a[0]*a[0]+a[1]*a[1]+a[2]*a[2]);a[0]/=b,a[1]/=b,a[2]/=b}function Id(a,b){Yp.push(Zp=[Qp=a,Sp=a]),bTp&&(Tp=b)}function Jd(a,b){var c=Cd([a*vq,b*vq]);if(Xp){var d=Ed(Xp,c),e=[d[1],-d[0],0],f=Ed(e,d);Hd(f),f=Bd(f);var g,h=a-Up,i=h>0?1:-1,j=f[0]*uq*i,k=wq(h)>180;k^(i*UpTp&&(Tp=g):(j=(j+360)%360-180,k^(i*UpTp&&(Tp=b))),k?aPd(Qp,Sp)&&(Sp=a):Pd(a,Sp)>Pd(Qp,Sp)&&(Qp=a):Sp>=Qp?(aSp&&(Sp=a)):a>Up?Pd(Qp,a)>Pd(Qp,Sp)&&(Sp=a):Pd(a,Sp)>Pd(Qp,Sp)&&(Qp=a)}else Yp.push(Zp=[Qp=a,Sp=a]);bTp&&(Tp=b),Xp=c,Up=a}function Kd(){Qq.point=Jd}function Ld(){Zp[0]=Qp,Zp[1]=Sp,Qq.point=Id,Xp=null}function Md(a,b){if(Xp){var c=a-Up;Pq.add(wq(c)>180?c+(c>0?360:-360):c)}else Vp=a,Wp=b;Nq.point(a,b),Jd(a,b)}function Nd(){Nq.lineStart()}function Od(){Md(Vp,Wp),Nq.lineEnd(),wq(Pq)>pq&&(Qp=-(Sp=180)),Zp[0]=Qp,Zp[1]=Sp,Xp=null}function Pd(a,b){return(b-=a)<0?b+360:b}function Qd(a,b){return a[0]-b[0]}function Rd(a,b){return a[0]<=a[1]?a[0]<=b&&b<=a[1]:bqq?a-tq:a<-qq?a+tq:a,b]}function be(a,b,c){return(a%=tq)?b||c?Vq(de(a),ee(b,c)):de(a):b||c?ee(b,c):ae}function ce(a){return function(b,c){return b+=a,[b>qq?b-tq:b<-qq?b+tq:b,c]}}function de(a){var b=ce(a);return b.invert=ce(-a),b}function ee(a,b){function c(a,b){var c=zq(b),h=zq(a)*c,i=Eq(a)*c,j=Eq(b),k=j*d+h*e;return[yq(i*f-k*g,h*d-j*e),rd(k*f+i*g)]}var d=zq(a),e=Eq(a),f=zq(b),g=Eq(b);return c.invert=function(a,b){var c=zq(b),h=zq(a)*c,i=Eq(a)*c,j=Eq(b),k=j*f-i*g;return[yq(i*f+j*g,h*d+k*e),rd(k*d-h*e)]},c}function fe(a,b,c,d,e,f){if(c){var g=zq(b),h=Eq(b),i=d*c;null==e?(e=b+d*tq,f=b-i/2):(e=ge(g,e),f=ge(g,f),(d>0?ef)&&(e+=d*tq));for(var j,k=e;d>0?k>f:k0)do{j.point(0===k||3===k?a:c,k>1?d:b)}while((k=(k+h+4)%4)!==l);else j.point(f[0],f[1])}function g(d,e){return wq(d[0]-a)0?0:3:wq(d[0]-c)0?2:1:wq(d[1]-b)0?1:0:e>0?3:2}function h(a,b){return i(a.x,b.x)}function i(a,b){var c=g(a,1),d=g(b,1);return c!==d?c-d:0===c?b[1]-a[1]:1===c?a[0]-b[0]:2===c?a[1]-b[1]:b[0]-a[0]}return function(g){function i(a,b){e(a,b)&&A.point(a,b)}function j(){for(var b=0,c=0,e=q.length;cd&&(l-f)*(d-g)>(m-g)*(a-f)&&++b:m<=d&&(l-f)*(d-g)<(m-g)*(a-f)&&--b;return b}function k(){A=B,p=[],q=[],z=!0}function l(){var a=j(),b=z&&a,c=(p=jk(p)).length;(b||c)&&(g.polygonStart(),b&&(g.lineStart(),f(null,null,1,g),g.lineEnd()),c&&kr(p,h,a,f,g),g.polygonEnd()),A=g,p=q=r=null}function m(){C.point=o,q&&q.push(r=[]),y=!0,x=!1,v=w=NaN}function n(){p&&(o(s,t),u&&x&&B.rejoin(),p.push(B.result())),C.point=i,x&&A.lineEnd()}function o(f,g){var h=e(f,g);if(q&&r.push([f,g]),y)s=f,t=g,u=h,y=!1,h&&(A.lineStart(),A.point(f,g));else if(h&&x)A.point(f,g);else{var i=[v=Math.max(mr,Math.min(lr,v)),w=Math.max(mr,Math.min(lr,w))],j=[f=Math.max(mr,Math.min(lr,f)),g=Math.max(mr,Math.min(lr,g))];ir(i,j,a,b,c,d)?(x||(A.lineStart(),A.point(i[0],i[1])),A.point(j[0],j[1]),h||A.lineEnd(),z=!1):h&&(A.lineStart(),A.point(f,g),z=!1)}v=f,w=g,x=h}var p,q,r,s,t,u,v,w,x,y,z,A=g,B=hr(),C={point:i,lineStart:m,lineEnd:n,polygonStart:k,polygonEnd:l};return C}}function ke(){rr.point=me,rr.lineEnd=le}function le(){rr.point=rr.lineEnd=td}function me(a,b){a*=vq,b*=vq,Wq=a,Xq=Eq(b),Yq=zq(b),rr.point=ne}function ne(a,b){a*=vq,b*=vq;var c=Eq(b),d=zq(b),e=wq(a-Wq),f=zq(e),g=Eq(e),h=d*g,i=Yq*c-Xq*d*f,j=Xq*c+Yq*d*f;qr.add(yq(Gq(h*h+i*i),j)),Wq=a,Xq=c,Yq=d}function oe(a,b){return!(!a||!xr.hasOwnProperty(a.type))&&xr[a.type](a,b)}function pe(a,b){return 0===vr(a,b)}function qe(a,b){var c=vr(a[0],a[1]);return vr(a[0],b)+vr(b,a[1])<=c+pq}function re(a,b){return!!pr(a.map(se),te(b))}function se(a){return a=a.map(te),a.pop(),a}function te(a){return[a[0]*vq,a[1]*vq]}function ue(a,b,c){var d=Yj(a,b-pq,c).concat(b);return function(a){return d.map(function(b){return[a,b]})}}function ve(a,b,c){var d=Yj(a,b-pq,c).concat(b);return function(a){return d.map(function(b){return[b,a]})}}function we(){function a(){return{type:"MultiLineString",coordinates:b()}}function b(){return Yj(Aq(f/q)*q,e,q).map(m).concat(Yj(Aq(j/r)*r,i,r).map(n)).concat(Yj(Aq(d/o)*o,c,o).filter(function(a){return wq(a%q)>pq}).map(k)).concat(Yj(Aq(h/p)*p,g,p).filter(function(a){return wq(a%r)>pq}).map(l))}var c,d,e,f,g,h,i,j,k,l,m,n,o=10,p=o,q=90,r=360,s=2.5;return a.lines=function(){return b().map(function(a){return{type:"LineString",coordinates:a}})},a.outline=function(){return{type:"Polygon",coordinates:[m(f).concat(n(i).slice(1),m(e).reverse().slice(1),n(j).reverse().slice(1))]}},a.extent=function(b){return arguments.length?a.extentMajor(b).extentMinor(b):a.extentMinor()},a.extentMajor=function(b){return arguments.length?(f=+b[0][0],e=+b[1][0],j=+b[0][1],i=+b[1][1],f>e&&(b=f,f=e,e=b),j>i&&(b=j,j=i,i=b),a.precision(s)):[[f,j],[e,i]]},a.extentMinor=function(b){return arguments.length?(d=+b[0][0],c=+b[1][0],h=+b[0][1],g=+b[1][1],d>c&&(b=d,d=c,c=b),h>g&&(b=h,h=g,g=b),a.precision(s)):[[d,h],[c,g]]},a.step=function(b){return arguments.length?a.stepMajor(b).stepMinor(b):a.stepMinor()},a.stepMajor=function(b){return arguments.length?(q=+b[0],r=+b[1],a):[q,r]},a.stepMinor=function(b){return arguments.length?(o=+b[0],p=+b[1],a):[o,p]},a.precision=function(b){return arguments.length?(s=+b,k=ue(h,g,90),l=ve(d,c,s),m=ue(j,i,90),n=ve(f,e,s),a):s},a.extentMajor([[-180,-90+pq],[180,90-pq]]).extentMinor([[-180,-80-pq],[180,80+pq]])}function xe(){return we()()}function ye(){Dr.point=ze}function ze(a,b){Dr.point=Ae,Zq=_q=a,$q=ar=b}function Ae(a,b){Cr.add(ar*a-_q*b),_q=a,ar=b}function Be(){Ae(Zq,$q)}function Ce(a,b){aGr&&(Gr=a),bHr&&(Hr=b)}function De(a,b){Jr+=a,Kr+=b,++Lr}function Ee(){Sr.point=Fe}function Fe(a,b){Sr.point=Ge,De(dr=a,er=b)}function Ge(a,b){var c=a-dr,d=b-er,e=Gq(c*c+d*d);Mr+=e*(dr+a)/2,Nr+=e*(er+b)/2,Or+=e,De(dr=a,er=b)}function He(){Sr.point=De}function Ie(){Sr.point=Ke}function Je(){Le(br,cr)}function Ke(a,b){Sr.point=Le,De(br=dr=a,cr=er=b)}function Le(a,b){var c=a-dr,d=b-er,e=Gq(c*c+d*d);Mr+=e*(dr+a)/2,Nr+=e*(er+b)/2,Or+=e,e=er*a-dr*b,Pr+=e*(dr+a),Qr+=e*(er+b),Rr+=3*e,De(dr=a,er=b)}function Me(a){this._context=a}function Ne(a,b){Zr.point=Oe,Ur=Wr=a,Vr=Xr=b}function Oe(a,b){Wr-=a,Xr-=b,Yr.add(Gq(Wr*Wr+Xr*Xr)),Wr=a,Xr=b}function Pe(){this._string=[]}function Qe(a){return"m0,"+a+"a"+a+","+a+" 0 1,1 0,"+-2*a+"a"+a+","+a+" 0 1,1 0,"+2*a+"z"}function Re(a){return a.length>1}function Se(a,b){return((a=a.x)[0]<0?a[1]-rq-pq:rq-a[1])-((b=b.x)[0]<0?b[1]-rq-pq:rq-b[1])}function Te(a){var b,c=NaN,d=NaN,e=NaN;return{lineStart:function(){a.lineStart(),b=1},point:function(f,g){var h=f>0?qq:-qq,i=wq(f-c);wq(i-qq)0?rq:-rq),a.point(e,d),a.lineEnd(),a.lineStart(),a.point(h,d),a.point(f,d),b=0):e!==h&&i>=qq&&(wq(c-e)pq?xq((Eq(b)*(f=zq(d))*Eq(c)-Eq(d)*(e=zq(b))*Eq(a))/(e*f*g)):(b+d)/2}function Ve(a,b,c,d){var e;if(null==a)e=c*rq,d.point(-qq,e),d.point(0,e),d.point(qq,e),d.point(qq,0),d.point(qq,-e),d.point(0,-e),d.point(-qq,-e),d.point(-qq,0),d.point(-qq,e);else if(wq(a[0]-b[0])>pq){var f=a[0]4*b&&p--){var u=g+m,v=h+n,w=i+o,x=Gq(u*u+v*v+w*w),y=rd(w/=x),z=wq(wq(w)-1)b||wq((r*D+s*E)/t-.5)>.3||g*m+h*n+i*o2?a[2]%360*vq:0,e()):[v*uq,w*uq,x*uq]},b.precision=function(a){return arguments.length?(D=fs(d,C=a*a),f()):Gq(C)},b.fitExtent=function(a,c){return Ye(b,a,c)},b.fitSize=function(a,c){return Ze(b,a,c)},function(){return g=a.apply(this,arguments),b.invert=g.invert&&c,e()}}function cf(a){var b=0,c=qq/3,d=bf(a),e=d(b,c);return e.parallels=function(a){return arguments.length?d(b=a[0]*vq,c=a[1]*vq):[b*uq,c*uq]},e}function df(a){function b(a,b){return[a*c,Eq(b)/c]}var c=zq(a);return b.invert=function(a,b){return[a/c,rd(b*c)]},b}function ef(a,b){function c(a,b){var c=Gq(f-2*e*Eq(b))/e;return[c*Eq(a*=e),g-c*zq(a)]}var d=Eq(a),e=(d+Eq(b))/2;if(wq(e)0?b<-rq+pq&&(b=-rq+pq):b>rq-pq&&(b=rq-pq);var c=f/Dq(lf(b),e);return[c*Eq(e*a),f-c*zq(e*a)]}var d=zq(a),e=a===b?Eq(a):Cq(d/zq(b))/Cq(lf(b)/lf(a)),f=d*Dq(lf(a),e)/e;return e?(c.invert=function(a,b){var c=f-b,d=Fq(e)*Gq(a*a+c*c);return[yq(a,wq(c))/e*Fq(c),2*xq(Dq(f/d,1/e))-rq]},c):jf}function nf(a,b){return[a,b]}function of(a,b){function c(a,b){var c=f-b,d=e*a;return[c*Eq(d),f-c*zq(d)]}var d=zq(a),e=a===b?Eq(a):(d-zq(b))/(b-a),f=d/e+a;return wq(e)=0;)b+=c[d].value;else b=1;a.value=b}function Cf(a,b){if(a===b)return a;var c=a.ancestors(),d=b.ancestors(),e=null;for(a=c.pop(),b=d.pop();a===b;)e=a,a=c.pop(),b=d.pop();return e}function Df(a,b){var c,d,e,f,g,h=new If(a),i=+a.value&&(h.value=a.value),j=[h];for(null==b&&(b=Ff);c=j.pop();)if(i&&(c.value=+c.data.value),(e=b(c.data))&&(g=e.length))for(c.children=new Array(g),f=g-1;f>=0;--f)j.push(d=c.children[f]=new If(e[f])),d.parent=c,d.depth=c.depth+1;return h.eachBefore(Hf)}function Ef(){return Df(this).eachBefore(Gf)}function Ff(a){return a.children}function Gf(a){a.data=a.data.data}function Hf(a){var b=0;do{a.height=b}while((a=a.parent)&&a.height<++b)}function If(a){this.data=a,this.depth=this.height=0,this.parent=null}function Jf(a){this._=a,this.next=null}function Kf(a,b){var c=b.x-a.x,d=b.y-a.y,e=a.r-b.r;return e*e+1e-6>c*c+d*d}function Lf(a,b){var c,d,e,f=null,g=a.head;switch(b.length){case 1:c=Mf(b[0]);break;case 2:c=Nf(b[0],b[1]);break;case 3:c=Of(b[0],b[1],b[2])}for(;g;)e=g._,d=g.next,c&&Kf(c,e)?f=g:(f?(a.tail=f,f.next=null):a.head=a.tail=null,b.push(e),c=Lf(a,b),b.pop(),a.head?(g.next=a.head,a.head=g):(g.next=null,a.head=a.tail=g),f=a.tail,f.next=d),g=d;return a.tail=f,c}function Mf(a){return{x:a.x,y:a.y,r:a.r}}function Nf(a,b){var c=a.x,d=a.y,e=a.r,f=b.x,g=b.y,h=b.r,i=f-c,j=g-d,k=h-e,l=Math.sqrt(i*i+j*j);return{x:(c+f+i/l*k)/2,y:(d+g+j/l*k)/2,r:(l+e+h)/2}}function Of(a,b,c){var d=a.x,e=a.y,f=a.r,g=b.x,h=b.y,i=b.r,j=c.x,k=c.y,l=c.r,m=2*(d-g),n=2*(e-h),o=2*(i-f),p=d*d+e*e-f*f-g*g-h*h+i*i,q=2*(d-j),r=2*(e-k),s=2*(l-f),t=d*d+e*e-f*f-j*j-k*k+l*l,u=q*n-m*r,v=(n*t-r*p)/u-d,w=(r*o-n*s)/u,x=(q*p-m*t)/u-e,y=(m*s-q*o)/u,z=w*w+y*y-1,A=2*(v*w+x*y+f),B=v*v+x*x-f*f,C=(-A-Math.sqrt(A*A-4*z*B))/(2*z);return{x:v+w*C+d,y:x+y*C+e,r:C}}function Pf(a,b,c){var d=a.x,e=a.y,f=b.r+c.r,g=a.r+c.r,h=b.x-d,i=b.y-e,j=h*h+i*i;if(j){var k=.5+((g*=g)-(f*=f))/(2*j),l=Math.sqrt(Math.max(0,2*f*(g+j)-(g-=j)*g-f*f))/(2*j);c.x=d+k*h+l*i,c.y=e+k*i-l*h}else c.x=d+g,c.y=e}function Qf(a,b){var c=b.x-a.x,d=b.y-a.y,e=a.r+b.r;return e*e-1e-6>c*c+d*d}function Rf(a,b,c){var d=a._,e=a.next._,f=d.r+e.r,g=(d.x*e.r+e.x*d.r)/f-b,h=(d.y*e.r+e.y*d.r)/f-c;return g*g+h*h}function Sf(a){this._=a,this.next=null,this.previous=null}function Tf(a){if(!(e=a.length))return 0;var b,c,d,e;if(b=a[0],b.x=0,b.y=0,!(e>1))return b.r;if(c=a[1],b.x=-c.r,c.x=b.r,c.y=0,!(e>2))return b.r+c.r;Pf(c,b,d=a[2]);var f,g,h,i,j,k,l,m=b.r*b.r,n=c.r*c.r,o=d.r*d.r,p=m+n+o,q=m*b.x+n*c.x+o*d.x,r=m*b.y+n*c.y+o*d.y;b=new Sf(b),c=new Sf(c),d=new Sf(d),b.next=d.previous=c,c.next=b.previous=d,d.next=c.previous=b;a:for(h=3;h=0;)b=e[f],b.z+=c,b.m+=c,c+=b.s+(d+=b.c)}function gg(a,b,c){return a.a.parent===b.parent?a.a:c}function hg(a,b){this._=a,this.parent=null,this.children=null,this.A=null,this.a=this,this.z=0,this.m=0,this.c=0,this.s=0,this.t=null,this.i=b}function ig(a){for(var b,c,d,e,f,g=new hg(a,0),h=[g];b=h.pop();)if(d=b._.children)for(b.children=new Array(f=d.length),e=f-1;e>=0;--e)h.push(c=b.children[e]=new hg(d[e],e)),c.parent=b;return(g.parent=new hg(null,0)).children=[g],g}function jg(a,b,c,d,e,f){for(var g,h,i,j,k,l,m,n,o,p,q,r=[],s=b.children,t=0,u=0,v=s.length,w=b.value;tm&&(m=h),q=k*k*p,(n=Math.max(m/q,q/l))>o){k-=h;break}o=n}r.push(g={value:k,dice:i1&&dt(a[c[d-2]],a[c[d-1]],a[e])<=0;)--d;c[d++]=e}return c.slice(0,d)}function mg(a){if(!(a>=1))throw new Error;this._size=a,this._call=this._error=null,this._tasks=[],this._data=[],this._waiting=this._active=this._ended=this._start=0}function ng(a){if(!a._start)try{og(a)}catch(b){if(a._tasks[a._ended+a._active-1])qg(a,b);else if(!a._data)throw b}}function og(a){for(;a._start=a._waiting&&a._active=0;)if((c=a._tasks[d])&&(a._tasks[d]=null,c.abort))try{c.abort()}catch(b){}a._active=NaN,rg(a)}function rg(a){if(!a._active&&a._call){var b=a._data;a._data=void 0,a._call(a._error,b)}}function sg(a){return new mg(arguments.length?+a:1/0)}function tg(a){return function(b,c){a(null==b?c:null)}}function ug(a){var b=a.responseType;return b&&"text"!==b?a.response:a.responseText}function vg(a,b){return function(c){return a(c.responseText,b)}}function wg(a){function b(b){var f=b+"",g=c.get(f);if(!g){if(e!==Bt)return e;c.set(f,g=d.push(b))}return a[(g-1)%a.length]}var c=Pc(),d=[],e=Bt;return a=null==a?[]:At.call(a),b.domain=function(a){if(!arguments.length)return d.slice();d=[],c=Pc();for(var e,f,g=-1,h=a.length;++g=c?1:d(a)}}}function Cg(a){return function(b,c){var d=a(b=+b,c=+c);return function(a){return a<=0?b:a>=1?c:d(a)}}}function Dg(a,b,c,d){var e=a[0],f=a[1],g=b[0],h=b[1];return f2?Eg:Dg,f=g=null,d}function d(b){return(f||(f=e(h,i,k?Bg(a):a,j)))(+b)}var e,f,g,h=Et,i=Et,j=xm,k=!1;return d.invert=function(a){return(g||(g=e(i,h,Ag,k?Cg(b):b)))(+a)},d.domain=function(a){return arguments.length?(h=zt.call(a,Dt),c()):h.slice()},d.range=function(a){return arguments.length?(i=At.call(a),c()):i.slice()},d.rangeRound=function(a){return i=At.call(a),j=ym,c()},d.clamp=function(a){return arguments.length?(k=!!a,c()):k},d.interpolate=function(a){return arguments.length?(j=a,c()):j},c()}function Hg(a){var b=a.domain;return a.ticks=function(a){var c=b();return ak(c[0],c[c.length-1],null==a?10:a)},a.tickFormat=function(a,c){return Ft(b(),a,c)},a.nice=function(c){var d=b(),f=d.length-1,g=null==c?10:c,h=d[0],i=d[f],j=e(h,i,g);return j&&(j=e(Math.floor(h/j)*j,Math.ceil(i/j)*j,g),d[0]=Math.floor(h/j)*j,d[f]=Math.ceil(i/j)*j,b(d)),a},a}function Ig(){var a=Gg(Ag,sm);return a.copy=function(){return Fg(a,Ig())},Hg(a)}function Jg(){function a(a){return+a}var b=[0,1];return a.invert=a,a.domain=a.range=function(c){return arguments.length?(b=zt.call(c,Dt),a):b.slice()},a.copy=function(){return Jg().domain(b)},Hg(a)}function Kg(a,b){return(b=Math.log(b/a))?function(c){return Math.log(c/a)/b}:Ct(b)}function Lg(a,b){return a<0?function(c){return-Math.pow(-b,c)*Math.pow(-a,1-c)}:function(c){return Math.pow(b,c)*Math.pow(a,1-c)}}function Mg(a){return isFinite(a)?+("1e"+a):a<0?0:a}function Ng(a){return 10===a?Mg:a===Math.E?Math.exp:function(b){return Math.pow(a,b)}}function Og(a){return a===Math.E?Math.log:10===a&&Math.log10||2===a&&Math.log2||(a=Math.log(a),function(b){return Math.log(b)/a})}function Pg(a){return function(b){return-a(-b)}}function Qg(){function b(){return f=Og(e),g=Ng(e),d()[0]<0&&(f=Pg(f),g=Pg(g)),c}var c=Gg(Kg,Lg).domain([1,10]),d=c.domain,e=10,f=Og(10),g=Ng(10);return c.base=function(a){return arguments.length?(e=+a,b()):e},c.domain=function(a){return arguments.length?(d(a),b()):d()},c.ticks=function(a){var b,c=d(),h=c[0],i=c[c.length-1];(b=i0){for(;mi)break;p.push(l)}}else for(;m=1;--k)if(!((l=j*k)i)break;p.push(l)}}else p=ak(m,n,Math.min(n-m,o)).map(g);return b?p.reverse():p},c.tickFormat=function(b,d){if(null==d&&(d=10===e?".0e":","), "function"!=typeof d&&(d=a.format(d)),b===1/0)return d;null==b&&(b=10);var h=Math.max(1,e*b/c.ticks().length);return function(a){var b=a/g(Math.round(f(a)));return b*e0?e[b-1]:c[0],b=e?[f[e-1],d]:[f[b-1],f[b]]},a.copy=function(){return Vg().domain([c,d]).range(g)},Hg(a)}function Wg(){function a(a){if(a<=a)return c[Kj(b,a,0,d)]}var b=[.5],c=[0,1],d=1;return a.domain=function(e){return arguments.length?(b=At.call(e),d=Math.min(b.length,c.length-1),a):b.slice()},a.range=function(e){return arguments.length?(c=At.call(e),d=Math.min(b.length,c.length-1),a):c.slice()},a.invertExtent=function(a){var d=c.indexOf(a);return[b[d-1],b[d]]},a.copy=function(){return Wg().domain(b).range(c)},a}function Xg(a,b,c,d){function e(b){return a(b=new Date(+b)),b}return e.floor=e,e.ceil=function(c){return a(c=new Date(c-1)),b(c,1),a(c),c},e.round=function(a){var b=e(a),c=e.ceil(a);return a-b0))return g;do{g.push(new Date(+c))}while(b(c,f),a(c),c=b)for(;a(b),!c(b);)b.setTime(b-1)},function(a,d){if(a>=a)for(;--d>=0;)for(;b(a,1),!c(a););})},c&&(e.count=function(b,d){return Ht.setTime(+b),It.setTime(+d),a(Ht),a(It),Math.floor(c(Ht,It))},e.every=function(a){return a=Math.floor(a),isFinite(a)&&a>0?a>1?e.filter(d?function(b){return d(b)%a==0}:function(b){return e.count(0,b)%a==0}):e:null}),e}function Yg(a){return Xg(function(b){b.setDate(b.getDate()-(b.getDay()+7-a)%7),b.setHours(0,0,0,0)},function(a,b){a.setDate(a.getDate()+7*b)},function(a,b){return(b-a-(b.getTimezoneOffset()-a.getTimezoneOffset())*Lt)/Mt})}function Zg(a){return Xg(function(b){b.setUTCDate(b.getUTCDate()-(b.getUTCDay()+7-a)%7),b.setUTCHours(0,0,0,0)},function(a,b){a.setUTCDate(a.getUTCDate()+7*b)},function(a,b){return(b-a)/Mt})}function $g(a){if(0<=a.y&&a.y<100){var b=new Date(-1,a.m,a.d,a.H,a.M,a.S,a.L);return b.setFullYear(a.y),b}return new Date(a.y,a.m,a.d,a.H,a.M,a.S,a.L)}function _g(a){if(0<=a.y&&a.y<100){var b=new Date(Date.UTC(-1,a.m,a.d,a.H,a.M,a.S,a.L));return b.setUTCFullYear(a.y),b}return new Date(Date.UTC(a.y,a.m,a.d,a.H,a.M,a.S,a.L))}function ah(a){return{y:a,m:0,d:1,H:0,M:0,S:0,L:0}}function bh(a){function b(a,b){return function(c){var d,e,f,g=[],h=-1,i=0,j=a.length;for(c instanceof Date||(c=new Date(+c));++h=i)return-1;if(37===(e=b.charCodeAt(g++))){if(e=b.charAt(g++),!(f=Q[e in Ku?b.charAt(g++):e])||(d=f(a,c,d))<0)return-1}else if(e!=c.charCodeAt(d++))return-1}return d}function e(a,b,c){var d=E.exec(b.slice(c));return d?(a.p=F[d[0].toLowerCase()],c+d[0].length):-1}function f(a,b,c){var d=I.exec(b.slice(c));return d?(a.w=J[d[0].toLowerCase()],c+d[0].length):-1}function g(a,b,c){var d=G.exec(b.slice(c));return d?(a.w=H[d[0].toLowerCase()],c+d[0].length):-1}function h(a,b,c){var d=M.exec(b.slice(c));return d?(a.m=N[d[0].toLowerCase()],c+d[0].length):-1}function i(a,b,c){var d=K.exec(b.slice(c));return d?(a.m=L[d[0].toLowerCase()],c+d[0].length):-1}function j(a,b,c){return d(a,w,b,c)}function k(a,b,c){return d(a,x,b,c)}function l(a,b,c){return d(a,y,b,c)}function m(a){return B[a.getDay()]}function n(a){return A[a.getDay()]}function o(a){return D[a.getMonth()]}function p(a){return C[a.getMonth()]}function q(a){return z[+(a.getHours()>=12)]}function r(a){return B[a.getUTCDay()]}function s(a){return A[a.getUTCDay()]}function t(a){return D[a.getUTCMonth()]}function u(a){return C[a.getUTCMonth()]}function v(a){return z[+(a.getUTCHours()>=12)]}var w=a.dateTime,x=a.date,y=a.time,z=a.periods,A=a.days,B=a.shortDays,C=a.months,D=a.shortMonths,E=eh(z),F=fh(z),G=eh(A),H=fh(A),I=eh(B),J=fh(B),K=eh(C),L=fh(C),M=eh(D),N=fh(D),O={a:m,A:n,b:o,B:p,c:null,d:uh,e:uh,H:vh,I:wh,j:xh,L:yh,m:zh,M:Ah,p:q,S:Bh,U:Ch,w:Dh,W:Eh,x:null,X:null,y:Fh,Y:Gh,Z:Hh,"%":Wh},P={a:r,A:s,b:t,B:u,c:null,d:Ih,e:Ih,H:Jh,I:Kh,j:Lh,L:Mh,m:Nh,M:Oh,p:v,S:Ph,U:Qh,w:Rh,W:Sh,x:null,X:null,y:Th,Y:Uh,Z:Vh,"%":Wh},Q={a:f,A:g,b:h,B:i,c:j,d:nh,e:nh,H:ph,I:ph,j:oh,L:sh,m:mh,M:qh,p:e,S:rh,U:hh,w:gh,W:ih,x:k,X:l,y:kh,Y:jh,Z:lh,"%":th};return O.x=b(x,O),O.X=b(y,O),O.c=b(w,O),P.x=b(x,P),P.X=b(y,P),P.c=b(w,P),{format:function(a){var c=b(a+="",O);return c.toString=function(){return a},c},parse:function(a){var b=c(a+="",$g);return b.toString=function(){return a},b},utcFormat:function(a){var c=b(a+="",P);return c.toString=function(){return a},c},utcParse:function(a){var b=c(a,_g);return b.toString=function(){return a},b}}}function ch(a,b,c){var d=a<0?"-":"",e=(d?-a:a)+"",f=e.length;return d+(f68?1900:2e3),c+d[0].length):-1}function lh(a,b,c){var d=/^(Z)|([+-]\d\d)(?:\:?(\d\d))?/.exec(b.slice(c,c+6));return d?(a.Z=d[1]?0:-(d[2]+(d[3]||"00")),c+d[0].length):-1}function mh(a,b,c){var d=Lu.exec(b.slice(c,c+2));return d?(a.m=d[0]-1,c+d[0].length):-1}function nh(a,b,c){var d=Lu.exec(b.slice(c,c+2));return d?(a.d=+d[0],c+d[0].length):-1}function oh(a,b,c){var d=Lu.exec(b.slice(c,c+3));return d?(a.m=0,a.d=+d[0],c+d[0].length):-1}function ph(a,b,c){var d=Lu.exec(b.slice(c,c+2));return d?(a.H=+d[0],c+d[0].length):-1}function qh(a,b,c){var d=Lu.exec(b.slice(c,c+2));return d?(a.M=+d[0],c+d[0].length):-1}function rh(a,b,c){var d=Lu.exec(b.slice(c,c+2));return d?(a.S=+d[0],c+d[0].length):-1}function sh(a,b,c){var d=Lu.exec(b.slice(c,c+3));return d?(a.L=+d[0],c+d[0].length):-1}function th(a,b,c){var d=Mu.exec(b.slice(c,c+1));return d?c+d[0].length:-1}function uh(a,b){return ch(a.getDate(),b,2)}function vh(a,b){return ch(a.getHours(),b,2)}function wh(a,b){return ch(a.getHours()%12||12,b,2)}function xh(a,b){return ch(1+Tt.count(ju(a),a),b,3)}function yh(a,b){return ch(a.getMilliseconds(),b,3)}function zh(a,b){return ch(a.getMonth()+1,b,2)}function Ah(a,b){return ch(a.getMinutes(),b,2)}function Bh(a,b){return ch(a.getSeconds(),b,2)}function Ch(a,b){return ch(Vt.count(ju(a),a),b,2)}function Dh(a){return a.getDay()}function Eh(a,b){return ch(Wt.count(ju(a),a),b,2)}function Fh(a,b){return ch(a.getFullYear()%100,b,2)}function Gh(a,b){return ch(a.getFullYear()%1e4,b,4)}function Hh(a){var b=a.getTimezoneOffset();return(b>0?"-":(b*=-1,"+"))+ch(b/60|0,"0",2)+ch(b%60,"0",2)}function Ih(a,b){return ch(a.getUTCDate(),b,2)}function Jh(a,b){return ch(a.getUTCHours(),b,2)}function Kh(a,b){return ch(a.getUTCHours()%12||12,b,2)}function Lh(a,b){return ch(1+pu.count(Hu(a),a),b,3)}function Mh(a,b){return ch(a.getUTCMilliseconds(),b,3)}function Nh(a,b){return ch(a.getUTCMonth()+1,b,2)}function Oh(a,b){return ch(a.getUTCMinutes(),b,2)}function Ph(a,b){return ch(a.getUTCSeconds(),b,2)}function Qh(a,b){return ch(ru.count(Hu(a),a),b,2)}function Rh(a){return a.getUTCDay()}function Sh(a,b){return ch(su.count(Hu(a),a),b,2)}function Th(a,b){return ch(a.getUTCFullYear()%100,b,2)}function Uh(a,b){return ch(a.getUTCFullYear()%1e4,b,4)}function Vh(){return"+0000"}function Wh(){return"%"}function Xh(b){return Iu=bh(b),a.timeFormat=Iu.format,a.timeParse=Iu.parse,a.utcFormat=Iu.utcFormat,a.utcParse=Iu.utcParse,Iu}function Yh(a){return a.toISOString()}function Zh(a){var b=new Date(a);return isNaN(b)?null:b}function $h(a){return new Date(a)}function _h(a){return a instanceof Date?+a:+new Date(+a)}function ai(a,b,c,d,f,g,h,i,j){function k(e){return(h(e)1?0:a<-1?uv:Math.acos(a)}function ei(a){return a>=1?vv:a<=-1?-vv:Math.asin(a)}function fi(a){return a.innerRadius}function gi(a){return a.outerRadius}function hi(a){return a.startAngle}function ii(a){return a.endAngle}function ji(a){return a&&a.padAngle}function ki(a,b,c,d,e,f,g,h){var i=c-a,j=d-b,k=g-e,l=h-f,m=(k*(b-f)-l*(a-e))/(l*i-k*j);return[a+m*i,b+m*j]}function li(a,b,c,d,e,f,g){var h=a-c,i=b-d,j=(g?f:-f)/sv(h*h+i*i),k=j*i,l=-j*h,m=a+k,n=b+l,o=c+k,p=d+l,q=(m+o)/2,r=(n+p)/2,s=o-m,t=p-n,u=s*s+t*t,v=e-f,w=m*p-o*n,x=(t<0?-1:1)*sv(pv(0,v*v*u-w*w)),y=(w*t-s*x)/u,z=(-w*s-t*x)/u,A=(w*t+s*x)/u,B=(-w*s+t*x)/u,C=y-q,D=z-r,E=A-q,F=B-r;return C*C+D*D>E*E+F*F&&(y=A,z=B),{cx:y,cy:z,x01:-k,y01:-l,x11:y*(e/v-1),y11:z*(e/v-1)}}function mi(a){this._context=a}function ni(a){return a[0]}function oi(a){return a[1]}function pi(a){this._curve=a}function qi(a){function b(b){return new pi(a(b))}return b._curve=a,b}function ri(a){var b=a.curve;return a.angle=a.x,delete a.x,a.radius=a.y,delete a.y,a.curve=function(a){return arguments.length?b(qi(a)):b()._curve},a}function si(a,b,c){a._context.bezierCurveTo((2*a._x0+a._x1)/3,(2*a._y0+a._y1)/3,(a._x0+2*a._x1)/3,(a._y0+2*a._y1)/3,(a._x0+4*a._x1+b)/6,(a._y0+4*a._y1+c)/6)}function ti(a){this._context=a}function ui(a){this._context=a}function vi(a){this._context=a}function wi(a,b){this._basis=new ti(a),this._beta=b}function xi(a,b,c){a._context.bezierCurveTo(a._x1+a._k*(a._x2-a._x0),a._y1+a._k*(a._y2-a._y0),a._x2+a._k*(a._x1-b),a._y2+a._k*(a._y1-c),a._x2,a._y2)}function yi(a,b){this._context=a,this._k=(1-b)/6}function zi(a,b){this._context=a,this._k=(1-b)/6}function Ai(a,b){this._context=a,this._k=(1-b)/6}function Bi(a,b,c){var d=a._x1,e=a._y1,f=a._x2,g=a._y2;if(a._l01_a>tv){var h=2*a._l01_2a+3*a._l01_a*a._l12_a+a._l12_2a,i=3*a._l01_a*(a._l01_a+a._l12_a);d=(d*h-a._x0*a._l12_2a+a._x2*a._l01_2a)/i,e=(e*h-a._y0*a._l12_2a+a._y2*a._l01_2a)/i}if(a._l23_a>tv){var j=2*a._l23_2a+3*a._l23_a*a._l12_a+a._l12_2a,k=3*a._l23_a*(a._l23_a+a._l12_a);f=(f*j+a._x1*a._l23_2a-b*a._l12_2a)/k,g=(g*j+a._y1*a._l23_2a-c*a._l12_2a)/k}a._context.bezierCurveTo(d,e,f,g,a._x2,a._y2)}function Ci(a,b){this._context=a,this._alpha=b}function Di(a,b){this._context=a,this._alpha=b}function Ei(a,b){this._context=a,this._alpha=b}function Fi(a){this._context=a}function Gi(a){return a<0?-1:1}function Hi(a,b,c){var d=a._x1-a._x0,e=b-a._x1,f=(a._y1-a._y0)/(d||e<0&&-0),g=(c-a._y1)/(e||d<0&&-0),h=(f*e+g*d)/(d+e);return(Gi(f)+Gi(g))*Math.min(Math.abs(f),Math.abs(g),.5*Math.abs(h))||0}function Ii(a,b){var c=a._x1-a._x0;return c?(3*(a._y1-a._y0)/c-b)/2:b}function Ji(a,b,c){var d=a._x0,e=a._y0,f=a._x1,g=a._y1,h=(f-d)/3;a._context.bezierCurveTo(d+h,e+h*b,f-h,g-h*c,f,g)}function Ki(a){this._context=a}function Li(a){this._context=new Mi(a)}function Mi(a){this._context=a}function Ni(a){return new Ki(a)}function Oi(a){return new Li(a)}function Pi(a){this._context=a}function Qi(a){var b,c,d=a.length-1,e=new Array(d),f=new Array(d),g=new Array(d);for(e[0]=0,f[0]=2,g[0]=a[0]+2*a[1],b=1;b=0;--b)e[b]=(g[b]-e[b+1])/f[b];for(f[d-1]=(a[d]+e[d-1])/2,b=0;b0)){if(f/=o,o<0){if(f0){if(f>n)return;f>m&&(m=f)}if(f=d-i,o||!(f<0)){if(f/=o,o<0){if(f>n)return;f>m&&(m=f)}else if(o>0){if(f0)){if(f/=p,p<0){if(f0){if(f>n)return;f>m&&(m=f)}if(f=e-j,p||!(f<0)){if(f/=p,p<0){if(f>n)return;f>m&&(m=f)}else if(p>0){if(f0||n<1)||(m>0&&(a[0]=[i+m*o,j+m*p]),n<1&&(a[1]=[i+n*o,j+n*p]),!0)}}}}}function fj(a,b,c,d,e){var f=a[1];if(f)return!0;var g,h,i=a[0],j=a.left,k=a.right,l=j[0],m=j[1],n=k[0],o=k[1],p=(l+n)/2,q=(m+o)/2;if(o===m){if(p=d)return;if(l>n){if(i){if(i[1]>=e)return}else i=[p,c];f=[p,e]}else{if(i){if(i[1]1)if(l>n){if(i){if(i[1]>=e)return}else i=[(c-h)/g,c];f=[(e-h)/g,e]}else{if(i){if(i[1]=d)return}else i=[b,g*b+h];f=[d,g*d+h]}else{if(i){if(i[0]Fw||Math.abs(e[0][1]-e[1][1])>Fw)||delete Cw[f]}function hj(a){return Aw[a.index]={site:a,halfedges:[]}}function ij(a,b){var c=a.site,d=b.left,e=b.right;return c===e&&(e=d,d=c),e?Math.atan2(e[1]-d[1],e[0]-d[0]):(c===d?(d=b[1],e=b[0]):(d=b[0],e=b[1]),Math.atan2(d[0]-e[0],e[1]-d[1]))}function jj(a,b){return b[+(b.left!==a.site)]}function kj(a,b){return b[+(b.left===a.site)]}function lj(){for(var a,b,c,d,e=0,f=Aw.length;eFw||Math.abs(p-m)>Fw)&&(i.splice(h,0,Cw.push(cj(g,n,Math.abs(o-a)Fw?[a,Math.abs(l-a)Fw?[Math.abs(m-d)Fw?[c,Math.abs(l-c)Fw?[Math.abs(m-b)=-Gw)){var n=i*i+j*j,o=k*k+l*l,p=(l*n-j*o)/m,q=(i*o-k*n)/m,r=Dw.pop()||new nj;r.arc=a,r.site=e,r.x=p+g,r.y=(r.cy=q+h)+Math.sqrt(p*p+q*q),a.circle=r;for(var s=null,t=Bw._;t;)if(r.yFw)h=h.L;else{if(!((e=f-wj(h,g))>Fw)){d>-Fw?(b=h.P,c=h):e>-Fw?(b=h,c=h.N):b=c=h;break}if(!h.R){b=h;break}h=h.R}hj(a);var i=rj(a);if(zw.insert(b,i),b||c){if(b===c)return pj(b),c=rj(b.site),zw.insert(i,c),i.edge=c.edge=bj(b.site,i.site),oj(b),void oj(c);if(!c)return void(i.edge=bj(b.site,i.site));pj(b),pj(c);var j=b.site,k=j[0],l=j[1],m=a[0]-k,n=a[1]-l,o=c.site,p=o[0]-k,q=o[1]-l,r=2*(m*q-n*p),s=m*m+n*n,t=p*p+q*q,u=[(q*s-n*t)/r+k,(m*t-p*s)/r+l];dj(c.edge,j,o,u),i.edge=bj(j,a,null,u),c.edge=bj(a,o,null,u),oj(b),oj(c)}}function vj(a,b){var c=a.site,d=c[0],e=c[1],f=e-b;if(!f)return d;var g=a.P;if(!g)return-1/0;c=g.site;var h=c[0],i=c[1],j=i-b;if(!j)return h;var k=h-d,l=1/f-1/j,m=k/j;return l?(-m+Math.sqrt(m*m-2*l*(k*k/(-2*j)-i+j/2+e-f/2)))/l+d:(d+h)/2}function wj(a,b){var c=a.N;if(c)return vj(c,b);var d=a.site;return d[1]===b?d[0]:1/0}function xj(a,b,c){return(a[0]-c[0])*(b[1]-a[1])-(a[0]-b[0])*(c[1]-a[1])}function yj(a,b){return b[1]-a[1]||b[0]-a[0]}function zj(a,b){var c,d,e,f=a.sort(yj).pop();for(Cw=[],Aw=new Array(a.length),zw=new Yi,Bw=new Yi;;)if(e=yw,f&&(!e||f[1]b?1:a>=b?0:NaN},Ij=function(a){return 1===a.length&&(a=b(a)),{left:function(b,c,d,e){for(null==d&&(d=0),null==e&&(e=b.length);d>>1;a(b[f],c)<0?d=f+1:e=f}return d},right:function(b,c,d,e){for(null==d&&(d=0),null==e&&(e=b.length);d>>1;a(b[f],c)>0?e=f:d=f+1}return d}}},Jj=Ij(Hj),Kj=Jj.right,Lj=Jj.left,Mj=function(a,b){null==b&&(b=c);for(var d=0,e=a.length-1,f=a[0],g=new Array(e<0?0:e);da?1:b>=a?0:NaN},Pj=function(a){return null===a?NaN:+a},Qj=function(a,b){var c,d,e=a.length,f=0,g=-1,h=0,i=0;if(null==b)for(;++g1)return i/(f-1)},Rj=function(a,b){var c=Qj(a,b);return c?Math.sqrt(c):c},Sj=function(a,b){var c,d,e,f=a.length,g=-1;if(null==b){for(;++g=c)for(d=e=c;++gc&&(d=c),e=c)for(d=e=c;++gc&&(d=c),e0)for(a=Math.ceil(a/g),b=Math.floor(b/g),f=new Array(e=Math.ceil(b-a+1));++il;)m.pop(),--n;var o,p=new Array(n+1);for(f=0;f<=n;++f)o=p[f]=[],o.x0=f>0?m[f-1]:k,o.x1=f=1)return+c(a[d-1],d-1,a);var d,e=(d-1)*b,f=Math.floor(e),g=+c(a[f],f,a);return g+(+c(a[f+1],f+1,a)-g)*(e-f)}},ek=function(a,b,c){return a=Vj.call(a,Pj).sort(Hj),Math.ceil((c-b)/(2*(dk(a,.75)-dk(a,.25))*Math.pow(a.length,-1/3)))},fk=function(a,b,c){return Math.ceil((c-b)/(3.5*Rj(a)*Math.pow(a.length,-1/3)))},gk=function(a,b){var c,d,e=a.length,f=-1;if(null==b){for(;++f=c)for(d=c;++fd&&(d=c)}else for(;++f=c)for(d=c;++fd&&(d=c);return d},hk=function(a,b){var c,d=a.length,e=d,f=-1,g=0;if(null==b)for(;++f=0;)for(d=a[e],b=d.length;--b>=0;)c[--g]=d[b];return c},kk=function(a,b){var c,d,e=a.length,f=-1;if(null==b){for(;++f=c)for(d=c;++fc&&(d=c)}else for(;++f=c)for(d=c;++fc&&(d=c);return d},lk=function(a,b){for(var c=b.length,d=new Array(c);c--;)d[c]=a[b[c]];return d},mk=function(a,b){if(c=a.length){var c,d,e=0,f=0,g=a[f];for(null==b&&(b=Hj);++e0)for(var c,d,e=new Array(c),f=0;f=0&&"xmlns"!==(b=a.slice(0,c))&&(a=a.slice(c+1)),Ak.hasOwnProperty(b)?{space:Ak[b],local:a}:a},Ck=function(a){var b=Bk(a);return(b.local?v:u)(b)},Dk=0;x.prototype=w.prototype={constructor:x,get:function(a){for(var b=this._;!(b in a);)if(!(a=a.parentNode))return;return a[b]},set:function(a,b){return a[this._]=b},remove:function(a){return this._ in a&&delete a[this._]},toString:function(){return this._}};var Ek=function(a){return function(){return this.matches(a)}};if("undefined"!=typeof document){var Fk=document.documentElement;if(!Fk.matches){var Gk=Fk.webkitMatchesSelector||Fk.msMatchesSelector||Fk.mozMatchesSelector||Fk.oMatchesSelector;Ek=function(a){return function(){return Gk.call(this,a)}}}}var Hk=Ek,Ik={};if(a.event=null,"undefined"!=typeof document){"onmouseenter"in document.documentElement||(Ik={mouseenter:"mouseover",mouseleave:"mouseout"})}var Jk=function(a,b,c){var d,e,f=A(a+""),g=f.length;{if(!(arguments.length<2)){for(h=b?C:B,null==c&&(c=!1),d=0;d=u&&(u=t+1);!(s=q[u])&&++u=0;)(d=e[f])&&(g&&g!==d.nextSibling&&g.parentNode.insertBefore(d,g),g=d);return this},$k=function(a){function b(b,c){return b&&c?a(b.__data__,c.__data__):!b-!c}a||(a=J);for(var c=this._groups,d=c.length,e=new Array(d),f=0;f1?this.each((null==b?Q:"function"==typeof b?S:R)(a,b,null==c?"":c)):gl(d=this.node()).getComputedStyle(d,null).getPropertyValue(a)},il=function(a,b){return arguments.length>1?this.each((null==b?T:"function"==typeof b?V:U)(a,b)):this.node()[a]};Y.prototype={add:function(a){this._names.indexOf(a)<0&&(this._names.push(a),this._node.setAttribute("class",this._names.join(" ")))},remove:function(a){var b=this._names.indexOf(a);b>=0&&(this._names.splice(b,1),this._node.setAttribute("class",this._names.join(" ")))},contains:function(a){return this._names.indexOf(a)>=0}};var jl=function(a,b){var c=W(a+"");if(arguments.length<2){for(var d=X(this.node()),e=-1,f=c.length;++e=240?a-240:a+120,e,d),Ja(a,e,d),Ja(a<120?a+240:a-120,e,d),this.opacity)},displayable:function(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1}}));var Pl=Math.PI/180,Ql=180/Math.PI,Rl=.95047,Sl=1,Tl=1.08883,Ul=4/29,Vl=6/29,Wl=3*Vl*Vl,Xl=Vl*Vl*Vl;Cl(Ma,La,xa(ya,{brighter:function(a){return new Ma(this.l+18*(null==a?1:a),this.a,this.b,this.opacity)},darker:function(a){return new Ma(this.l-18*(null==a?1:a),this.a,this.b,this.opacity)},rgb:function(){var a=(this.l+16)/116,b=isNaN(this.a)?a:a+this.a/500,c=isNaN(this.b)?a:a-this.b/200;return a=Sl*Oa(a),b=Rl*Oa(b),c=Tl*Oa(c),new Ea(Pa(3.2404542*b-1.5371385*a-.4985314*c),Pa(-.969266*b+1.8760108*a+.041556*c),Pa(.0556434*b-.2040259*a+1.0572252*c),this.opacity)}})),Cl(Ta,Sa,xa(ya,{brighter:function(a){return new Ta(this.h,this.c,this.l+18*(null==a?1:a),this.opacity)},darker:function(a){return new Ta(this.h,this.c,this.l-18*(null==a?1:a),this.opacity)},rgb:function(){return Ka(this).rgb()}}));var Yl=-.14861,Zl=1.78277,$l=-.29227,_l=-.90649,am=1.97294,bm=am*_l,cm=am*Zl,dm=Zl*$l-_l*Yl;Cl(Wa,Va,xa(ya,{brighter:function(a){return a=null==a?1/.7:Math.pow(1/.7,a),new Wa(this.h,this.s,this.l*a,this.opacity)},darker:function(a){return a=null==a?.7:Math.pow(.7,a),new Wa(this.h,this.s,this.l*a,this.opacity)},rgb:function(){var a=isNaN(this.h)?0:(this.h+120)*Pl,b=+this.l,c=isNaN(this.s)?0:this.s*b*(1-b),d=Math.cos(a),e=Math.sin(a);return new Ea(255*(b+c*(Yl*d+Zl*e)),255*(b+c*($l*d+_l*e)),255*(b+c*(am*d)),this.opacity)}}));var em,fm,gm,hm,im,jm,km=function(a){var b=a.length-1;return function(c){var d=c<=0?c=0:c>=1?(c=1,b-1):Math.floor(c*b),e=a[d],f=a[d+1],g=d>0?a[d-1]:2*e-f,h=df&&(e=b.slice(f,e),h[g]?h[g]+=e:h[++g]=e),(c=c[0])===(d=d[0])?h[g]?h[g]+=d:h[++g]=d:(h[++g]=null,i.push({i:g,x:sm(c,d)})),f=vm.lastIndex;return fan&&c.state_m&&c.name===b)return new _b([[a]],ao,b,+d)}return null},co=function(a){return function(){return a}},eo=function(a,b,c){this.target=a,this.type=b,this.selection=c},fo=function(){a.event.preventDefault(),a.event.stopImmediatePropagation()},go={name:"drag"},ho={name:"space"},io={name:"handle"},jo={name:"center"},ko={name:"x",handles:["e","w"].map(xc),input:function(a,b){return a&&[[a[0],b[0][1]],[a[1],b[1][1]]]},output:function(a){return a&&[a[0][0],a[1][0]]}},lo={name:"y",handles:["n","s"].map(xc),input:function(a,b){return a&&[[b[0][0],a[0]],[b[1][0],a[1]]]},output:function(a){return a&&[a[0][1],a[1][1]]}},mo={name:"xy",handles:["n","e","s","w","nw","ne","se","sw"].map(xc),input:function(a){return a},output:function(a){return a}},no={overlay:"crosshair",selection:"move",n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},oo={e:"w",w:"e",nw:"ne",ne:"nw",se:"sw",sw:"se"},po={n:"s",s:"n",nw:"sw",ne:"se",se:"ne",sw:"nw"},qo={overlay:1,selection:1,n:null,e:1,s:null,w:-1,nw:-1,ne:1,se:1,sw:-1},ro={overlay:1,selection:1,n:-1,e:null,s:1,w:null,nw:-1,ne:-1,se:1,sw:1},so=function(){return Fc(mo)},to=Math.cos,uo=Math.sin,vo=Math.PI,wo=vo/2,xo=2*vo,yo=Math.max,zo=function(){function a(a){var f,g,h,i,j,k,l=a.length,m=[],n=Yj(l),o=[],p=[],q=p.groups=new Array(l),r=new Array(l*l);for(f=0,j=-1;++j1e-6)if(Math.abs(k*h-i*j)>1e-6&&e){var m=c-f,n=d-g,o=h*h+i*i,p=m*m+n*n,q=Math.sqrt(o),r=Math.sqrt(l),s=e*Math.tan((Co-Math.acos((o+l-p)/(2*q*r)))/2),t=s/r,u=s/q;Math.abs(t-1)>1e-6&&(this._+="L"+(a+t*j)+","+(b+t*k)),this._+="A"+e+","+e+",0,0,"+ +(k*m>j*n)+","+(this._x1=a+u*h)+","+(this._y1=b+u*i)}else this._+="L"+(this._x1=a)+","+(this._y1=b);else;},arc:function(a,b,c,d,e,f){a=+a,b=+b,c=+c;var g=c*Math.cos(d),h=c*Math.sin(d),i=a+g,j=b+h,k=1^f,l=f?d-e:e-d;if(c<0)throw new Error("negative radius: "+c);null===this._x1?this._+="M"+i+","+j:(Math.abs(this._x1-i)>1e-6||Math.abs(this._y1-j)>1e-6)&&(this._+="L"+i+","+j),c&&(l<0&&(l=l%Do+Do),l>Eo?this._+="A"+c+","+c+",0,1,"+k+","+(a-g)+","+(b-h)+"A"+c+","+c+",0,1,"+k+","+(this._x1=i)+","+(this._y1=j):l>1e-6&&(this._+="A"+c+","+c+",0,"+ +(l>=Co)+","+k+","+(this._x1=a+c*Math.cos(e))+","+(this._y1=b+c*Math.sin(e))))},rect:function(a,b,c,d){this._+="M"+(this._x0=this._x1=+a)+","+(this._y0=this._y1=+b)+"h"+ +c+"v"+ +d+"h"+-c+"Z"},toString:function(){return this._}};var Fo=function(){function a(){var a,h=Ao.call(arguments),i=b.apply(this,h),j=c.apply(this,h),k=+d.apply(this,(h[0]=i,h)),l=e.apply(this,h)-wo,m=f.apply(this,h)-wo,n=k*to(l),o=k*uo(l),p=+d.apply(this,(h[0]=j,h)),q=e.apply(this,h)-wo,r=f.apply(this,h)-wo;if(g||(g=a=Ic()),g.moveTo(n,o),g.arc(0,0,k,l,m),l===q&&m===r||(g.quadraticCurveTo(0,0,p*to(q),p*uo(q)),g.arc(0,0,p,q,r)),g.quadraticCurveTo(0,0,n,o),g.closePath(),a)return g=null,a+""||null}var b=Jc,c=Kc,d=Lc,e=Mc,f=Nc,g=null;return a.radius=function(b){return arguments.length?(d="function"==typeof b?b:Bo(+b),a):d},a.startAngle=function(b){return arguments.length?(e="function"==typeof b?b:Bo(+b),a):e},a.endAngle=function(b){return arguments.length?(f="function"==typeof b?b:Bo(+b),a):f},a.source=function(c){return arguments.length?(b=c,a):b},a.target=function(b){return arguments.length?(c=b,a):c},a.context=function(b){return arguments.length?(g=null==b?null:b,a):g},a};Oc.prototype=Pc.prototype={constructor:Oc,has:function(a){return"$"+a in this},get:function(a){return this["$"+a]},set:function(a,b){return this["$"+a]=b,this},remove:function(a){var b="$"+a;return b in this&&delete this[b]},clear:function(){for(var a in this)"$"===a[0]&&delete this[a]},keys:function(){var a=[];for(var b in this)"$"===b[0]&&a.push(b.slice(1));return a},values:function(){var a=[];for(var b in this)"$"===b[0]&&a.push(this[b]);return a},entries:function(){var a=[];for(var b in this)"$"===b[0]&&a.push({key:b.slice(1),value:this[b]});return a},size:function(){var a=0;for(var b in this)"$"===b[0]&&++a;return a},empty:function(){for(var a in this)if("$"===a[0])return!1;return!0},each:function(a){for(var b in this)"$"===b[0]&&a(this[b],b.slice(1),this)}};var Go=function(){function a(b,e,g,h){if(e>=f.length)return null!=d?d(b):null!=c?b.sort(c):b;for(var i,j,k,l=-1,m=b.length,n=f[e++],o=Pc(),p=g();++lf.length)return a;var e,h=g[c-1];return null!=d&&c>=f.length?e=a.entries():(e=[],a.each(function(a,d){e.push({key:d,values:b(a,c)})})),null!=h?e.sort(function(a,b){return h(a.key,b.key)}):e}var c,d,e,f=[],g=[];return e={object:function(b){return a(b,0,Qc,Rc)},map:function(b){return a(b,0,Sc,Tc)},entries:function(c){return b(a(c,0,Sc,Tc),0)},key:function(a){return f.push(a),e},sortKeys:function(a){return g[f.length-1]=a,e},sortValues:function(a){return c=a,e},rollup:function(a){return d=a,e}}},Ho=Pc.prototype;Uc.prototype=Vc.prototype={constructor:Uc,has:Ho.has,add:function(a){return a+="",this["$"+a]=a,this},remove:Ho.remove,clear:Ho.clear,values:Ho.keys,size:Ho.size,empty:Ho.empty,each:Ho.each};var Io=function(a){var b=[];for(var c in a)b.push(c);return b},Jo=function(a){var b=[];for(var c in a)b.push(a[c]);return b},Ko=function(a){var b=[];for(var c in a)b.push({key:c,value:a[c]});return b},Lo=function(a){function b(a,b){var d,e,f=c(a,function(a,c){if(d)return d(a,c-1);e=a,d=b?Xc(a,b):Wc(a)});return f.columns=e,f}function c(a,b){function c(){if(k>=j)return g;if(e)return e=!1,f;var b,c=k;if(34===a.charCodeAt(c)){for(var d=c;d++a||a>e||d>b||b>f))return this;var g,h,i=e-c,j=this._root;switch(h=(b<(d+f)/2)<<1|a<(c+e)/2){case 0:do{g=new Array(4),g[h]=j,j=g}while(i*=2,e=c+i,f=d+i,a>e||b>f);break;case 1:do{g=new Array(4),g[h]=j,j=g}while(i*=2,c=e-i,f=d+i,c>a||b>f);break;case 2:do{g=new Array(4),g[h]=j,j=g}while(i*=2,e=c+i,d=f-i,a>e||d>b);break;case 3:do{g=new Array(4),g[h]=j,j=g}while(i*=2,c=e-i,d=f-i,c>a||d>b)}this._root&&this._root.length&&(this._root=j)}return this._x0=c,this._y0=d,this._x1=e,this._y1=f,this},_o=function(){var a=[];return this.visit(function(b){if(!b.length)do{a.push(b.data)}while(b=b.next)}),a},ap=function(a){return arguments.length?this.cover(+a[0][0],+a[0][1]).cover(+a[1][0],+a[1][1]):isNaN(this._x0)?void 0:[[this._x0,this._y0],[this._x1,this._y1]]},bp=function(a,b,c,d,e){this.node=a,this.x0=b,this.y0=c,this.x1=d,this.y1=e},cp=function(a,b,c){var d,e,f,g,h,i,j,k=this._x0,l=this._y0,m=this._x1,n=this._y1,o=[],p=this._root;for(p&&o.push(new bp(p,k,l,m,n)),null==c?c=1/0:(k=a-c,l=b-c,m=a+c,n=b+c,c*=c);i=o.pop();)if(!(!(p=i.node)||(e=i.x0)>m||(f=i.y0)>n||(g=i.x1)=r)<<1|a>=q)&&(i=o[o.length-1],o[o.length-1]=o[o.length-1-j],o[o.length-1-j]=i)}else{var s=a-+this._x.call(null,p.data),t=b-+this._y.call(null,p.data),u=s*s+t*t;if(u Date: Thu, 17 Aug 2017 13:53:07 +0200 Subject: [PATCH 2/2] Update news and description --- DESCRIPTION | 2 +- NEWS | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index d25847b..bcfcfb0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: leaflet.minicharts Type: Package Title: Mini Charts for Interactive Maps -Version: 0.5.0 +Version: 0.5.1 Authors@R: c( person("Francois", "Guillem", , "francois.guillem@rte-france.com", role = c("aut", "cre")), person("Jalal-Edine", "ZAWAM", , "jalal-edine.zawam@rte-france.com", role = "ctb"), diff --git a/NEWS b/NEWS index ec473dd..adfb47a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Changes in version 0.5.1 (2017-08-17) + +BUGFIXES: +* updateMinicharts() was incapable of updating color palette (#19) + Changes in version 0.5.0 (2017-07-10) NEW FEATURES: