From be4d2ee0661c35bd7bd16dccf56579c41d7bfa05 Mon Sep 17 00:00:00 2001 From: ben-chamberlain Date: Thu, 4 Apr 2024 15:09:23 +1300 Subject: [PATCH 1/2] fix spectral tooltip, turn off dotted lines for uncertainty; --- .../GroupCurveChart.stories.tsx | 26 +- src/GroupCurveChart/GroupCurveChart.tsx | 90 +- .../testData/hazardChartMultipleSATestData.ts | 2155 +++++++++-------- 3 files changed, 1269 insertions(+), 1002 deletions(-) diff --git a/src/GroupCurveChart/GroupCurveChart.stories.tsx b/src/GroupCurveChart/GroupCurveChart.stories.tsx index 9f3bcfa..653317a 100644 --- a/src/GroupCurveChart/GroupCurveChart.stories.tsx +++ b/src/GroupCurveChart/GroupCurveChart.stories.tsx @@ -5,7 +5,7 @@ import GroupCurveChart from './GroupCurveChart'; import { curveGroup4, curveGroup3, curveGroup2, curveGroup1 } from '../__tests__/testData/uncertaintyTestData'; import spectralAccelUncertaintyTestData from '../__tests__/testData/spectralAccelUncertaintyTestData'; import spectralAccelUncertaintyLog from '../__tests__/testData/spectralAccelUncertaintyLog'; -import { multipleImtData } from '../__tests__/testData/hazardChartMultipleSATestData'; +import { multipleImtData, uhsData } from '../__tests__/testData/hazardChartMultipleSATestData'; export default { title: 'Charts/GroupCurveChart', @@ -23,6 +23,7 @@ export const SpectralAccelUncertaintyTrue = Template.bind({}); export const SpectralAccelUncertaintyFalse = Template.bind({}); export const SpectralAccelLog = Template.bind({}); export const MultipleSA = Template.bind({}); +export const MultipleSAUHS = Template.bind({}); Primary.args = { scaleType: 'log', @@ -224,3 +225,26 @@ MultipleSA.args = { spectral: false, timePeriod: 100, }; + +MultipleSAUHS.args = { + scaleType: 'log', + yScaleType: 'linear', + xLabel: 'Period [s]', + yLabel: 'Shaking Intensity [g]', + xLimits: [0.0001, 10], + yLimits: [0, 3.690382289232626], + gridColor: '#efefef', + backgroundColor: '#ffffff', + numTickX: 5, + numTickY: 5, + width: 600, + curves: uhsData, + tooltip: true, + crosshair: true, + heading: 'Spectra with Log Xscale', + subHeading: 'WLG 400m/s', + poe: 0.1, + uncertainty: true, + spectral: true, + timePeriod: 100, +}; diff --git a/src/GroupCurveChart/GroupCurveChart.tsx b/src/GroupCurveChart/GroupCurveChart.tsx index b65d3d6..2d23742 100644 --- a/src/GroupCurveChart/GroupCurveChart.tsx +++ b/src/GroupCurveChart/GroupCurveChart.tsx @@ -11,7 +11,7 @@ import { useTooltip, useTooltipInPortal } from '@visx/tooltip'; import { Line } from '@visx/shape'; import { localPoint } from '@visx/event'; import { bisector } from 'd3-array'; -import { Legend, LegendItem, LegendLabel } from '@visx/legend'; +import { Legend, LegendItem, LegendLabel, LegendOrdinal } from '@visx/legend'; import { GlyphSquare } from '@visx/glyph'; import { GroupCurveChartProps, Datum } from './groupCurveChart.types'; @@ -19,7 +19,6 @@ import { getAreaData, getSortedMeanCurves } from './groupCurveChart.service'; import PlotHeadings from '../common/PlotHeadings'; import { HazardColorScale } from '../types/hazardCharts.types'; import AxisLabel from '../common/AxisLabel'; -import { Typography } from '@mui/material'; const GroupCurveChart: React.FC = (props: GroupCurveChartProps) => { const { @@ -93,6 +92,20 @@ const GroupCurveChart: React.FC = (props: GroupCurveChartP const legendGlyphSize = 15; + const ordinalColorScale = useMemo(() => { + if (!spectral) { + return scaleOrdinal({ + domain: !poe ? [...curvesDomain.domain] : [...curvesDomain.domain, !spectral && `POE ${poe * 100}% (${timePeriod} Yrs)`], + range: !poe ? [...curvesDomain.range] : [...curvesDomain.range, !spectral && '#989C9C'], + }); + } else { + return scaleOrdinal({ + domain: [...curvesDomain.domain], + range: [...curvesDomain.range], + }); + } + }, [curvesDomain, poe, spectral, timePeriod]); + const poeLine = useMemo(() => { const getPoE = (poeValue: number) => { const yValue = -Math.log(1 - poeValue) / timePeriod; @@ -171,8 +184,15 @@ const GroupCurveChart: React.FC = (props: GroupCurveChartP const legendRange = generateLegendRange(); + const legendDomain = locationsWithVs30.flat(2); + + if (!spectral && poe) { + legendDomain.push(`POE ${poe * 100}% (${timePeriod} Yrs)`); + legendRange.push(); + } + const shapeScale = scaleOrdinal({ - domain: locationsWithVs30.flat(2), + domain: legendDomain, range: legendRange, }); @@ -277,9 +297,8 @@ const GroupCurveChart: React.FC = (props: GroupCurveChartP data={curves[key][curveType].data} x={(d) => xScale(d[0])} y={(d) => yScale(d[1])} - stroke={strokeColorArray[index] ?? ''} + stroke={curves[key]['upper1'].strokeColor} strokeOpacity={curves[key][curveType].strokeOpacity ?? 1} - strokeDasharray={strokeDashArray(index)} defined={(d, index) => { if (scaleType === 'log' && index === 0) { return false; @@ -315,13 +334,7 @@ const GroupCurveChart: React.FC = (props: GroupCurveChartP {Object.keys(curves).map((key, index) => ( {scaleType === 'log' && spectral && ( - + )} = (props: GroupCurveChartP x={(d) => xScale(d[0])} y={(d) => yScale(d[1])} markerMid="url(#marker-x)" - stroke={strokeColorArray[index] ?? ''} + stroke={spectral ? curves[key]['upper1'].strokeColor : strokeColorArray[index]} strokeOpacity={curves[key]['mean'].strokeOpacity ?? 1} - strokeDasharray={strokeDashArray(index)} + strokeDasharray={spectral ? '0' : strokeDashArray(index)} defined={(d, index) => { if (scaleType === 'log' && index === 0) { return false; @@ -379,28 +392,33 @@ const GroupCurveChart: React.FC = (props: GroupCurveChartP )} -
- - {(labels) => ( -
- {labels.map((label, i) => { - // const color = curvesDomain.range[i]; - const shape = shapeScale(label.datum); - const isValidElement = React.isValidElement(shape); - return ( - - - {isValidElement ? React.cloneElement(shape as React.ReactElement) : React.createElement(shape as React.ComponentType<{ fill: string }>)} - - - {label.text} - - - ); - })} -
- )} -
+
+ {uncertainty || spectral ? ( + + ) : ( + + {(labels) => ( +
+ {labels.map((label, i) => { + const shape = shapeScale(label.datum); + const isValidElement = React.isValidElement(shape); + return ( + + + {isValidElement ? React.cloneElement(shape as React.ReactElement) : React.createElement(shape as React.ComponentType<{ fill: string }>)} + + {label.text} + + ); + })} +
+ )} +
+ )}
diff --git a/src/__tests__/testData/hazardChartMultipleSATestData.ts b/src/__tests__/testData/hazardChartMultipleSATestData.ts index 84ce86d..85fc7a4 100644 --- a/src/__tests__/testData/hazardChartMultipleSATestData.ts +++ b/src/__tests__/testData/hazardChartMultipleSATestData.ts @@ -3519,1007 +3519,1232 @@ export const multipleImtData = { strokeOpacity: 0.5, }, }, - '350m/s SA(0.2) Wellington ': { - mean: { - data: [ - [0.0001, 0.6271678150814646], - [0.0002, 0.6271677504287865], - [0.0004, 0.6271652487473811], - [0.0006, 0.6271515361993363], - [0.0008, 0.6271138194862167], - [0.001, 0.6270393605052031], - [0.002, 0.6258172518605769], - [0.004, 0.6183800880752798], - [0.006, 0.6058351909509414], - [0.008, 0.5904709130604597], - [0.01, 0.5737901595305315], - [0.02, 0.4908522983410475], - [0.04, 0.36510010506635415], - [0.06, 0.28221491005952526], - [0.08, 0.22519736876228513], - [0.1, 0.18431742626715475], - [0.2, 0.0866697290678563], - [0.3, 0.051504515410729645], - [0.4, 0.034581838880770155], - [0.5, 0.02498713082098969], - [0.6, 0.01894737518829448], - [0.7, 0.0148621115515567], - [0.8, 0.01195148670841828], - [0.9, 0.009795286173594375], - [1, 0.008149068602514964], - [1.2, 0.005835679628790724], - [1.4, 0.004322522003344487], - [1.6, 0.00328214051492004], - [1.8, 0.002540388250636738], - [2, 0.0019967828788797215], - [2.2, 0.001589672869771741], - [2.4, 0.0012793877251907615], - [2.6, 0.0010394288401888163], - [2.8, 0.00085154474410154], - [3, 0.0007028501625880867], - [3.5, 0.000447528250497653], - [4, 0.00029495932219159027], - [4.5, 0.00020013038821942164], - [5, 0.0001392380396684212], - [6, 0.00007183469673122111], - [7, 0.000039771786612186055], - [8, 0.00002333275650556743], - [9, 0.00001437100512746703], - [10, 0.00000922661948843384], - ], - strokeColor: '#e75d2d', - }, - lower2: { - data: [ - [0.0001, 0.5231180757188494], - [0.0002, 0.5231180508404144], - [0.0004, 0.5231142195614278], - [0.0006, 0.5230955475095208], - [0.0008, 0.5230508397987897], - [0.001, 0.522966086077326], - [0.002, 0.5198902211521439], - [0.004, 0.5082052975371336], - [0.006, 0.5001634848551244], - [0.008, 0.4843111266092699], - [0.01, 0.4669023829582837], - [0.02, 0.38807757283767996], - [0.04, 0.26940079159018715], - [0.06, 0.1946584251009167], - [0.08, 0.14682086298845942], - [0.1, 0.11472218694989356], - [0.2, 0.046194009186475316], - [0.3, 0.025015604690235005], - [0.4, 0.015662225146687137], - [0.5, 0.010613956088409648], - [0.6, 0.007520545825119962], - [0.7, 0.0055007175757295634], - [0.8, 0.004120216267242349], - [0.9, 0.003142929239683734], - [1, 0.0024332468662665585], - [1.2, 0.0015126351358862866], - [1.4, 0.0009773800499571772], - [1.6, 0.0006493308752757443], - [1.8, 0.00044089996222140826], - [2, 0.00030429660418562765], - [2.2, 0.00021378654252368623], - [2.4, 0.0001525529067349929], - [2.6, 0.00011036318956803015], - [2.8, 0.0000808261434542823], - [3, 0.0000600377750359371], - [3.5, 0.000029848354029526902], - [4, 0.000015173277475688529], - [4.5, 0.000007975745968558101], - [5, 0.0000043099838298310544], - [6, 0.0000013397506244405832], - [7, 4.174166777781707e-7], - [8, 1.0166157493607386e-7], - [9, 1.1930983312424814e-8], - [10, 1.681376482487451e-9], - ], - strokeColor: '#e75d2d', - strokeOpacity: 0.5, - }, - upper2: { - data: [ - [0.0001, 0.7248532599188757], - [0.0002, 0.7248532599188757], - [0.0004, 0.7248530472659487], - [0.0006, 0.724849941234445], - [0.0008, 0.7248329056656222], - [0.001, 0.724768417107595], - [0.002, 0.7237737886060047], - [0.004, 0.7160132417930928], - [0.006, 0.7004881155561419], - [0.008, 0.6847755584221997], - [0.01, 0.6700731554547621], - [0.02, 0.5906696010006636], - [0.04, 0.4594766709629302], - [0.06, 0.36871542862973294], - [0.08, 0.3040417967608212], - [0.1, 0.25590136190466173], - [0.2, 0.1321303670423074], - [0.3, 0.08268950325095104], - [0.4, 0.05762106393038302], - [0.5, 0.04296796277369841], - [0.6, 0.033686770745507855], - [0.7, 0.02737319387071835], - [0.8, 0.022778329240890294], - [0.9, 0.019274868893305985], - [1, 0.0165043699265347], - [1.2, 0.012486846783911099], - [1.4, 0.009742200906572851], - [1.6, 0.007732500004479115], - [1.8, 0.0062469443850979856], - [2, 0.00511422365126446], - [2.2, 0.004212859905435518], - [2.4, 0.0034481348121500055], - [2.6, 0.002834730202643021], - [2.8, 0.00235572477188295], - [3, 0.001972543506012614], - [3.5, 0.0013012439683001142], - [4, 0.0008882124870407404], - [4.5, 0.00062702226650313], - [5, 0.000451932534845656], - [6, 0.00025286134040813923], - [7, 0.00015435118315887397], - [8, 0.00009860702987396497], - [9, 0.00006581528191307306], - [10, 0.000047491878783278985], - ], - strokeColor: '#e75d2d', - strokeOpacity: 0.5, - }, - lower1: { - data: [ - [0.0001, 0.5508476111642319], - [0.0002, 0.5508476111642319], - [0.0004, 0.550847490619931], - [0.0006, 0.5508452639439603], - [0.0008, 0.5508270267414181], - [0.001, 0.5507605851905124], - [0.002, 0.5492136036303685], - [0.004, 0.534369294877076], - [0.006, 0.5195791566141738], - [0.008, 0.5057583287867877], - [0.01, 0.4888757637356227], - [0.02, 0.4078235503984249], - [0.04, 0.28812438480331937], - [0.06, 0.211907867296957], - [0.08, 0.1618405344548275], - [0.1, 0.12775479783523924], - [0.2, 0.0533266115713289], - [0.3, 0.029607143611647513], - [0.4, 0.01881236362287264], - [0.5, 0.012884267433236007], - [0.6, 0.009250753688191726], - [0.7, 0.006867616349539918], - [0.8, 0.005224449122068653], - [0.9, 0.004043582455045769], - [1, 0.0031735431121617808], - [1.2, 0.002020747618731611], - [1.4, 0.0013332377948754859], - [1.6, 0.0009066522699375801], - [1.8, 0.0006315934786688127], - [2, 0.00044982505334689726], - [2.2, 0.0003255996116482418], - [2.4, 0.00023928383045479507], - [2.6, 0.00017732952571036797], - [2.8, 0.00013237356879469697], - [3, 0.00009952506448041021], - [3.5, 0.000050750315207293006], - [4, 0.000027204218330800778], - [4.5, 0.000015051969588397718], - [5, 0.000008515347641901982], - [6, 0.000002895846826223014], - [7, 9.638849212123546e-7], - [8, 2.8626465120584754e-7], - [9, 5.7498782179976615e-8], - [10, 1.536687899150735e-8], - ], - strokeColor: '#e75d2d', - strokeOpacity: 0.5, - }, - upper1: { - data: [ - [0.0001, 0.7004877709365895], - [0.0002, 0.7004877709365895], - [0.0004, 0.7004877709365895], - [0.0006, 0.7004874423798131], - [0.0008, 0.7004845888621555], - [0.001, 0.7004678913903012], - [0.002, 0.6993385970928181], - [0.004, 0.6943512078793581], - [0.006, 0.6825569002247343], - [0.008, 0.6671913355479282], - [0.01, 0.6501512444846196], - [0.02, 0.5686112999288185], - [0.04, 0.4382485219504927], - [0.06, 0.34934477852364776], - [0.08, 0.2861622670331746], - [0.1, 0.23982033443758766], - [0.2, 0.12165253092476924], - [0.3, 0.0753229603420622], - [0.4, 0.05205308488809468], - [0.5, 0.03853466684688889], - [0.6, 0.029896085508298698], - [0.7, 0.02395969266756859], - [0.8, 0.01965313661703516], - [0.9, 0.016439782857308627], - [1, 0.01396299207535956], - [1.2, 0.010429228638324961], - [1.4, 0.008021862032106197], - [1.6, 0.006260321856057183], - [1.8, 0.0049607540129494865], - [2, 0.003981794847130127], - [2.2, 0.0032168490839273867], - [2.4, 0.0026254859994137014], - [2.6, 0.0021570704535910368], - [2.8, 0.0017884961169474245], - [3, 0.0014889457697663255], - [3.5, 0.0009740853837897356], - [4, 0.0006509985416913722], - [4.5, 0.0004540188028695491], - [5, 0.0003292439934713398], - [6, 0.00019374398021398953], - [7, 0.00012813557190460845], - [8, 0.00008886367166127673], - [9, 0.00005448755301573627], - [10, 0.000033433360057566475], - ], - strokeColor: '#e75d2d', - strokeOpacity: 0.5, - }, - }, - '400m/s PGA Wellington ': { - mean: { - data: [ - [0.0001, 0.6271677708782385], - [0.0002, 0.6271652766399295], - [0.0004, 0.6270938853093738], - [0.0006, 0.6267781773783632], - [0.0008, 0.626060931573801], - [0.001, 0.6248648851523053], - [0.002, 0.6123012697568351], - [0.004, 0.5709242226142676], - [0.006, 0.5261676684819487], - [0.008, 0.48440464201609956], - [0.01, 0.4467798599708559], - [0.02, 0.31086709316862426], - [0.04, 0.17795100969663546], - [0.06, 0.11734197656411516], - [0.08, 0.08439300987443854], - [0.1, 0.06431037469781709], - [0.2, 0.025812647134209832], - [0.3, 0.014460734397579778], - [0.4, 0.009307205401812069], - [0.5, 0.006449453112125858], - [0.6, 0.0046774212447923125], - [0.7, 0.0034993063352010134], - [0.8, 0.0026782767289948994], - [0.9, 0.0020863820257743804], - [1, 0.0016486032928630934], - [1.2, 0.0010647669857920539], - [1.4, 0.0007125599587193276], - [1.6, 0.0004904124751942129], - [1.8, 0.00034540848932107515], - [2, 0.0002480991945558175], - [2.2, 0.0001812641850188479], - [2.4, 0.00013443441391891575], - [2.6, 0.00010104720306569615], - [2.8, 0.00007687127126210225], - [3, 0.00005912237265592868], - [3.5, 0.00003198657676561911], - [4, 0.000018213767804198255], - [4.5, 0.000010824229299100097], - [5, 0.0000066695313548637], - [6, 0.000002761863558409239], - [7, 0.0000012564896647582202], - [8, 6.161835989226816e-7], - [9, 3.1971627301174976e-7], - [10, 1.7174150213072892e-7], - ], - strokeColor: '#0c3383', - }, - lower2: { - data: [ - [0.0001, 0.5231180674260377], - [0.0002, 0.5231142364186927], - [0.0004, 0.5230050620561528], - [0.0006, 0.5224514588878115], - [0.0008, 0.5210553593497409], - [0.001, 0.518693674486739], - [0.002, 0.5048033457812257], - [0.004, 0.4625432012049272], - [0.006, 0.41888060743491506], - [0.008, 0.37787359324391523], - [0.01, 0.3414897428794238], - [0.02, 0.21591446672157877], - [0.04, 0.10701002766979595], - [0.06, 0.0646960737471316], - [0.08, 0.044075350752958764], - [0.1, 0.03226764241412294], - [0.2, 0.011366274810449939], - [0.3, 0.005584893154404247], - [0.4, 0.0031202273991151053], - [0.5, 0.0018744191955307743], - [0.6, 0.0011835175736091275], - [0.7, 0.0007737624627149886], - [0.8, 0.0005195526658353655], - [0.9, 0.0003572037328233302], - [1, 0.00025067267417511196], - [1.2, 0.0001304851326650036], - [1.4, 0.00007215912515401435], - [1.6, 0.00004095743973420163], - [1.8, 0.000024097453810822955], - [2, 0.000014499369688669717], - [2.2, 0.000008772078932794969], - [2.4, 0.000005423824923744824], - [2.6, 0.0000034044981261915908], - [2.8, 0.0000021617949131913505], - [3, 0.0000013701474209648623], - [3.5, 4.367105751468259e-7], - [4, 1.2298166152113765e-7], - [4.5, 3.023112937761141e-8], - [5, 8.794088235397624e-9], - [6, 7.91989251958114e-10], - [7, 2.0941026690479703e-12], - [8, 9.084955010507656e-13], - [9, 3.3795188869589765e-13], - [10, 3.3795188869589765e-13], - ], - strokeColor: '#0c3383', - strokeOpacity: 0.5, - }, - upper2: { - data: [ - [0.0001, 0.7248532599188757], - [0.0002, 0.724852844216513], - [0.0004, 0.7248108682008039], - [0.0006, 0.7243044989931791], - [0.0008, 0.7239389177458522], - [0.001, 0.7229894429311059], - [0.002, 0.7087988249156782], - [0.004, 0.6691761419864063], - [0.006, 0.6298420330803451], - [0.008, 0.5887700188676346], - [0.01, 0.5505162565883366], - [0.02, 0.4054216863307465], - [0.04, 0.25133270734695656], - [0.06, 0.17500518376685392], - [0.08, 0.13060693026207904], - [0.1, 0.10214746428824173], - [0.2, 0.04405375948668466], - [0.3, 0.02643561298430197], - [0.4, 0.018260374889935038], - [0.5, 0.013413355765225954], - [0.6, 0.010243080904267066], - [0.7, 0.008030021121594233], - [0.8, 0.0064458546840375774], - [0.9, 0.005268797357534605], - [1, 0.004331227296581641], - [1.2, 0.0030248239782821873], - [1.4, 0.002153495316758791], - [1.6, 0.0015564075396724553], - [1.8, 0.0011420611116765844], - [2, 0.0008377368120212614], - [2.2, 0.0006247697462812285], - [2.4, 0.0004711627919170569], - [2.6, 0.0003583766371383357], - [2.8, 0.00027595923554768476], - [3, 0.00021474316169256547], - [3.5, 0.00012134394933793757], - [4, 0.00007253750192182107], - [4.5, 0.000042418651479136926], - [5, 0.000026081618567652676], - [6, 0.00001176496739785371], - [7, 0.000006546871296420065], - [8, 0.000003907408418601932], - [9, 0.000002431820627313286], - [10, 0.0000015612324035796377], - ], - strokeColor: '#0c3383', - strokeOpacity: 0.5, - }, - lower1: { - data: [ - [0.0001, 0.5508476111642319], - [0.0002, 0.5508472831188373], - [0.0004, 0.5507987853712515], - [0.0006, 0.5505066038065141], - [0.0008, 0.5495881207143716], - [0.001, 0.5470735565632041], - [0.002, 0.5237879826114071], - [0.004, 0.48489394669883024], - [0.006, 0.43929508759429736], - [0.008, 0.3981122875791737], - [0.01, 0.3616769253206311], - [0.02, 0.2342031400805198], - [0.04, 0.11975771991300521], - [0.06, 0.07391980573109036], - [0.08, 0.05097934297341311], - [0.1, 0.03769976226678162], - [0.2, 0.013612390576231537], - [0.3, 0.0068809271223271296], - [0.4, 0.003962102304908677], - [0.5, 0.0024505180009778416], - [0.6, 0.0015850512105808345], - [0.7, 0.0010624520881709065], - [0.8, 0.0007276231523613008], - [0.9, 0.0005084382444744406], - [1, 0.00036217242559222207], - [1.2, 0.00019273716771506244], - [1.4, 0.00010872756868007816], - [1.6, 0.00006395475994147581], - [1.8, 0.00003896146215531804], - [2, 0.000024502606452037057], - [2.2, 0.00001569892464603484], - [2.4, 0.000010242399633653143], - [2.6, 0.000006860789155460623], - [2.8, 0.0000046882523186964065], - [3, 0.0000032135949326050905], - [3.5, 0.000001325066210533521], - [4, 5.342383384565608e-7], - [4.5, 2.175665595460785e-7], - [5, 9.132140010859047e-8], - [6, 1.0626180269035501e-8], - [7, 7.285827496872344e-11], - [8, 2.5831559113953517e-12], - [9, 7.334133300673784e-13], - [10, 7.334133300673784e-13], - ], - strokeColor: '#0c3383', - strokeOpacity: 0.5, - }, - upper1: { - data: [ - [0.0001, 0.7004877709365895], - [0.0002, 0.7004877394486364], - [0.0004, 0.7004794923937316], - [0.0006, 0.7002321797949567], - [0.0008, 0.6994846261993801], - [0.001, 0.698679845264764], - [0.002, 0.6893234318585744], - [0.004, 0.6493914037072535], - [0.006, 0.6064638075374219], - [0.008, 0.5659363123236882], - [0.01, 0.527796110761078], - [0.02, 0.3842359682212444], - [0.04, 0.23489629810408486], - [0.06, 0.16187775802616045], - [0.08, 0.11996220067350616], - [0.1, 0.09330889384538132], - [0.2, 0.0395282683670215], - [0.3, 0.02311832806129488], - [0.4, 0.015533982238787325], - [0.5, 0.011289175100063886], - [0.6, 0.008556061971099482], - [0.7, 0.00666687644810704], - [0.8, 0.005269938325912715], - [0.9, 0.004230753189383152], - [1, 0.0034060687957339075], - [1.2, 0.002274670540882373], - [1.4, 0.0015596338779230168], - [1.6, 0.0010978490363232618], - [1.8, 0.0007881855361201451], - [2, 0.0005749331709483663], - [2.2, 0.0004274313161132248], - [2.4, 0.0003230039272410501], - [2.6, 0.00024687058697248077], - [2.8, 0.00019131237700620307], - [3, 0.00014974560072378296], - [3.5, 0.00008554130687221662], - [4, 0.00004900372276972487], - [4.5, 0.00003158114499657305], - [5, 0.00002134755173799352], - [6, 0.000010744988509392428], - [7, 0.000004535790827486785], - [8, 0.000001966628624394673], - [9, 8.417826190543209e-7], - [10, 3.5246935603527874e-7], - ], - strokeColor: '#0c3383', - strokeOpacity: 0.5, - }, - }, - '400m/s SA(0.1) Wellington ': { - mean: { - data: [ - [0.0001, 0.6271677905046744], - [0.0002, 0.6271669088485238], - [0.0004, 0.6271496001654902], - [0.0006, 0.6270792950758779], - [0.0008, 0.6269184671387533], - [0.001, 0.6266393693400183], - [0.002, 0.6231207395477506], - [0.004, 0.6072979605054911], - [0.006, 0.585592373437674], - [0.008, 0.5621860034399065], - [0.01, 0.5388820268801982], - [0.02, 0.4381805258313155], - [0.04, 0.3072556269477581], - [0.06, 0.22913661370937854], - [0.08, 0.17847453978918804], - [0.1, 0.14360204091479545], - [0.2, 0.06489627568443679], - [0.3, 0.03797031994999078], - [0.4, 0.02523028971090424], - [0.5, 0.018065226422189884], - [0.6, 0.013580297962525467], - [0.7, 0.010562278496213717], - [0.8, 0.008423256177121585], - [0.9, 0.006847340506466959], - [1, 0.005651122537005726], - [1.2, 0.003985021274691691], - [1.4, 0.0029094529598622243], - [1.6, 0.0021799912951622202], - [1.8, 0.0016670829041508517], - [2, 0.001296331005155471], - [2.2, 0.0010223656252952296], - [2.4, 0.0008162229399987231], - [2.6, 0.0006587189881859246], - [2.8, 0.000536775276599899], - [3, 0.000441260010374811], - [3.5, 0.0002796513041791737], - [4, 0.00018475653903660127], - [4.5, 0.00012644253355897916], - [5, 0.00008919908940752119], - [6, 0.00004789719921394209], - [7, 0.000027934880721947053], - [8, 0.000017399732756162578], - [9, 0.000011413741604626715], - [10, 0.000007804235536479354], + // '350m/s SA(0.2) Wellington ': { + // mean: { + // data: [ + // [0.0001, 0.6271678150814646], + // [0.0002, 0.6271677504287865], + // [0.0004, 0.6271652487473811], + // [0.0006, 0.6271515361993363], + // [0.0008, 0.6271138194862167], + // [0.001, 0.6270393605052031], + // [0.002, 0.6258172518605769], + // [0.004, 0.6183800880752798], + // [0.006, 0.6058351909509414], + // [0.008, 0.5904709130604597], + // [0.01, 0.5737901595305315], + // [0.02, 0.4908522983410475], + // [0.04, 0.36510010506635415], + // [0.06, 0.28221491005952526], + // [0.08, 0.22519736876228513], + // [0.1, 0.18431742626715475], + // [0.2, 0.0866697290678563], + // [0.3, 0.051504515410729645], + // [0.4, 0.034581838880770155], + // [0.5, 0.02498713082098969], + // [0.6, 0.01894737518829448], + // [0.7, 0.0148621115515567], + // [0.8, 0.01195148670841828], + // [0.9, 0.009795286173594375], + // [1, 0.008149068602514964], + // [1.2, 0.005835679628790724], + // [1.4, 0.004322522003344487], + // [1.6, 0.00328214051492004], + // [1.8, 0.002540388250636738], + // [2, 0.0019967828788797215], + // [2.2, 0.001589672869771741], + // [2.4, 0.0012793877251907615], + // [2.6, 0.0010394288401888163], + // [2.8, 0.00085154474410154], + // [3, 0.0007028501625880867], + // [3.5, 0.000447528250497653], + // [4, 0.00029495932219159027], + // [4.5, 0.00020013038821942164], + // [5, 0.0001392380396684212], + // [6, 0.00007183469673122111], + // [7, 0.000039771786612186055], + // [8, 0.00002333275650556743], + // [9, 0.00001437100512746703], + // [10, 0.00000922661948843384], + // ], + // strokeColor: '#e75d2d', + // }, + // lower2: { + // data: [ + // [0.0001, 0.5231180757188494], + // [0.0002, 0.5231180508404144], + // [0.0004, 0.5231142195614278], + // [0.0006, 0.5230955475095208], + // [0.0008, 0.5230508397987897], + // [0.001, 0.522966086077326], + // [0.002, 0.5198902211521439], + // [0.004, 0.5082052975371336], + // [0.006, 0.5001634848551244], + // [0.008, 0.4843111266092699], + // [0.01, 0.4669023829582837], + // [0.02, 0.38807757283767996], + // [0.04, 0.26940079159018715], + // [0.06, 0.1946584251009167], + // [0.08, 0.14682086298845942], + // [0.1, 0.11472218694989356], + // [0.2, 0.046194009186475316], + // [0.3, 0.025015604690235005], + // [0.4, 0.015662225146687137], + // [0.5, 0.010613956088409648], + // [0.6, 0.007520545825119962], + // [0.7, 0.0055007175757295634], + // [0.8, 0.004120216267242349], + // [0.9, 0.003142929239683734], + // [1, 0.0024332468662665585], + // [1.2, 0.0015126351358862866], + // [1.4, 0.0009773800499571772], + // [1.6, 0.0006493308752757443], + // [1.8, 0.00044089996222140826], + // [2, 0.00030429660418562765], + // [2.2, 0.00021378654252368623], + // [2.4, 0.0001525529067349929], + // [2.6, 0.00011036318956803015], + // [2.8, 0.0000808261434542823], + // [3, 0.0000600377750359371], + // [3.5, 0.000029848354029526902], + // [4, 0.000015173277475688529], + // [4.5, 0.000007975745968558101], + // [5, 0.0000043099838298310544], + // [6, 0.0000013397506244405832], + // [7, 4.174166777781707e-7], + // [8, 1.0166157493607386e-7], + // [9, 1.1930983312424814e-8], + // [10, 1.681376482487451e-9], + // ], + // strokeColor: '#e75d2d', + // strokeOpacity: 0.5, + // }, + // upper2: { + // data: [ + // [0.0001, 0.7248532599188757], + // [0.0002, 0.7248532599188757], + // [0.0004, 0.7248530472659487], + // [0.0006, 0.724849941234445], + // [0.0008, 0.7248329056656222], + // [0.001, 0.724768417107595], + // [0.002, 0.7237737886060047], + // [0.004, 0.7160132417930928], + // [0.006, 0.7004881155561419], + // [0.008, 0.6847755584221997], + // [0.01, 0.6700731554547621], + // [0.02, 0.5906696010006636], + // [0.04, 0.4594766709629302], + // [0.06, 0.36871542862973294], + // [0.08, 0.3040417967608212], + // [0.1, 0.25590136190466173], + // [0.2, 0.1321303670423074], + // [0.3, 0.08268950325095104], + // [0.4, 0.05762106393038302], + // [0.5, 0.04296796277369841], + // [0.6, 0.033686770745507855], + // [0.7, 0.02737319387071835], + // [0.8, 0.022778329240890294], + // [0.9, 0.019274868893305985], + // [1, 0.0165043699265347], + // [1.2, 0.012486846783911099], + // [1.4, 0.009742200906572851], + // [1.6, 0.007732500004479115], + // [1.8, 0.0062469443850979856], + // [2, 0.00511422365126446], + // [2.2, 0.004212859905435518], + // [2.4, 0.0034481348121500055], + // [2.6, 0.002834730202643021], + // [2.8, 0.00235572477188295], + // [3, 0.001972543506012614], + // [3.5, 0.0013012439683001142], + // [4, 0.0008882124870407404], + // [4.5, 0.00062702226650313], + // [5, 0.000451932534845656], + // [6, 0.00025286134040813923], + // [7, 0.00015435118315887397], + // [8, 0.00009860702987396497], + // [9, 0.00006581528191307306], + // [10, 0.000047491878783278985], + // ], + // strokeColor: '#e75d2d', + // strokeOpacity: 0.5, + // }, + // lower1: { + // data: [ + // [0.0001, 0.5508476111642319], + // [0.0002, 0.5508476111642319], + // [0.0004, 0.550847490619931], + // [0.0006, 0.5508452639439603], + // [0.0008, 0.5508270267414181], + // [0.001, 0.5507605851905124], + // [0.002, 0.5492136036303685], + // [0.004, 0.534369294877076], + // [0.006, 0.5195791566141738], + // [0.008, 0.5057583287867877], + // [0.01, 0.4888757637356227], + // [0.02, 0.4078235503984249], + // [0.04, 0.28812438480331937], + // [0.06, 0.211907867296957], + // [0.08, 0.1618405344548275], + // [0.1, 0.12775479783523924], + // [0.2, 0.0533266115713289], + // [0.3, 0.029607143611647513], + // [0.4, 0.01881236362287264], + // [0.5, 0.012884267433236007], + // [0.6, 0.009250753688191726], + // [0.7, 0.006867616349539918], + // [0.8, 0.005224449122068653], + // [0.9, 0.004043582455045769], + // [1, 0.0031735431121617808], + // [1.2, 0.002020747618731611], + // [1.4, 0.0013332377948754859], + // [1.6, 0.0009066522699375801], + // [1.8, 0.0006315934786688127], + // [2, 0.00044982505334689726], + // [2.2, 0.0003255996116482418], + // [2.4, 0.00023928383045479507], + // [2.6, 0.00017732952571036797], + // [2.8, 0.00013237356879469697], + // [3, 0.00009952506448041021], + // [3.5, 0.000050750315207293006], + // [4, 0.000027204218330800778], + // [4.5, 0.000015051969588397718], + // [5, 0.000008515347641901982], + // [6, 0.000002895846826223014], + // [7, 9.638849212123546e-7], + // [8, 2.8626465120584754e-7], + // [9, 5.7498782179976615e-8], + // [10, 1.536687899150735e-8], + // ], + // strokeColor: '#e75d2d', + // strokeOpacity: 0.5, + // }, + // upper1: { + // data: [ + // [0.0001, 0.7004877709365895], + // [0.0002, 0.7004877709365895], + // [0.0004, 0.7004877709365895], + // [0.0006, 0.7004874423798131], + // [0.0008, 0.7004845888621555], + // [0.001, 0.7004678913903012], + // [0.002, 0.6993385970928181], + // [0.004, 0.6943512078793581], + // [0.006, 0.6825569002247343], + // [0.008, 0.6671913355479282], + // [0.01, 0.6501512444846196], + // [0.02, 0.5686112999288185], + // [0.04, 0.4382485219504927], + // [0.06, 0.34934477852364776], + // [0.08, 0.2861622670331746], + // [0.1, 0.23982033443758766], + // [0.2, 0.12165253092476924], + // [0.3, 0.0753229603420622], + // [0.4, 0.05205308488809468], + // [0.5, 0.03853466684688889], + // [0.6, 0.029896085508298698], + // [0.7, 0.02395969266756859], + // [0.8, 0.01965313661703516], + // [0.9, 0.016439782857308627], + // [1, 0.01396299207535956], + // [1.2, 0.010429228638324961], + // [1.4, 0.008021862032106197], + // [1.6, 0.006260321856057183], + // [1.8, 0.0049607540129494865], + // [2, 0.003981794847130127], + // [2.2, 0.0032168490839273867], + // [2.4, 0.0026254859994137014], + // [2.6, 0.0021570704535910368], + // [2.8, 0.0017884961169474245], + // [3, 0.0014889457697663255], + // [3.5, 0.0009740853837897356], + // [4, 0.0006509985416913722], + // [4.5, 0.0004540188028695491], + // [5, 0.0003292439934713398], + // [6, 0.00019374398021398953], + // [7, 0.00012813557190460845], + // [8, 0.00008886367166127673], + // [9, 0.00005448755301573627], + // [10, 0.000033433360057566475], + // ], + // strokeColor: '#e75d2d', + // strokeOpacity: 0.5, + // }, + // }, + // '400m/s PGA Wellington ': { + // mean: { + // data: [ + // [0.0001, 0.6271677708782385], + // [0.0002, 0.6271652766399295], + // [0.0004, 0.6270938853093738], + // [0.0006, 0.6267781773783632], + // [0.0008, 0.626060931573801], + // [0.001, 0.6248648851523053], + // [0.002, 0.6123012697568351], + // [0.004, 0.5709242226142676], + // [0.006, 0.5261676684819487], + // [0.008, 0.48440464201609956], + // [0.01, 0.4467798599708559], + // [0.02, 0.31086709316862426], + // [0.04, 0.17795100969663546], + // [0.06, 0.11734197656411516], + // [0.08, 0.08439300987443854], + // [0.1, 0.06431037469781709], + // [0.2, 0.025812647134209832], + // [0.3, 0.014460734397579778], + // [0.4, 0.009307205401812069], + // [0.5, 0.006449453112125858], + // [0.6, 0.0046774212447923125], + // [0.7, 0.0034993063352010134], + // [0.8, 0.0026782767289948994], + // [0.9, 0.0020863820257743804], + // [1, 0.0016486032928630934], + // [1.2, 0.0010647669857920539], + // [1.4, 0.0007125599587193276], + // [1.6, 0.0004904124751942129], + // [1.8, 0.00034540848932107515], + // [2, 0.0002480991945558175], + // [2.2, 0.0001812641850188479], + // [2.4, 0.00013443441391891575], + // [2.6, 0.00010104720306569615], + // [2.8, 0.00007687127126210225], + // [3, 0.00005912237265592868], + // [3.5, 0.00003198657676561911], + // [4, 0.000018213767804198255], + // [4.5, 0.000010824229299100097], + // [5, 0.0000066695313548637], + // [6, 0.000002761863558409239], + // [7, 0.0000012564896647582202], + // [8, 6.161835989226816e-7], + // [9, 3.1971627301174976e-7], + // [10, 1.7174150213072892e-7], + // ], + // strokeColor: '#0c3383', + // }, + // lower2: { + // data: [ + // [0.0001, 0.5231180674260377], + // [0.0002, 0.5231142364186927], + // [0.0004, 0.5230050620561528], + // [0.0006, 0.5224514588878115], + // [0.0008, 0.5210553593497409], + // [0.001, 0.518693674486739], + // [0.002, 0.5048033457812257], + // [0.004, 0.4625432012049272], + // [0.006, 0.41888060743491506], + // [0.008, 0.37787359324391523], + // [0.01, 0.3414897428794238], + // [0.02, 0.21591446672157877], + // [0.04, 0.10701002766979595], + // [0.06, 0.0646960737471316], + // [0.08, 0.044075350752958764], + // [0.1, 0.03226764241412294], + // [0.2, 0.011366274810449939], + // [0.3, 0.005584893154404247], + // [0.4, 0.0031202273991151053], + // [0.5, 0.0018744191955307743], + // [0.6, 0.0011835175736091275], + // [0.7, 0.0007737624627149886], + // [0.8, 0.0005195526658353655], + // [0.9, 0.0003572037328233302], + // [1, 0.00025067267417511196], + // [1.2, 0.0001304851326650036], + // [1.4, 0.00007215912515401435], + // [1.6, 0.00004095743973420163], + // [1.8, 0.000024097453810822955], + // [2, 0.000014499369688669717], + // [2.2, 0.000008772078932794969], + // [2.4, 0.000005423824923744824], + // [2.6, 0.0000034044981261915908], + // [2.8, 0.0000021617949131913505], + // [3, 0.0000013701474209648623], + // [3.5, 4.367105751468259e-7], + // [4, 1.2298166152113765e-7], + // [4.5, 3.023112937761141e-8], + // [5, 8.794088235397624e-9], + // [6, 7.91989251958114e-10], + // [7, 2.0941026690479703e-12], + // [8, 9.084955010507656e-13], + // [9, 3.3795188869589765e-13], + // [10, 3.3795188869589765e-13], + // ], + // strokeColor: '#0c3383', + // strokeOpacity: 0.5, + // }, + // upper2: { + // data: [ + // [0.0001, 0.7248532599188757], + // [0.0002, 0.724852844216513], + // [0.0004, 0.7248108682008039], + // [0.0006, 0.7243044989931791], + // [0.0008, 0.7239389177458522], + // [0.001, 0.7229894429311059], + // [0.002, 0.7087988249156782], + // [0.004, 0.6691761419864063], + // [0.006, 0.6298420330803451], + // [0.008, 0.5887700188676346], + // [0.01, 0.5505162565883366], + // [0.02, 0.4054216863307465], + // [0.04, 0.25133270734695656], + // [0.06, 0.17500518376685392], + // [0.08, 0.13060693026207904], + // [0.1, 0.10214746428824173], + // [0.2, 0.04405375948668466], + // [0.3, 0.02643561298430197], + // [0.4, 0.018260374889935038], + // [0.5, 0.013413355765225954], + // [0.6, 0.010243080904267066], + // [0.7, 0.008030021121594233], + // [0.8, 0.0064458546840375774], + // [0.9, 0.005268797357534605], + // [1, 0.004331227296581641], + // [1.2, 0.0030248239782821873], + // [1.4, 0.002153495316758791], + // [1.6, 0.0015564075396724553], + // [1.8, 0.0011420611116765844], + // [2, 0.0008377368120212614], + // [2.2, 0.0006247697462812285], + // [2.4, 0.0004711627919170569], + // [2.6, 0.0003583766371383357], + // [2.8, 0.00027595923554768476], + // [3, 0.00021474316169256547], + // [3.5, 0.00012134394933793757], + // [4, 0.00007253750192182107], + // [4.5, 0.000042418651479136926], + // [5, 0.000026081618567652676], + // [6, 0.00001176496739785371], + // [7, 0.000006546871296420065], + // [8, 0.000003907408418601932], + // [9, 0.000002431820627313286], + // [10, 0.0000015612324035796377], + // ], + // strokeColor: '#0c3383', + // strokeOpacity: 0.5, + // }, + // lower1: { + // data: [ + // [0.0001, 0.5508476111642319], + // [0.0002, 0.5508472831188373], + // [0.0004, 0.5507987853712515], + // [0.0006, 0.5505066038065141], + // [0.0008, 0.5495881207143716], + // [0.001, 0.5470735565632041], + // [0.002, 0.5237879826114071], + // [0.004, 0.48489394669883024], + // [0.006, 0.43929508759429736], + // [0.008, 0.3981122875791737], + // [0.01, 0.3616769253206311], + // [0.02, 0.2342031400805198], + // [0.04, 0.11975771991300521], + // [0.06, 0.07391980573109036], + // [0.08, 0.05097934297341311], + // [0.1, 0.03769976226678162], + // [0.2, 0.013612390576231537], + // [0.3, 0.0068809271223271296], + // [0.4, 0.003962102304908677], + // [0.5, 0.0024505180009778416], + // [0.6, 0.0015850512105808345], + // [0.7, 0.0010624520881709065], + // [0.8, 0.0007276231523613008], + // [0.9, 0.0005084382444744406], + // [1, 0.00036217242559222207], + // [1.2, 0.00019273716771506244], + // [1.4, 0.00010872756868007816], + // [1.6, 0.00006395475994147581], + // [1.8, 0.00003896146215531804], + // [2, 0.000024502606452037057], + // [2.2, 0.00001569892464603484], + // [2.4, 0.000010242399633653143], + // [2.6, 0.000006860789155460623], + // [2.8, 0.0000046882523186964065], + // [3, 0.0000032135949326050905], + // [3.5, 0.000001325066210533521], + // [4, 5.342383384565608e-7], + // [4.5, 2.175665595460785e-7], + // [5, 9.132140010859047e-8], + // [6, 1.0626180269035501e-8], + // [7, 7.285827496872344e-11], + // [8, 2.5831559113953517e-12], + // [9, 7.334133300673784e-13], + // [10, 7.334133300673784e-13], + // ], + // strokeColor: '#0c3383', + // strokeOpacity: 0.5, + // }, + // upper1: { + // data: [ + // [0.0001, 0.7004877709365895], + // [0.0002, 0.7004877394486364], + // [0.0004, 0.7004794923937316], + // [0.0006, 0.7002321797949567], + // [0.0008, 0.6994846261993801], + // [0.001, 0.698679845264764], + // [0.002, 0.6893234318585744], + // [0.004, 0.6493914037072535], + // [0.006, 0.6064638075374219], + // [0.008, 0.5659363123236882], + // [0.01, 0.527796110761078], + // [0.02, 0.3842359682212444], + // [0.04, 0.23489629810408486], + // [0.06, 0.16187775802616045], + // [0.08, 0.11996220067350616], + // [0.1, 0.09330889384538132], + // [0.2, 0.0395282683670215], + // [0.3, 0.02311832806129488], + // [0.4, 0.015533982238787325], + // [0.5, 0.011289175100063886], + // [0.6, 0.008556061971099482], + // [0.7, 0.00666687644810704], + // [0.8, 0.005269938325912715], + // [0.9, 0.004230753189383152], + // [1, 0.0034060687957339075], + // [1.2, 0.002274670540882373], + // [1.4, 0.0015596338779230168], + // [1.6, 0.0010978490363232618], + // [1.8, 0.0007881855361201451], + // [2, 0.0005749331709483663], + // [2.2, 0.0004274313161132248], + // [2.4, 0.0003230039272410501], + // [2.6, 0.00024687058697248077], + // [2.8, 0.00019131237700620307], + // [3, 0.00014974560072378296], + // [3.5, 0.00008554130687221662], + // [4, 0.00004900372276972487], + // [4.5, 0.00003158114499657305], + // [5, 0.00002134755173799352], + // [6, 0.000010744988509392428], + // [7, 0.000004535790827486785], + // [8, 0.000001966628624394673], + // [9, 8.417826190543209e-7], + // [10, 3.5246935603527874e-7], + // ], + // strokeColor: '#0c3383', + // strokeOpacity: 0.5, + // }, + // }, + // '400m/s SA(0.1) Wellington ': { + // mean: { + // data: [ + // [0.0001, 0.6271677905046744], + // [0.0002, 0.6271669088485238], + // [0.0004, 0.6271496001654902], + // [0.0006, 0.6270792950758779], + // [0.0008, 0.6269184671387533], + // [0.001, 0.6266393693400183], + // [0.002, 0.6231207395477506], + // [0.004, 0.6072979605054911], + // [0.006, 0.585592373437674], + // [0.008, 0.5621860034399065], + // [0.01, 0.5388820268801982], + // [0.02, 0.4381805258313155], + // [0.04, 0.3072556269477581], + // [0.06, 0.22913661370937854], + // [0.08, 0.17847453978918804], + // [0.1, 0.14360204091479545], + // [0.2, 0.06489627568443679], + // [0.3, 0.03797031994999078], + // [0.4, 0.02523028971090424], + // [0.5, 0.018065226422189884], + // [0.6, 0.013580297962525467], + // [0.7, 0.010562278496213717], + // [0.8, 0.008423256177121585], + // [0.9, 0.006847340506466959], + // [1, 0.005651122537005726], + // [1.2, 0.003985021274691691], + // [1.4, 0.0029094529598622243], + // [1.6, 0.0021799912951622202], + // [1.8, 0.0016670829041508517], + // [2, 0.001296331005155471], + // [2.2, 0.0010223656252952296], + // [2.4, 0.0008162229399987231], + // [2.6, 0.0006587189881859246], + // [2.8, 0.000536775276599899], + // [3, 0.000441260010374811], + // [3.5, 0.0002796513041791737], + // [4, 0.00018475653903660127], + // [4.5, 0.00012644253355897916], + // [5, 0.00008919908940752119], + // [6, 0.00004789719921394209], + // [7, 0.000027934880721947053], + // [8, 0.000017399732756162578], + // [9, 0.000011413741604626715], + // [10, 0.000007804235536479354], + // ], + // strokeColor: '#5ea38b', + // }, + // lower2: { + // data: [ + // [0.0001, 0.5231180757188494], + // [0.0002, 0.523117088874262], + // [0.0004, 0.5230869880212766], + // [0.0006, 0.522989603930337], + // [0.0008, 0.5226490437010691], + // [0.001, 0.5218688286427917], + // [0.002, 0.5141458171015492], + // [0.004, 0.5012919273053451], + // [0.006, 0.47988692887843665], + // [0.008, 0.4562480827065467], + // [0.01, 0.43446334280088905], + // [0.02, 0.33830459777554356], + // [0.04, 0.21582390667452056], + // [0.06, 0.14817816745664725], + // [0.08, 0.10787398109322943], + // [0.1, 0.08211786777939445], + // [0.2, 0.031249068358732868], + // [0.3, 0.016531898628435182], + // [0.4, 0.010086953647141073], + // [0.5, 0.006642488487759168], + // [0.6, 0.004576610403907777], + // [0.7, 0.0032549841634834653], + // [0.8, 0.002373882388197579], + // [0.9, 0.0017641370342103002], + // [1, 0.0013323488581372667], + // [1.2, 0.0007873241213988136], + // [1.4, 0.00048255853251000236], + // [1.6, 0.0003062026385861616], + // [1.8, 0.00019995568567476862], + // [2, 0.0001335746901873769], + // [2.2, 0.0000909499852941309], + // [2.4, 0.00006290822625387715], + // [2.6, 0.00004423316524926335], + // [2.8, 0.00003166225160033953], + // [3, 0.000022907650669590218], + // [3.5, 0.000010854249079539358], + // [4, 0.000005213382434310354], + // [4.5, 0.00000253263757954425], + // [5, 0.0000012623980347736818], + // [6, 2.9981809990253794e-7], + // [7, 3.580898977340041e-8], + // [8, 4.0217164043454545e-9], + // [9, 1.1245827602479608e-9], + // [10, 2.784017461010535e-11], + // ], + // strokeColor: '#5ea38b', + // strokeOpacity: 0.5, + // }, + // upper2: { + // data: [ + // [0.0001, 0.7248532599188757], + // [0.0002, 0.7248532075982095], + // [0.0004, 0.7248479824148089], + // [0.0006, 0.7248130295371944], + // [0.0008, 0.7245649167983392], + // [0.001, 0.72428383740527], + // [0.002, 0.721336953986025], + // [0.004, 0.7014677471743239], + // [0.006, 0.6802445329334987], + // [0.008, 0.6595792085892014], + // [0.01, 0.6379710952214412], + // [0.02, 0.5360367648585725], + // [0.04, 0.39691535900130714], + // [0.06, 0.31018841607798364], + // [0.08, 0.2513389814548491], + // [0.1, 0.20916688844765852], + // [0.2, 0.10521536763165362], + // [0.3, 0.06490058855008995], + // [0.4, 0.04477560892453947], + // [0.5, 0.03323620542058192], + // [0.6, 0.02596201936278031], + // [0.7, 0.020968116884068966], + // [0.8, 0.01732018070967556], + // [0.9, 0.014535056818856362], + // [1, 0.012338052233642482], + // [1.2, 0.009176989938553315], + // [1.4, 0.007038990460048078], + // [1.6, 0.0055241389872884294], + // [1.8, 0.004398449315304198], + // [2, 0.0035614483470839398], + // [2.2, 0.002877908842901511], + // [2.4, 0.0023511391757289335], + // [2.6, 0.001946591897533212], + // [2.8, 0.001621439230909183], + // [3, 0.001360882339873637], + // [3.5, 0.0008977375815980571], + // [4, 0.000609151002190278], + // [4.5, 0.0004389973093026356], + // [5, 0.0003240836799249802], + // [6, 0.0001991195775784549], + // [7, 0.00013013219446178503], + // [8, 0.00009288344003521853], + // [9, 0.00006839705871064528], + // [10, 0.00005153574067562339], + // ], + // strokeColor: '#5ea38b', + // strokeOpacity: 0.5, + // }, + // lower1: { + // data: [ + // [0.0001, 0.5508476111642319], + // [0.0002, 0.5508475697469215], + // [0.0004, 0.5508438729663487], + // [0.0006, 0.5507929007568126], + // [0.0008, 0.5505924856513923], + // [0.001, 0.5503718317750664], + // [0.002, 0.5439408354175176], + // [0.004, 0.5211854168910606], + // [0.006, 0.5010767855077303], + // [0.008, 0.47805787498253793], + // [0.01, 0.45524048500558933], + // [0.02, 0.35803309888520496], + // [0.04, 0.23396986117929275], + // [0.06, 0.16361838979874455], + // [0.08, 0.12097704971269596], + // [0.1, 0.09320847184858061], + // [0.2, 0.03694504687718625], + // [0.3, 0.01995102694070028], + // [0.4, 0.012368401899778392], + // [0.5, 0.008273839520937631], + // [0.6, 0.005795222768384178], + // [0.7, 0.004200202958257515], + // [0.8, 0.00311612696910768], + // [0.9, 0.002357452409867289], + // [1, 0.001810917729933581], + // [1.2, 0.0011092760501874022], + // [1.4, 0.0007067101803697184], + // [1.6, 0.00046371296397418327], + // [1.8, 0.0003101156465562527], + // [2, 0.00021228548300211703], + // [2.2, 0.00014754611321388111], + // [2.4, 0.00010449754766128638], + // [2.6, 0.00007507945121221216], + // [2.8, 0.000054707824361677204], + // [3, 0.00004022125734659543], + // [3.5, 0.00001930473060485216], + // [4, 0.000009747331710996399], + // [4.5, 0.0000050353225421462255], + // [5, 0.000002734188991881936], + // [6, 8.026949834816222e-7], + // [7, 2.0525179289521134e-7], + // [8, 5.5286271227750206e-8], + // [9, 1.3510851104570065e-8], + // [10, 2.820541689096956e-9], + // ], + // strokeColor: '#5ea38b', + // strokeOpacity: 0.5, + // }, + // upper1: { + // data: [ + // [0.0001, 0.7004877709365895], + // [0.0002, 0.7004877709365895], + // [0.0004, 0.7004873244604399], + // [0.0006, 0.7004745008422031], + // [0.0008, 0.7003700475825081], + // [0.001, 0.7001088774835035], + // [0.002, 0.6975770910519434], + // [0.004, 0.6840969828714226], + // [0.006, 0.6624075162171419], + // [0.008, 0.638255635099694], + // [0.01, 0.6152219976458999], + // [0.02, 0.5142889648347129], + // [0.04, 0.3769104932973675], + // [0.06, 0.29212729144011995], + // [0.08, 0.2351356042685645], + // [0.1, 0.1944737295671921], + // [0.2, 0.0958963317271534], + // [0.3, 0.05858517034681665], + // [0.4, 0.04008191700360064], + // [0.5, 0.02938888177890131], + // [0.6, 0.022619717203534395], + // [0.7, 0.0179533613409274], + // [0.8, 0.014630468824590626], + // [0.9, 0.01215591372525815], + // [1, 0.01026015580950368], + // [1.2, 0.0075527524708076665], + // [1.4, 0.005719194261231797], + // [1.6, 0.004403841353538662], + // [1.8, 0.003443871596481407], + // [2, 0.002740145325789367], + // [2.2, 0.002221235842313707], + // [2.4, 0.001808648737187002], + // [2.6, 0.0014889139548160957], + // [2.8, 0.001241323319124965], + // [3, 0.001036431530738846], + // [3.5, 0.000684555410430665], + // [4, 0.00047804739932899576], + // [4.5, 0.00036114448057700255], + // [5, 0.0002827987616685901], + // [6, 0.00015692032316938498], + // [7, 0.00008578859682883966], + // [8, 0.00005315963535823531], + // [9, 0.00003356759623029948], + // [10, 0.00002102983485419152], + // ], + // strokeColor: '#5ea38b', + // strokeOpacity: 0.5, + // }, + // }, + // '400m/s SA(0.2) Wellington ': { + // mean: { + // data: [ + // [0.0001, 0.6271678146997274], + // [0.0002, 0.6271677142742145], + // [0.0004, 0.6271640022663891], + // [0.0006, 0.6271443980566402], + // [0.0008, 0.6270920025172347], + // [0.001, 0.6269909505191225], + // [0.002, 0.6254165961302274], + // [0.004, 0.6164183546686237], + // [0.006, 0.6018997390933628], + // [0.008, 0.5846148350307324], + // [0.01, 0.5662152124077804], + // [0.02, 0.4777639618209093], + // [0.04, 0.34902652922845334], + // [0.06, 0.2667418545066732], + // [0.08, 0.21125790517361476], + // [0.1, 0.17204863975979157], + // [0.2, 0.08035408699463265], + // [0.3, 0.04797283710011491], + // [0.4, 0.032468323105555696], + // [0.5, 0.023674869293649703], + // [0.6, 0.018123336979769866], + // [0.7, 0.014351840343967415], + // [0.8, 0.011650636078302634], + // [0.9, 0.009637944982554547], + // [1, 0.008091822007163296], + // [1.2, 0.005898914826576229], + // [1.4, 0.004445511748008002], + // [1.6, 0.003432746581899737], + // [1.8, 0.0027008879178623824], + // [2, 0.002157236718352995], + // [2.2, 0.0017445442057810734], + // [2.4, 0.0014257223919416084], + // [2.6, 0.0011758123786558272], + // [2.8, 0.000977489980295121], + // [3, 0.0008184271953338706], + // [3.5, 0.0005392718134710206], + // [4, 0.0003670030242420852], + // [4.5, 0.0002565694722874712], + // [5, 0.0001835367580723668], + // [6, 0.00009951655344420107], + // [7, 0.000057511373395158216], + // [8, 0.00003500465329953073], + // [9, 0.000022249526945294917], + // [10, 0.000014671411954991775], + // ], + // strokeColor: '#f2a038', + // }, + // lower2: { + // data: [ + // [0.0001, 0.5231180757188494], + // [0.0002, 0.5231180259619794], + // [0.0004, 0.5231123453859927], + // [0.0006, 0.5230867307363296], + // [0.0008, 0.5230248079725701], + // [0.001, 0.522879300419536], + // [0.002, 0.5188798489600042], + // [0.004, 0.507032704587888], + // [0.006, 0.49646520777763103], + // [0.008, 0.47810498210260777], + // [0.01, 0.45947252890524215], + // [0.02, 0.37560572031268047], + // [0.04, 0.25481232530302333], + // [0.06, 0.18162577160097138], + // [0.08, 0.1360875202756926], + // [0.1, 0.10573379068310329], + // [0.2, 0.04248644531508483], + // [0.3, 0.02326953802716647], + // [0.4, 0.01475697062581982], + // [0.5, 0.01012655919675376], + // [0.6, 0.0072773066503348804], + // [0.7, 0.005395122368298644], + // [0.8, 0.0040995917553358074], + // [0.9, 0.0031725049750754852], + // [1, 0.0024952714823719413], + // [1.2, 0.0015972918669934222], + // [1.4, 0.0010599488037927873], + // [1.6, 0.0007236439336992806], + // [1.8, 0.0005043145237646485], + // [2, 0.00035735142138715315], + // [2.2, 0.00025770481320586125], + // [2.4, 0.00018875804754792114], + // [2.6, 0.00013999415637389045], + // [2.8, 0.00010512084495062357], + // [3, 0.00007978740884229119], + // [3.5, 0.00004166871061617172], + // [4, 0.00002284360957471865], + // [4.5, 0.000013076942031453598], + // [5, 0.000007644308627541285], + // [6, 0.0000027407402444223905], + // [7, 0.000001051639461291387], + // [8, 3.9789976291615403e-7], + // [9, 1.376580915923853e-7], + // [10, 3.210909804707285e-8], + // ], + // strokeColor: '#f2a038', + // strokeOpacity: 0.5, + // }, + // upper2: { + // data: [ + // [0.0001, 0.7248532599188757], + // [0.0002, 0.7248532599188757], + // [0.0004, 0.7248528712374525], + // [0.0006, 0.7248472190126694], + // [0.0008, 0.7248203251647835], + // [0.001, 0.7247026968633081], + // [0.002, 0.7234935311434934], + // [0.004, 0.7138772530162725], + // [0.006, 0.6960868942682481], + // [0.008, 0.6795410031825324], + // [0.01, 0.6632224436440062], + // [0.02, 0.5771683183485984], + // [0.04, 0.4417394710296786], + // [0.06, 0.35097266750828304], + // [0.08, 0.28728685098487394], + // [0.1, 0.24066562938089686], + // [0.2, 0.12314638043018145], + // [0.3, 0.07717323061323944], + // [0.4, 0.054053334795723385], + // [0.5, 0.04063672395518958], + // [0.6, 0.03213969711689024], + // [0.7, 0.02629802787907387], + // [0.8, 0.022064055402492122], + // [0.9, 0.01882163568096462], + // [1, 0.01623888241713911], + // [1.2, 0.01247687967274358], + // [1.4, 0.009874025307264778], + // [1.6, 0.007954934665347912], + // [1.8, 0.0065273489209859425], + // [2, 0.005434612287384621], + // [2.2, 0.004552044667431754], + // [2.4, 0.0038302648574828346], + // [2.6, 0.003196646688565785], + // [2.8, 0.002683533547753525], + // [3, 0.0022705755163071606], + // [3.5, 0.001541368638113716], + // [4, 0.0010812649666320784], + // [4.5, 0.0007777432575258869], + // [5, 0.0005699866558335209], + // [6, 0.0003274933854759965], + // [7, 0.0002048150330619114], + // [8, 0.00013418554992628007], + // [9, 0.00009296875900954849], + // [10, 0.00006642179911264812], + // ], + // strokeColor: '#f2a038', + // strokeOpacity: 0.5, + // }, + // lower1: { + // data: [ + // [0.0001, 0.5508476111642319], + // [0.0002, 0.5508476111642319], + // [0.0004, 0.5508473457661378], + // [0.0006, 0.5508433136227391], + // [0.0008, 0.5508146610501392], + // [0.001, 0.5506662241796914], + // [0.002, 0.5485232851957855], + // [0.004, 0.5310122599238649], + // [0.006, 0.5160436582381678], + // [0.008, 0.49999613900903694], + // [0.01, 0.4814141511688168], + // [0.02, 0.39528644592058837], + // [0.04, 0.2735073473622409], + // [0.06, 0.19837903548684532], + // [0.08, 0.15036332471285885], + // [0.1, 0.11802888952141966], + // [0.2, 0.04922655502355344], + // [0.3, 0.027554214096817686], + // [0.4, 0.017677081569640207], + // [0.5, 0.012254240294728214], + // [0.6, 0.008914242101410896], + // [0.7, 0.006704033652593866], + // [0.8, 0.005169082256985091], + // [0.9, 0.004054840393964643], + // [1, 0.0032232332902687455], + // [1.2, 0.0021087073099879117], + // [1.4, 0.0014302003131836383], + // [1.6, 0.0009971042197591817], + // [1.8, 0.0007121818016100345], + // [2, 0.0005181075677131997], + // [2.2, 0.00038400402966942693], + // [2.4, 0.00028826621592326074], + // [2.6, 0.00021877516698987076], + // [2.8, 0.0001671797030092792], + // [3, 0.0001289709523789595], + // [3.5, 0.00006980348332641384], + // [4, 0.000039481864889334695], + // [4.5, 0.000023259416777943187], + // [5, 0.000014120019299235231], + // [6, 0.0000054136345865041235], + // [7, 0.0000021747493692547692], + // [8, 8.896089018772813e-7], + // [9, 3.331188336286317e-7], + // [10, 9.64736650566067e-8], + // ], + // strokeColor: '#f2a038', + // strokeOpacity: 0.5, + // }, + // upper1: { + // data: [ + // [0.0001, 0.7004877709365895], + // [0.0002, 0.7004877709365895], + // [0.0004, 0.7004877709365895], + // [0.0006, 0.7004871243432589], + // [0.0008, 0.7004781130304855], + // [0.001, 0.7004508288244962], + // [0.002, 0.699078135414744], + // [0.004, 0.6926608992608263], + // [0.006, 0.6788419579307368], + // [0.008, 0.661336458476271], + // [0.01, 0.6425056428172309], + // [0.02, 0.5551857528524636], + // [0.04, 0.42088875224887734], + // [0.06, 0.3320562654148609], + // [0.08, 0.27028978165888284], + // [0.1, 0.22527599545720522], + // [0.2, 0.11325336225867833], + // [0.3, 0.07025364389718292], + // [0.4, 0.04883924960159913], + // [0.5, 0.03644919885497777], + // [0.6, 0.028517624164859257], + // [0.7, 0.02304267693144091], + // [0.8, 0.01907132830884839], + // [0.9, 0.01609185064148444], + // [1, 0.013770874081661333], + // [1.2, 0.010455043933106367], + // [1.4, 0.008171486350751711], + // [1.6, 0.006483491713307421], + // [1.8, 0.005216836124627866], + // [2, 0.004246889151417466], + // [2.2, 0.0034856761629044053], + // [2.4, 0.002886324192188816], + // [2.6, 0.0024108625048149257], + // [2.8, 0.002026079457091212], + // [3, 0.0017128836794693125], + // [3.5, 0.0011501735055617912], + // [4, 0.0008002652822376444], + // [4.5, 0.0005717591917157039], + // [5, 0.0004151991576725189], + // [6, 0.00024092128840325078], + // [7, 0.0001573857524744815], + // [8, 0.0001112302354503436], + // [9, 0.00008132153325468572], + // [10, 0.00005647937458053143], + // ], + // strokeColor: '#f2a038', + // strokeOpacity: 0.5, + // }, + // }, +}; + +export const uhsData = { + '400m/s Rotorua': { + upper2: { + data: [ + [0.04, 0.4473282606790173], + [0.1, 0.8509523988220922], + [0.2, 1.0818023815555553], + [0.3, 1.0615420309382526], + [0.4, 0.9721155883647336], + [0.5, 0.885757662698346], + [0.7, 0.7241517757088942], + [1, 0.5635525876465979], + [1.5, 0.36190225052708913], + [2, 0.273121624920158], + [3, 0.1542570619603453], + [4, 0.10893706357680555], + [5, 0.07701618337141809], + [6, 0.055998910012043907], + [7.5, 0.04028953386916813], + [10, 0.02517712794380344], ], - strokeColor: '#5ea38b', + strokeColor: '#0c3383', + strokeOpacity: 0.5, }, - lower2: { + upper1: { data: [ - [0.0001, 0.5231180757188494], - [0.0002, 0.523117088874262], - [0.0004, 0.5230869880212766], - [0.0006, 0.522989603930337], - [0.0008, 0.5226490437010691], - [0.001, 0.5218688286427917], - [0.002, 0.5141458171015492], - [0.004, 0.5012919273053451], - [0.006, 0.47988692887843665], - [0.008, 0.4562480827065467], - [0.01, 0.43446334280088905], - [0.02, 0.33830459777554356], - [0.04, 0.21582390667452056], - [0.06, 0.14817816745664725], - [0.08, 0.10787398109322943], - [0.1, 0.08211786777939445], - [0.2, 0.031249068358732868], - [0.3, 0.016531898628435182], - [0.4, 0.010086953647141073], - [0.5, 0.006642488487759168], - [0.6, 0.004576610403907777], - [0.7, 0.0032549841634834653], - [0.8, 0.002373882388197579], - [0.9, 0.0017641370342103002], - [1, 0.0013323488581372667], - [1.2, 0.0007873241213988136], - [1.4, 0.00048255853251000236], - [1.6, 0.0003062026385861616], - [1.8, 0.00019995568567476862], - [2, 0.0001335746901873769], - [2.2, 0.0000909499852941309], - [2.4, 0.00006290822625387715], - [2.6, 0.00004423316524926335], - [2.8, 0.00003166225160033953], - [3, 0.000022907650669590218], - [3.5, 0.000010854249079539358], - [4, 0.000005213382434310354], - [4.5, 0.00000253263757954425], - [5, 0.0000012623980347736818], - [6, 2.9981809990253794e-7], - [7, 3.580898977340041e-8], - [8, 4.0217164043454545e-9], - [9, 1.1245827602479608e-9], - [10, 2.784017461010535e-11], + [0.04, 0.4206242718138454], + [0.1, 0.7972146258735308], + [0.2, 1.0124957918606787], + [0.3, 0.9910399967036614], + [0.4, 0.9047736374285609], + [0.5, 0.8218770494014926], + [0.7, 0.6663749060717565], + [1, 0.5064003666337925], + [1.5, 0.3249113960383225], + [2, 0.2372775890172082], + [3, 0.13265876789019632], + [4, 0.09331712360826946], + [5, 0.06507164503019869], + [6, 0.04724110840112773], + [7.5, 0.03277273365750313], + [10, 0.02102111265145383], ], - strokeColor: '#5ea38b', + strokeColor: '#0c3383', strokeOpacity: 0.5, }, - upper2: { + mean: { data: [ - [0.0001, 0.7248532599188757], - [0.0002, 0.7248532075982095], - [0.0004, 0.7248479824148089], - [0.0006, 0.7248130295371944], - [0.0008, 0.7245649167983392], - [0.001, 0.72428383740527], - [0.002, 0.721336953986025], - [0.004, 0.7014677471743239], - [0.006, 0.6802445329334987], - [0.008, 0.6595792085892014], - [0.01, 0.6379710952214412], - [0.02, 0.5360367648585725], - [0.04, 0.39691535900130714], - [0.06, 0.31018841607798364], - [0.08, 0.2513389814548491], - [0.1, 0.20916688844765852], - [0.2, 0.10521536763165362], - [0.3, 0.06490058855008995], - [0.4, 0.04477560892453947], - [0.5, 0.03323620542058192], - [0.6, 0.02596201936278031], - [0.7, 0.020968116884068966], - [0.8, 0.01732018070967556], - [0.9, 0.014535056818856362], - [1, 0.012338052233642482], - [1.2, 0.009176989938553315], - [1.4, 0.007038990460048078], - [1.6, 0.0055241389872884294], - [1.8, 0.004398449315304198], - [2, 0.0035614483470839398], - [2.2, 0.002877908842901511], - [2.4, 0.0023511391757289335], - [2.6, 0.001946591897533212], - [2.8, 0.001621439230909183], - [3, 0.001360882339873637], - [3.5, 0.0008977375815980571], - [4, 0.000609151002190278], - [4.5, 0.0004389973093026356], - [5, 0.0003240836799249802], - [6, 0.0001991195775784549], - [7, 0.00013013219446178503], - [8, 0.00009288344003521853], - [9, 0.00006839705871064528], - [10, 0.00005153574067562339], + [0.04, 0.3168404513655555], + [0.1, 0.5986033643866167], + [0.2, 0.7624999890115429], + [0.3, 0.74958119725473], + [0.4, 0.6837198365711723], + [0.5, 0.6214745965847263], + [0.7, 0.505896005908131], + [1, 0.3798971746276631], + [1.5, 0.2419268226953269], + [2, 0.17217528646618474], + [3, 0.09877171003617002], + [4, 0.06622559339370532], + [5, 0.04539441568619136], + [6, 0.03215581365150515], + [7.5, 0.02193995548943388], + [10, 0.013239332157891436], ], - strokeColor: '#5ea38b', - strokeOpacity: 0.5, + strokeColor: '#0c3383', }, lower1: { data: [ - [0.0001, 0.5508476111642319], - [0.0002, 0.5508475697469215], - [0.0004, 0.5508438729663487], - [0.0006, 0.5507929007568126], - [0.0008, 0.5505924856513923], - [0.001, 0.5503718317750664], - [0.002, 0.5439408354175176], - [0.004, 0.5211854168910606], - [0.006, 0.5010767855077303], - [0.008, 0.47805787498253793], - [0.01, 0.45524048500558933], - [0.02, 0.35803309888520496], - [0.04, 0.23396986117929275], - [0.06, 0.16361838979874455], - [0.08, 0.12097704971269596], - [0.1, 0.09320847184858061], - [0.2, 0.03694504687718625], - [0.3, 0.01995102694070028], - [0.4, 0.012368401899778392], - [0.5, 0.008273839520937631], - [0.6, 0.005795222768384178], - [0.7, 0.004200202958257515], - [0.8, 0.00311612696910768], - [0.9, 0.002357452409867289], - [1, 0.001810917729933581], - [1.2, 0.0011092760501874022], - [1.4, 0.0007067101803697184], - [1.6, 0.00046371296397418327], - [1.8, 0.0003101156465562527], - [2, 0.00021228548300211703], - [2.2, 0.00014754611321388111], - [2.4, 0.00010449754766128638], - [2.6, 0.00007507945121221216], - [2.8, 0.000054707824361677204], - [3, 0.00004022125734659543], - [3.5, 0.00001930473060485216], - [4, 0.000009747331710996399], - [4.5, 0.0000050353225421462255], - [5, 0.000002734188991881936], - [6, 8.026949834816222e-7], - [7, 2.0525179289521134e-7], - [8, 5.5286271227750206e-8], - [9, 1.3510851104570065e-8], - [10, 2.820541689096956e-9], + [0.04, 0.21078813867286417], + [0.1, 0.38770259544188945], + [0.2, 0.5010201926439772], + [0.3, 0.5079624221764334], + [0.4, 0.46799496700338783], + [0.5, 0.4258223136651961], + [0.7, 0.3451566837612537], + [1, 0.25447843672013776], + [1.5, 0.16052188388900862], + [2, 0.1116974314285632], + [3, 0.06293778644275012], + [4, 0.04028524718961036], + [5, 0.026400350741633726], + [6, 0.01885277547361149], + [7.5, 0.012162229192452741], + [10, 0.007071869352240137], ], - strokeColor: '#5ea38b', + strokeColor: '#0c3383', strokeOpacity: 0.5, }, - upper1: { + lower2: { data: [ - [0.0001, 0.7004877709365895], - [0.0002, 0.7004877709365895], - [0.0004, 0.7004873244604399], - [0.0006, 0.7004745008422031], - [0.0008, 0.7003700475825081], - [0.001, 0.7001088774835035], - [0.002, 0.6975770910519434], - [0.004, 0.6840969828714226], - [0.006, 0.6624075162171419], - [0.008, 0.638255635099694], - [0.01, 0.6152219976458999], - [0.02, 0.5142889648347129], - [0.04, 0.3769104932973675], - [0.06, 0.29212729144011995], - [0.08, 0.2351356042685645], - [0.1, 0.1944737295671921], - [0.2, 0.0958963317271534], - [0.3, 0.05858517034681665], - [0.4, 0.04008191700360064], - [0.5, 0.02938888177890131], - [0.6, 0.022619717203534395], - [0.7, 0.0179533613409274], - [0.8, 0.014630468824590626], - [0.9, 0.01215591372525815], - [1, 0.01026015580950368], - [1.2, 0.0075527524708076665], - [1.4, 0.005719194261231797], - [1.6, 0.004403841353538662], - [1.8, 0.003443871596481407], - [2, 0.002740145325789367], - [2.2, 0.002221235842313707], - [2.4, 0.001808648737187002], - [2.6, 0.0014889139548160957], - [2.8, 0.001241323319124965], - [3, 0.001036431530738846], - [3.5, 0.000684555410430665], - [4, 0.00047804739932899576], - [4.5, 0.00036114448057700255], - [5, 0.0002827987616685901], - [6, 0.00015692032316938498], - [7, 0.00008578859682883966], - [8, 0.00005315963535823531], - [9, 0.00003356759623029948], - [10, 0.00002102983485419152], + [0.04, 0.1888725546143925], + [0.1, 0.34916330405149953], + [0.2, 0.4510602064450422], + [0.3, 0.4610073345605527], + [0.4, 0.42624671535948094], + [0.5, 0.3874273173303313], + [0.7, 0.3143228244325046], + [1, 0.2322056361003113], + [1.5, 0.1458034880028028], + [2, 0.10245491159387803], + [3, 0.056946984960191425], + [4, 0.03586815470202565], + [5, 0.023765198655854552], + [6, 0.016641326502481964], + [7.5, 0.010860657491806732], + [10, 0.006185091877869594], ], - strokeColor: '#5ea38b', + strokeColor: '#0c3383', strokeOpacity: 0.5, }, }, - '400m/s SA(0.2) Wellington ': { - mean: { + '400m/s Wellington': { + upper2: { data: [ - [0.0001, 0.6271678146997274], - [0.0002, 0.6271677142742145], - [0.0004, 0.6271640022663891], - [0.0006, 0.6271443980566402], - [0.0008, 0.6270920025172347], - [0.001, 0.6269909505191225], - [0.002, 0.6254165961302274], - [0.004, 0.6164183546686237], - [0.006, 0.6018997390933628], - [0.008, 0.5846148350307324], - [0.01, 0.5662152124077804], - [0.02, 0.4777639618209093], - [0.04, 0.34902652922845334], - [0.06, 0.2667418545066732], - [0.08, 0.21125790517361476], - [0.1, 0.17204863975979157], - [0.2, 0.08035408699463265], - [0.3, 0.04797283710011491], - [0.4, 0.032468323105555696], - [0.5, 0.023674869293649703], - [0.6, 0.018123336979769866], - [0.7, 0.014351840343967415], - [0.8, 0.011650636078302634], - [0.9, 0.009637944982554547], - [1, 0.008091822007163296], - [1.2, 0.005898914826576229], - [1.4, 0.004445511748008002], - [1.6, 0.003432746581899737], - [1.8, 0.0027008879178623824], - [2, 0.002157236718352995], - [2.2, 0.0017445442057810734], - [2.4, 0.0014257223919416084], - [2.6, 0.0011758123786558272], - [2.8, 0.000977489980295121], - [3, 0.0008184271953338706], - [3.5, 0.0005392718134710206], - [4, 0.0003670030242420852], - [4.5, 0.0002565694722874712], - [5, 0.0001835367580723668], - [6, 0.00009951655344420107], - [7, 0.000057511373395158216], - [8, 0.00003500465329953073], - [9, 0.000022249526945294917], - [10, 0.000014671411954991775], + [0.04, 1.4125649464199], + [0.1, 2.5140670305270056], + [0.2, 3.0904803198933006], + [0.3, 2.9398478346946315], + [0.4, 2.6279078716199287], + [0.5, 2.3865710167621947], + [0.7, 1.901485214909174], + [1, 1.4760415286784823], + [1.5, 0.9616049366613129], + [2, 0.7310467773967161], + [3, 0.42187019747454624], + [4, 0.29414407788595703], + [5, 0.20492223425372125], + [6, 0.14425788372484222], + [7.5, 0.09960554229911582], + [10, 0.06325458871033639], ], - strokeColor: '#f2a038', + strokeColor: '#f2d338', + strokeOpacity: 0.5, }, - lower2: { + upper1: { data: [ - [0.0001, 0.5231180757188494], - [0.0002, 0.5231180259619794], - [0.0004, 0.5231123453859927], - [0.0006, 0.5230867307363296], - [0.0008, 0.5230248079725701], - [0.001, 0.522879300419536], - [0.002, 0.5188798489600042], - [0.004, 0.507032704587888], - [0.006, 0.49646520777763103], - [0.008, 0.47810498210260777], - [0.01, 0.45947252890524215], - [0.02, 0.37560572031268047], - [0.04, 0.25481232530302333], - [0.06, 0.18162577160097138], - [0.08, 0.1360875202756926], - [0.1, 0.10573379068310329], - [0.2, 0.04248644531508483], - [0.3, 0.02326953802716647], - [0.4, 0.01475697062581982], - [0.5, 0.01012655919675376], - [0.6, 0.0072773066503348804], - [0.7, 0.005395122368298644], - [0.8, 0.0040995917553358074], - [0.9, 0.0031725049750754852], - [1, 0.0024952714823719413], - [1.2, 0.0015972918669934222], - [1.4, 0.0010599488037927873], - [1.6, 0.0007236439336992806], - [1.8, 0.0005043145237646485], - [2, 0.00035735142138715315], - [2.2, 0.00025770481320586125], - [2.4, 0.00018875804754792114], - [2.6, 0.00013999415637389045], - [2.8, 0.00010512084495062357], - [3, 0.00007978740884229119], - [3.5, 0.00004166871061617172], - [4, 0.00002284360957471865], - [4.5, 0.000013076942031453598], - [5, 0.000007644308627541285], - [6, 0.0000027407402444223905], - [7, 0.000001051639461291387], - [8, 3.9789976291615403e-7], - [9, 1.376580915923853e-7], - [10, 3.210909804707285e-8], + [0.04, 1.2380746734757742], + [0.1, 2.2496451191750957], + [0.2, 2.75353607510941], + [0.3, 2.659974786854728], + [0.4, 2.420016419695187], + [0.5, 2.163635825061531], + [0.7, 1.737855747303903], + [1, 1.291608233150155], + [1.5, 0.8173777619913168], + [2, 0.6072975357713809], + [3, 0.3485680289889862], + [4, 0.24169268934138627], + [5, 0.1650918481376684], + [6, 0.1201564544222268], + [7.5, 0.08610399512365491], + [10, 0.052434603043510844], ], - strokeColor: '#f2a038', + strokeColor: '#f2d338', strokeOpacity: 0.5, }, - upper2: { + mean: { data: [ - [0.0001, 0.7248532599188757], - [0.0002, 0.7248532599188757], - [0.0004, 0.7248528712374525], - [0.0006, 0.7248472190126694], - [0.0008, 0.7248203251647835], - [0.001, 0.7247026968633081], - [0.002, 0.7234935311434934], - [0.004, 0.7138772530162725], - [0.006, 0.6960868942682481], - [0.008, 0.6795410031825324], - [0.01, 0.6632224436440062], - [0.02, 0.5771683183485984], - [0.04, 0.4417394710296786], - [0.06, 0.35097266750828304], - [0.08, 0.28728685098487394], - [0.1, 0.24066562938089686], - [0.2, 0.12314638043018145], - [0.3, 0.07717323061323944], - [0.4, 0.054053334795723385], - [0.5, 0.04063672395518958], - [0.6, 0.03213969711689024], - [0.7, 0.02629802787907387], - [0.8, 0.022064055402492122], - [0.9, 0.01882163568096462], - [1, 0.01623888241713911], - [1.2, 0.01247687967274358], - [1.4, 0.009874025307264778], - [1.6, 0.007954934665347912], - [1.8, 0.0065273489209859425], - [2, 0.005434612287384621], - [2.2, 0.004552044667431754], - [2.4, 0.0038302648574828346], - [2.6, 0.003196646688565785], - [2.8, 0.002683533547753525], - [3, 0.0022705755163071606], - [3.5, 0.001541368638113716], - [4, 0.0010812649666320784], - [4.5, 0.0007777432575258869], - [5, 0.0005699866558335209], - [6, 0.0003274933854759965], - [7, 0.0002048150330619114], - [8, 0.00013418554992628007], - [9, 0.00009296875900954849], - [10, 0.00006642179911264812], + [0.04, 0.8957935326920364], + [0.1, 1.624034081437879], + [0.2, 2.0211750088002676], + [0.3, 1.964309649569773], + [0.4, 1.7957560128883039], + [0.5, 1.6134898999005842], + [0.7, 1.280794130292017], + [1, 0.9451541427138056], + [1.5, 0.5890146740253265], + [2, 0.4206206450858724], + [3, 0.23693775865397745], + [4, 0.15927073495396188], + [5, 0.1118286787827911], + [6, 0.08249872605031001], + [7.5, 0.056345047679218815], + [10, 0.034504756412469105], ], - strokeColor: '#f2a038', - strokeOpacity: 0.5, + strokeColor: '#f2d338', }, lower1: { data: [ - [0.0001, 0.5508476111642319], - [0.0002, 0.5508476111642319], - [0.0004, 0.5508473457661378], - [0.0006, 0.5508433136227391], - [0.0008, 0.5508146610501392], - [0.001, 0.5506662241796914], - [0.002, 0.5485232851957855], - [0.004, 0.5310122599238649], - [0.006, 0.5160436582381678], - [0.008, 0.49999613900903694], - [0.01, 0.4814141511688168], - [0.02, 0.39528644592058837], - [0.04, 0.2735073473622409], - [0.06, 0.19837903548684532], - [0.08, 0.15036332471285885], - [0.1, 0.11802888952141966], - [0.2, 0.04922655502355344], - [0.3, 0.027554214096817686], - [0.4, 0.017677081569640207], - [0.5, 0.012254240294728214], - [0.6, 0.008914242101410896], - [0.7, 0.006704033652593866], - [0.8, 0.005169082256985091], - [0.9, 0.004054840393964643], - [1, 0.0032232332902687455], - [1.2, 0.0021087073099879117], - [1.4, 0.0014302003131836383], - [1.6, 0.0009971042197591817], - [1.8, 0.0007121818016100345], - [2, 0.0005181075677131997], - [2.2, 0.00038400402966942693], - [2.4, 0.00028826621592326074], - [2.6, 0.00021877516698987076], - [2.8, 0.0001671797030092792], - [3, 0.0001289709523789595], - [3.5, 0.00006980348332641384], - [4, 0.000039481864889334695], - [4.5, 0.000023259416777943187], - [5, 0.000014120019299235231], - [6, 0.0000054136345865041235], - [7, 0.0000021747493692547692], - [8, 8.896089018772813e-7], - [9, 3.331188336286317e-7], - [10, 9.64736650566067e-8], + [0.04, 0.5325997165542142], + [0.1, 0.9412628514271774], + [0.2, 1.2003383945645396], + [0.3, 1.2155891317927], + [0.4, 1.1326521748746143], + [0.5, 1.024061637756949], + [0.7, 0.8164070447746248], + [1, 0.5934745442590628], + [1.5, 0.35724717775097936], + [2, 0.24325647529484756], + [3, 0.13113747034106105], + [4, 0.0881830418915675], + [5, 0.061011927035481826], + [6, 0.04378169708833929], + [7.5, 0.028483043962804606], + [10, 0.016984409655567047], ], - strokeColor: '#f2a038', + strokeColor: '#f2d338', strokeOpacity: 0.5, }, - upper1: { + lower2: { data: [ - [0.0001, 0.7004877709365895], - [0.0002, 0.7004877709365895], - [0.0004, 0.7004877709365895], - [0.0006, 0.7004871243432589], - [0.0008, 0.7004781130304855], - [0.001, 0.7004508288244962], - [0.002, 0.699078135414744], - [0.004, 0.6926608992608263], - [0.006, 0.6788419579307368], - [0.008, 0.661336458476271], - [0.01, 0.6425056428172309], - [0.02, 0.5551857528524636], - [0.04, 0.42088875224887734], - [0.06, 0.3320562654148609], - [0.08, 0.27028978165888284], - [0.1, 0.22527599545720522], - [0.2, 0.11325336225867833], - [0.3, 0.07025364389718292], - [0.4, 0.04883924960159913], - [0.5, 0.03644919885497777], - [0.6, 0.028517624164859257], - [0.7, 0.02304267693144091], - [0.8, 0.01907132830884839], - [0.9, 0.01609185064148444], - [1, 0.013770874081661333], - [1.2, 0.010455043933106367], - [1.4, 0.008171486350751711], - [1.6, 0.006483491713307421], - [1.8, 0.005216836124627866], - [2, 0.004246889151417466], - [2.2, 0.0034856761629044053], - [2.4, 0.002886324192188816], - [2.6, 0.0024108625048149257], - [2.8, 0.002026079457091212], - [3, 0.0017128836794693125], - [3.5, 0.0011501735055617912], - [4, 0.0008002652822376444], - [4.5, 0.0005717591917157039], - [5, 0.0004151991576725189], - [6, 0.00024092128840325078], - [7, 0.0001573857524744815], - [8, 0.0001112302354503436], - [9, 0.00008132153325468572], - [10, 0.00005647937458053143], + [0.04, 0.47501573299643723], + [0.1, 0.8387308845909235], + [0.2, 1.0715280067860304], + [0.3, 1.0917217444860876], + [0.4, 1.0217974883500147], + [0.5, 0.9235962669179212], + [0.7, 0.7328723601320616], + [1, 0.5311795469111733], + [1.5, 0.32071757850580707], + [2, 0.21773734618643587], + [3, 0.11711091445187938], + [4, 0.07770513774403447], + [5, 0.0528135390731816], + [6, 0.03777410382717481], + [7.5, 0.024423440587658482], + [10, 0.014251413396858037], ], - strokeColor: '#f2a038', + strokeColor: '#f2d338', strokeOpacity: 0.5, }, }, From 7b88ee2842ce0c360203cce4e4665cf7c2317600 Mon Sep 17 00:00:00 2001 From: ben-chamberlain Date: Thu, 4 Apr 2024 15:16:43 +1300 Subject: [PATCH 2/2] change version number; --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a6f02a..2eafa71 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gns-science/toshi-nest", - "version": "3.9.10", + "version": "3.9.11", "description": "The toshi-nest is for fledgling work e.g. reusable Node components to share across TUI and other projects", "main": "dist/index.cjs.js", "module": "dist/index.esm.js",