diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index de7069f6..07b63c47 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -291,6 +291,7 @@ https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js https://cdnjs.cloudflare.com/ajax/libs/d3/4.13.0/d3.min.js https://cdnjs.cloudflare.com/ajax/libs/d3/5.16.0/d3.min.js https://cdnjs.cloudflare.com/ajax/libs/d3/6.7.0/d3.min.js +https://cdnjs.cloudflare.com/ajax/libs/d3/7.0.0/d3.min.js https://cdnjs.cloudflare.com/ajax/libs/d3-legend/2.25.6/d3-legend.min.js https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.10.5/dayjs.min.js https://cdnjs.cloudflare.com/ajax/libs/dexie/3.0.3/dexie.min.js diff --git a/modules/internal/targets.js b/modules/internal/targets.js index 7522821f..8603eafe 100644 --- a/modules/internal/targets.js +++ b/modules/internal/targets.js @@ -234,6 +234,8 @@ targets.setLastVersion = function (type, version) { return '5.16.0'; } else if (type.startsWith('/d3/6.')) { return '6.7.0'; + } else if (type.startsWith('/d3/7.')) { + return '7.0.0'; } else if (type.startsWith('/d3-legend/2.')) { return '2.25.6'; } else if (type.startsWith('/datatables/1.')) { diff --git a/pages/updates/updates.html b/pages/updates/updates.html index aee4e823..8c74e23a 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -56,6 +56,7 @@
=0;)(r=i[o])&&(a&&4^r.compareDocumentPosition(a)&&a.parentNode.insertBefore(r,a),a=r);return this},sort:function(t){function n(n,e){return n&&e?t(n.__data__,e.__data__):!n-!e}t||(t=Xt);for(var e=this._groups,r=e.length,i=new Array(r),o=0;o >1)+h+t+M+S.slice(T);break;default:t=S+h+t+M}return u(t)}return y=void 0===y?6:/[gprs]/.test(_)?Math.max(1,Math.min(21,y)):Math.max(0,Math.min(20,y)),M.toString=function(){return t+""},M}return{format:l,formatPrefix:function(t,n){var e=l(((t=_c(t)).type="f",t)),r=3*Math.max(-8,Math.min(8,Math.floor(gc(n)/3))),i=Math.pow(10,-r),o=Tc[8+r/3];return function(t){return e(i*t)+o}}}}function Ec(n){return Mc=Sc(n),t.format=Mc.format,t.formatPrefix=Mc.formatPrefix,Mc}function kc(t){return Math.max(0,-gc(Math.abs(t)))}function Nc(t,n){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor(gc(n)/3)))-gc(Math.abs(t)))}function Cc(t,n){return t=Math.abs(t),n=Math.abs(n)-t,Math.max(0,gc(n)-gc(t))+1}t.format=void 0,t.formatPrefix=void 0,Ec({thousands:",",grouping:[3],currency:["$",""]});var Pc=1e-6,zc=1e-12,Dc=Math.PI,qc=Dc/2,Rc=Dc/4,Fc=2*Dc,Oc=180/Dc,Ic=Dc/180,Uc=Math.abs,Bc=Math.atan,Yc=Math.atan2,Lc=Math.cos,jc=Math.ceil,Hc=Math.exp,Xc=Math.hypot,Gc=Math.log,Vc=Math.pow,$c=Math.sin,Wc=Math.sign||function(t){return t>0?1:t<0?-1:0},Zc=Math.sqrt,Kc=Math.tan;function Qc(t){return t>1?0:t<-1?Dc:Math.acos(t)}function Jc(t){return t>1?qc:t<-1?-qc:Math.asin(t)}function tf(t){return(t=$c(t/2))*t}function nf(){}function ef(t,n){t&&of.hasOwnProperty(t.type)&&of[t.type](t,n)}var rf={Feature:function(t,n){ef(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r=0?1:-1,i=r*e,o=Lc(n=(n*=Ic)/2+Rc),a=$c(n),u=df*a,c=hf*o+u*Lc(i),f=u*r*$c(i);Tf.add(Yc(f,c)),lf=t,hf=o,df=a}function zf(t){return[Yc(t[1],t[0]),Jc(t[2])]}function Df(t){var n=t[0],e=t[1],r=Lc(e);return[r*Lc(n),r*$c(n),$c(e)]}function qf(t,n){return t[0]*n[0]+t[1]*n[1]+t[2]*n[2]}function Rf(t,n){return[t[1]*n[2]-t[2]*n[1],t[2]*n[0]-t[0]*n[2],t[0]*n[1]-t[1]*n[0]]}function Ff(t,n){t[0]+=n[0],t[1]+=n[1],t[2]+=n[2]}function Of(t,n){return[t[0]*n,t[1]*n,t[2]*n]}function If(t){var n=Zc(t[0]*t[0]+t[1]*t[1]+t[2]*t[2]);t[0]/=n,t[1]/=n,t[2]/=n}var Uf,Bf,Yf,Lf,jf,Hf,Xf,Gf,Vf,$f,Wf,Zf,Kf,Qf,Jf,ts,ns={point:es,lineStart:is,lineEnd:os,polygonStart:function(){ns.point=as,ns.lineStart=us,ns.lineEnd=cs,wf=new g,Ef.polygonStart()},polygonEnd:function(){Ef.polygonEnd(),ns.point=es,ns.lineStart=is,ns.lineEnd=os,Tf<0?(pf=-(yf=180),gf=-(vf=90)):wf>Pc?vf=90:wf<-1e-6&&(gf=-90),Af[0]=pf,Af[1]=yf},sphere:function(){pf=-(yf=180),gf=-(vf=90)}};function es(t,n){Mf.push(Af=[pf=t,yf=t]),n 0))return u;do{u.push(a=new Date(+e)),n(e,o),t(e)}while(a t.r&&(t.r=t[n].r)}function c(){if(n){var r,i,o=n.length;for(e=new Array(o),r=0;r >>1;f[g]9999?"+"+_u(t,6):_u(t,4)}(t.getUTCFullYear())+"-"+_u(t.getUTCMonth()+1,2)+"-"+_u(t.getUTCDate(),2)+(i?"T"+_u(n,2)+":"+_u(e,2)+":"+_u(r,2)+"."+_u(i,3)+"Z":r?"T"+_u(n,2)+":"+_u(e,2)+":"+_u(r,2)+"Z":e||n?"T"+_u(n,2)+":"+_u(e,2)+"Z":"")}function mu(t){var n=new RegExp('["'+t+"\n\r]"),e=t.charCodeAt(0);function r(t,n){var r,i=[],o=t.length,a=0,u=0,c=o<=0,f=!1;function s(){if(c)return gu;if(f)return f=!1,pu;var n,r,i=a;if(34===t.charCodeAt(i)){for(;a++=v)<<1|t>=y)&&(c=p[p.length-1],p[p.length-1]=p[p.length-1-f],p[p.length-1-f]=c)}else{var _=t-+this._x.call(null,g.data),b=n-+this._y.call(null,g.data),m=_*_+b*b;if(m=s;--l)u.point(y[l],v[l]);u.lineEnd(),u.areaEnd()}g&&(y[f]=+t(h,f,c),v[f]=+n(h,f,c),u.point(r?+r(h,f,c):y[f],e?+e(h,f,c):v[f]))}if(d)return u=null,d+""||null}function f(){return Lb().defined(i).curve(a).context(o)}return t="function"==typeof t?t:void 0===t?Bb:gb(+t),n="function"==typeof n?n:gb(void 0===n?0:+n),e="function"==typeof e?e:void 0===e?Yb:gb(+e),c.x=function(n){return arguments.length?(t="function"==typeof n?n:gb(+n),r=null,c):t},c.x0=function(n){return arguments.length?(t="function"==typeof n?n:gb(+n),c):t},c.x1=function(t){return arguments.length?(r=null==t?null:"function"==typeof t?t:gb(+t),c):r},c.y=function(t){return arguments.length?(n="function"==typeof t?t:gb(+t),e=null,c):n},c.y0=function(t){return arguments.length?(n="function"==typeof t?t:gb(+t),c):n},c.y1=function(t){return arguments.length?(e=null==t?null:"function"==typeof t?t:gb(+t),c):e},c.lineX0=c.lineY0=function(){return f().x(t).y(n)},c.lineY1=function(){return f().x(t).y(e)},c.lineX1=function(){return f().x(r).y(n)},c.defined=function(t){return arguments.length?(i="function"==typeof t?t:gb(!!t),c):i},c.curve=function(t){return arguments.length?(a=t,null!=o&&(u=a(o)),c):a},c.context=function(t){return arguments.length?(null==t?o=u=null:u=a(o=t),c):o},c}function Hb(t,n){return nMb)if(p>Sb-Mb)u.moveTo(l*_b(h),l*xb(h)),u.arc(0,0,l,h,d,!g),s>Mb&&(u.moveTo(s*_b(d),s*xb(d)),u.arc(0,0,s,d,h,g));else{var y,v,_=h,b=d,m=h,x=d,w=p,M=p,A=a.apply(this,arguments)/2,T=A>Mb&&(r?+r.apply(this,arguments):wb(s*s+l*l)),S=mb(yb(l-s)/2,+e.apply(this,arguments)),E=S,k=S;if(T>Mb){var N=kb(T/s*xb(A)),C=kb(T/l*xb(A));(w-=2*N)>Mb?(m+=N*=g?1:-1,x-=N):(w=0,m=x=(h+d)/2),(M-=2*C)>Mb?(_+=C*=g?1:-1,b-=C):(M=0,_=b=(h+d)/2)}var P=l*_b(_),z=l*xb(_),D=s*_b(x),q=s*xb(x);if(S>Mb){var R,F=l*_b(b),O=l*xb(b),I=s*_b(m),U=s*xb(m);if(pMb&&w>Mb?E>Mb?(y=Rb(D,q,F,O,s,-E,g),v=Rb(P,z,I,U,s,-E,g),u.lineTo(y.cx+y.x01,y.cy+y.y01),E>a,f=i+2*u>>a,s=Ea(20);function l(r){var i=new Float32Array(c*f),l=new Float32Array(c*f),d=Math.pow(2,-a);r.forEach((function(r,o,a){var s=(t(r,o,a)+u)*d,l=(n(r,o,a)+u)*d,h=+e(r,o,a);if(s>=0&&s=u)){(t.data!==n||t.next)&&(0===l&&(p+=(l=oc(e))*l),0===h&&(p+=(h=oc(e))*h),p(t=(1664525*t+1013904223)%sc)/sc}();function l(){h(),f.call("tick",n),e1?(f.on(t,e),n):f.on(t)}}},t.forceX=function(t){var n,e,r,i=ic(.1);function o(t){for(var i,o=0,a=n.length;o=.12&&i<.234&&r>=-.425&&r<-.214?u:i>=.166&&i<.234&&r>=-.214&&r<-.115?c:a).invert(t)},s.stream=function(e){return t&&n===e?t:(r=[a.stream(n=e),u.stream(e),c.stream(e)],i=r.length,t={point:function(t,n){for(var e=-1;++efs(r[0],r[1])&&(r[1]=i[1]),fs(i[0],r[1])>fs(r[0],r[1])&&(r[0]=i[0])):o.push(r=i);for(a=-1/0,n=0,r=o[e=o.length-1];n<=e;r=i,++n)i=o[n],(u=fs(r[1],i[0]))>a&&(a=u,pf=i[0],yf=r[1])}return Mf=Af=null,pf===1/0||gf===1/0?[[NaN,NaN],[NaN,NaN]]:[[pf,gf],[yf,vf]]},t.geoCentroid=function(t){Uf=Bf=Yf=Lf=jf=Hf=Xf=Gf=0,Vf=new g,$f=new g,Wf=new g,cf(t,hs);var n=+Vf,e=+$f,r=+Wf,i=Xc(n,e,r);return i