Skip to content

Commit 324c53d

Browse files
sirmmosirmmo
committed
plot
1 parent 22419ca commit 324c53d

File tree

3 files changed

+155
-438
lines changed

3 files changed

+155
-438
lines changed

‎src/app/components/TimeSeriesDialog/TSDataContainer.tsx‎

Lines changed: 84 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const TSDataContainer = (props: TSDataContainerProps) => {
6767
setIds,
6868
setTimeRange,
6969
place = '',
70-
setToDownload = () => { },
70+
setToDownload = () => {},
7171
currentLayer,
7272
currentMap,
7373
setFilters = (
@@ -76,9 +76,9 @@ const TSDataContainer = (props: TSDataContainerProps) => {
7676
tsSmoothing,
7777
sensorSmoothing,
7878
uncertainty,
79-
) => { },
80-
setSeriesFilter = () => { },
81-
setFilledSeries = () => { },
79+
) => {},
80+
setSeriesFilter = () => {},
81+
setFilledSeries = () => {},
8282
mode,
8383
map_data,
8484
} = props;
@@ -427,7 +427,7 @@ const TSDataContainer = (props: TSDataContainerProps) => {
427427
item.info.processing_method.indexOf(processingMethod) >= 0 &&
428428
(item.info.climatological_model === baseClimatologicalModel ||
429429
item.info.climatological_model === comparisonClimatologicalModel)) ||
430-
(item.info.dataset_type === 'obaservation' &&
430+
(item.info.dataset_type === 'observation' &&
431431
item.info.processing_method.indexOf(sensorProcessingMehtod) >= 0)
432432
) {
433433
if (uncert && item.info.dataset_type === 'forecast_upper_uncertainty') {
@@ -439,7 +439,7 @@ const TSDataContainer = (props: TSDataContainerProps) => {
439439
x.info.aggregation_period === item.info.aggregation_period &&
440440
x.info.climatological_model === item.info.climatological_model &&
441441
x.info.climatological_variable ===
442-
item.info.climatological_variable &&
442+
item.info.climatological_variable &&
443443
x.info.measure === item.info.measure &&
444444
x.info.scenario === item.info.scenario &&
445445
x.info.year_period === item.info.year_period &&
@@ -456,7 +456,7 @@ const TSDataContainer = (props: TSDataContainerProps) => {
456456
) {
457457
ret.push(
458458
realDataValues[item.name][i].value -
459-
realDataValues[lbitem[0].name][i].value,
459+
realDataValues[lbitem[0].name][i].value,
460460
);
461461
} else {
462462
ret.push(null);
@@ -551,7 +551,7 @@ const TSDataContainer = (props: TSDataContainerProps) => {
551551
(item.info.processing_method.indexOf(processingMethod) >= 0 &&
552552
(item.info.climatological_model === baseClimatologicalModel ||
553553
item.info.climatological_model ===
554-
comparisonClimatologicalModel)) ||
554+
comparisonClimatologicalModel)) ||
555555
('series_elaboration' in item.info &&
556556
item.info.processing_method.indexOf(sensorProcessingMehtod) >= 0)
557557
);
@@ -567,10 +567,10 @@ const TSDataContainer = (props: TSDataContainerProps) => {
567567
item.info.processing_method.indexOf(processingMethod) >= 0 &&
568568
(item.info.climatological_model === baseClimatologicalModel ||
569569
item.info.climatological_model ===
570-
comparisonClimatologicalModel)) ||
570+
comparisonClimatologicalModel)) ||
571571
(item.info.dataset_type === 'observation' &&
572572
item.info.processing_method.indexOf(sensorProcessingMehtod) >=
573-
0)
573+
0)
574574
);
575575
}),
576576
];
@@ -607,12 +607,12 @@ const TSDataContainer = (props: TSDataContainerProps) => {
607607
let opseriesObj = [
608608
uncert
609609
? pseriesObj.filter(
610-
x =>
611-
x.info.scenario === 'rcp26' &&
612-
x.info.climatological_model === baseClimatologicalModel &&
613-
x.info.processing_method === processingMethod &&
614-
x.info.dataset_type === 'forecast_lower_uncertainty',
615-
)[0]
610+
x =>
611+
x.info.scenario === 'rcp26' &&
612+
x.info.climatological_model === baseClimatologicalModel &&
613+
x.info.processing_method === processingMethod &&
614+
x.info.dataset_type === 'forecast_lower_uncertainty',
615+
)[0]
616616
: null,
617617
pseriesObj.filter(
618618
x =>
@@ -624,29 +624,29 @@ const TSDataContainer = (props: TSDataContainerProps) => {
624624
baseClimatologicalModel === comparisonClimatologicalModel
625625
? null
626626
: pseriesObj.filter(
627-
x =>
628-
x.info.scenario === 'rcp26' &&
629-
x.info.processing_method === processingMethod &&
630-
x.info.climatological_model === comparisonClimatologicalModel &&
631-
x.info.dataset_type === 'main',
632-
)[0],
627+
x =>
628+
x.info.scenario === 'rcp26' &&
629+
x.info.processing_method === processingMethod &&
630+
x.info.climatological_model === comparisonClimatologicalModel &&
631+
x.info.dataset_type === 'main',
632+
)[0],
633633
uncert
634634
? pseriesObj.filter(
635-
x =>
636-
x.info.scenario === 'rcp26' &&
637-
x.info.processing_method === processingMethod &&
638-
x.info.climatological_model === baseClimatologicalModel &&
639-
x.info.dataset_type === 'forecast_upper_uncertainty',
640-
)[0]
635+
x =>
636+
x.info.scenario === 'rcp26' &&
637+
x.info.processing_method === processingMethod &&
638+
x.info.climatological_model === baseClimatologicalModel &&
639+
x.info.dataset_type === 'forecast_upper_uncertainty',
640+
)[0]
641641
: null,
642642
uncert
643643
? pseriesObj.filter(
644-
x =>
645-
x.info.scenario === 'rcp45' &&
646-
x.info.climatological_model === baseClimatologicalModel &&
647-
x.info.processing_method === processingMethod &&
648-
x.info.dataset_type === 'forecast_lower_uncertainty',
649-
)[0]
644+
x =>
645+
x.info.scenario === 'rcp45' &&
646+
x.info.climatological_model === baseClimatologicalModel &&
647+
x.info.processing_method === processingMethod &&
648+
x.info.dataset_type === 'forecast_lower_uncertainty',
649+
)[0]
650650
: null,
651651
pseriesObj.filter(
652652
x =>
@@ -658,29 +658,29 @@ const TSDataContainer = (props: TSDataContainerProps) => {
658658
baseClimatologicalModel === comparisonClimatologicalModel
659659
? null
660660
: pseriesObj.filter(
661-
x =>
662-
x.info.scenario === 'rcp45' &&
663-
x.info.processing_method === processingMethod &&
664-
x.info.climatological_model === comparisonClimatologicalModel &&
665-
x.info.dataset_type === 'main',
666-
)[0],
661+
x =>
662+
x.info.scenario === 'rcp45' &&
663+
x.info.processing_method === processingMethod &&
664+
x.info.climatological_model === comparisonClimatologicalModel &&
665+
x.info.dataset_type === 'main',
666+
)[0],
667667
uncert
668668
? pseriesObj.filter(
669-
x =>
670-
x.info.scenario === 'rcp45' &&
671-
x.info.processing_method === processingMethod &&
672-
x.info.climatological_model === baseClimatologicalModel &&
673-
x.info.dataset_type === 'forecast_upper_uncertainty',
674-
)[0]
669+
x =>
670+
x.info.scenario === 'rcp45' &&
671+
x.info.processing_method === processingMethod &&
672+
x.info.climatological_model === baseClimatologicalModel &&
673+
x.info.dataset_type === 'forecast_upper_uncertainty',
674+
)[0]
675675
: null,
676676
uncert
677677
? pseriesObj.filter(
678-
x =>
679-
x.info.scenario === 'rcp85' &&
680-
x.info.processing_method === processingMethod &&
681-
x.info.climatological_model === baseClimatologicalModel &&
682-
x.info.dataset_type === 'forecast_lower_uncertainty',
683-
)[0]
678+
x =>
679+
x.info.scenario === 'rcp85' &&
680+
x.info.processing_method === processingMethod &&
681+
x.info.climatological_model === baseClimatologicalModel &&
682+
x.info.dataset_type === 'forecast_lower_uncertainty',
683+
)[0]
684684
: null,
685685
pseriesObj.filter(
686686
x =>
@@ -692,20 +692,20 @@ const TSDataContainer = (props: TSDataContainerProps) => {
692692
baseClimatologicalModel === comparisonClimatologicalModel
693693
? null
694694
: pseriesObj.filter(
695-
x =>
696-
x.info.scenario === 'rcp85' &&
697-
x.info.processing_method === processingMethod &&
698-
x.info.climatological_model === comparisonClimatologicalModel &&
699-
x.info.dataset_type === 'main',
700-
)[0],
695+
x =>
696+
x.info.scenario === 'rcp85' &&
697+
x.info.processing_method === processingMethod &&
698+
x.info.climatological_model === comparisonClimatologicalModel &&
699+
x.info.dataset_type === 'main',
700+
)[0],
701701
uncert
702702
? pseriesObj.filter(
703-
x =>
704-
x.info.scenario === 'rcp85' &&
705-
x.info.processing_method === processingMethod &&
706-
x.info.climatological_model === baseClimatologicalModel &&
707-
x.info.dataset_type === 'forecast_upper_uncertainty',
708-
)[0]
703+
x =>
704+
x.info.scenario === 'rcp85' &&
705+
x.info.processing_method === processingMethod &&
706+
x.info.climatological_model === baseClimatologicalModel &&
707+
x.info.dataset_type === 'forecast_upper_uncertainty',
708+
)[0]
709709
: null,
710710
pseriesObj.filter(
711711
x =>
@@ -758,24 +758,27 @@ const TSDataContainer = (props: TSDataContainerProps) => {
758758
? timeseries?.length === 0
759759
? ''
760760
: `
761-
${timeseries[0].translations.parameter_values.climatological_variable[
761+
${
762+
timeseries[0].translations.parameter_values.climatological_variable[
762763
i18n.language
763-
]
764-
}
764+
]
765+
}
765766
`
766767
: '';
767768

768769
const subText = timeseries
769770
? timeseries?.length === 0
770771
? ''
771772
: `
772-
${timeseries[0].translations.parameter_values.measure[i18n.language]} - ${timeseries[0].translations.parameter_values.year_period[i18n.language]
773-
} - ${t('app.map.timeSeriesDialog.from')} ${formatYear(
774-
localStartYear,
775-
)} ${t('app.map.timeSeriesDialog.to')} ${formatYear(localEndYear)} - ${place ? place + ' - ' : ''
776-
}${t('app.map.timeSeriesDialog.lat')} ${roundTo4(latLng.lat)} ${t(
777-
'app.map.timeSeriesDialog.lng',
778-
)} ${roundTo4(latLng.lng)} © ARPAV - Arpa FVG
773+
${timeseries[0].translations.parameter_values.measure[i18n.language]} - ${
774+
timeseries[0].translations.parameter_values.year_period[i18n.language]
775+
} - ${t('app.map.timeSeriesDialog.from')} ${formatYear(
776+
localStartYear,
777+
)} ${t('app.map.timeSeriesDialog.to')} ${formatYear(localEndYear)} - ${
778+
place ? place + ' - ' : ''
779+
}${t('app.map.timeSeriesDialog.lat')} ${roundTo4(latLng.lat)} ${t(
780+
'app.map.timeSeriesDialog.lng',
781+
)} ${roundTo4(latLng.lng)} © ARPAV - Arpa FVG
779782
Si tratta di proiezioni climatiche e non di previsioni a lungo termine. Il valore annuale ha validità in un contesto di trend trentennale.`
780783
: '';
781784

@@ -807,15 +810,17 @@ const TSDataContainer = (props: TSDataContainerProps) => {
807810
label: {
808811
show: true,
809812
formatter: v => {
810-
return `${t('app.map.timeSeriesDialog.xUnit')} ${v.value !== null ? roundTo4(v.value, 1).replace('.', ',') : '-'
811-
}`;
813+
return `${t('app.map.timeSeriesDialog.xUnit')} ${
814+
v.value !== null ? roundTo4(v.value, 1).replace('.', ',') : '-'
815+
}`;
812816
},
813817
},
814818
},
815819
valueFormatter: v =>
816-
`${v !== null ? roundTo4(v, 1).replace('.', ',') : '-'} ${i18n.language === 'en'
817-
? currentLayer?.unit_english
818-
: currentLayer?.unit_italian
820+
`${v !== null ? roundTo4(v, 1).replace('.', ',') : '-'} ${
821+
i18n.language === 'en'
822+
? currentLayer?.unit_english
823+
: currentLayer?.unit_italian
819824
}`,
820825

821826
formatter: p => {

0 commit comments

Comments
 (0)
⚡