updates

Author: sirmmo

src/app/Services/API/Requests/index.ts

@@ -125,7 +125,18 @@ export class RequestApi extends Http {
       let labels = Object.fromEntries(labelsf.flat());
       labels['thirty_year'] = labels['30yr'];
       if (language === 'it') {
-        labels['historical'][1] = 'Dati storici';
+        if (!labels['historical']) {
+          labels['historical'] = ['archive', 'Dati storici'];
+        } else {
+          labels['historical'][1] = 'Dati storici';
+        }
+
+        if (!labels['forecast']) {
+          labels['forecast'] = ['archive', 'Dati predittivi'];
+        } else {
+          labels['forecast'][1] = 'Dati predittivi';
+        }
+
         //labels['forecast'][1] = 'Predizioni';
       }
       const innerConf = {

src/app/components/DownloadDataDialog/index.tsx

@@ -238,7 +238,7 @@ const DownloadDataDialog = (props: DownloadDataDialogProps) => {
             <Grid xs={1}></Grid>
             <Grid xs={26}>
               <Typography variant={'h6'} sx={TitleDownloadStyle}>
-                Estrazioni scaricabili
+                {t('app.map.downloadDataDialog.downloadLinks')}
               </Typography>
             </Grid>
             <Grid xs={1} sx={CloseIconContStyle}>

src/app/components/Map/TWLSample.tsx

@@ -32,6 +32,7 @@ export const TWLSample = (props: any) => {
   const mode = props.mode;
   const data = props.data;
   const currentMap = props.currentMap;
+  const [isSh, setIsSh] = useState(false);
 
   const [tLayer, setTLayer] = useState<any>();
   const getMethods = obj =>
@@ -45,6 +46,7 @@ export const TWLSample = (props: any) => {
       url.searchParams.has('op') &&
       url.searchParams.get('op') === 'screenshot'
     ) {
+      setIsSh(true);
       if (url.searchParams.has('year')) {
         const y = url.searchParams.get('year');
         if (y) {
@@ -58,10 +60,13 @@ export const TWLSample = (props: any) => {
 
   const setCurrYear = yr => {
     setCurrentYear(yr);
+    //@ts-ignore
+    context.map.timeDimension.setCurrentTime(yr);
   };
 
   useEffect(() => {
     if (lyr && show) {
+      const map = context.map;
       const url = new URL(window.location.href);
       if (
         url.searchParams.has('op') &&
@@ -77,13 +82,12 @@ export const TWLSample = (props: any) => {
         }
       }
 
-      const map = context.map;
       // @ts-ignore
       map.timeDimension.on('timeloading', data => {
         const url = new URL(window.location.href);
         if (
           url.searchParams.has('op') &&
-          url.searchParams.get('op') !== 'screenshot'
+          url.searchParams.get('op') === 'screenshot'
         ) {
         } else {
           let dt = new Date(+data.time).getFullYear();
@@ -236,7 +240,7 @@ export const TWLSample = (props: any) => {
             cacheForward: 0,
           });
 
-          if (currentMap === 'annual') {
+          if (currentMap === 'annual' && !isSh) {
             setLayer(tdWmsLayer2);
             setTimeout(() => {
               try {
@@ -297,6 +301,7 @@ export const TWLSample = (props: any) => {
     show,
     style,
     currentMap,
+    isSh,
   ]);
 
   return null;

src/locales/en/translation.json

@@ -24,6 +24,7 @@
   "app.index.header.disclaimer": "These are climate projections, not long-term forecasts. \nThe annual value is valid only in a \nthirty-year trend context.",
   "app.index.observations": "Observations",
   "app.map.downloadDataDialog.DLNetCDF": "Search NetCDF",
+  "app.map.downloadDataDialog.downloadLinks": "Downloadable Extractions",
   "app.map.downloadDataDialog.map.east": "East",
   "app.map.downloadDataDialog.map.north": "North",
   "app.map.downloadDataDialog.map.south": "South",

src/locales/it/translation.json

@@ -24,6 +24,7 @@
   "app.index.header.disclaimer": "Si tratta di proiezioni climatiche e non di previsioni \na lungo termine. Il valore annuale ha validità in un \ncontesto di trend trentennale.",
   "app.index.observations": "Osservazoni",
   "app.map.downloadDataDialog.DLNetCDF": "Cerca NetCDF",
+  "app.map.downloadDataDialog.downloadLinks": "Estrazioni Scaricabili",
   "app.map.downloadDataDialog.map.east": "Est",
   "app.map.downloadDataDialog.map.north": "Nord",
   "app.map.downloadDataDialog.map.south": "Sud",