Merge dev into master (#335)

* Feature/2001 - T07: Fix time slider, time resolution Co-authored-by: Robert Schlick <[email protected]> Co-authored-by: Robert <[email protected]>
inowas · Nov 24, 2020 · cd8d465 · cd8d465
1 parent 6c11e4f
commit cd8d465
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 41 deletions.
diff --git a/src/core/model/genericObject/GenericObject.ts b/src/core/model/genericObject/GenericObject.ts
@@ -17,6 +17,7 @@ export class GenericObject<T> {
     }
 
     public getClone() {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         return new this.constructor(cloneDeep(this._props));
     }

diff --git a/src/core/model/rtm/SensorDataHelper.ts b/src/core/model/rtm/SensorDataHelper.ts
@@ -1,7 +1,7 @@
-import moment from 'moment';
 import {IPrometheusResponseData, ISensorData, IServerSensorData} from './Sensor.type';
+import moment from 'moment';
 
-export async function retrieveData(sensorData: ISensorData, caching: boolean = false) {
+export async function retrieveData(sensorData: ISensorData, caching = false) {
     const url = new URL(`${sensorData.url}`);
 
     const localStorageObj = sessionStorage.getItem(url.toString());
@@ -32,10 +32,10 @@ export async function retrieveData(sensorData: ISensorData, caching: boolean = f
             };
         });
 
-        let TTL = moment.utc().unix() + 10 * 60; // 10 minutes
+        let TTL = moment.utc().unix() + (10 * 60); // 10 minutes
 
         if (caching) {
-            TTL = moment.utc().unix() + 60 * 60 * 24; // 24 hours
+            TTL = moment.utc().unix() + (60 * 60 * 24); // 24 hours
         }
 
         sessionStorage.setItem(url.toString(), JSON.stringify({data, TTL}));

diff --git a/src/core/model/rtm/SensorDataSource.ts b/src/core/model/rtm/SensorDataSource.ts
@@ -1,8 +1,8 @@
-import {cloneDeep} from 'lodash';
-import uuid from 'uuid';
 import {GenericObject} from '../genericObject/GenericObject';
 import {IDateTimeValue, ISensorDataSource} from './Sensor.type';
+import {cloneDeep} from 'lodash';
 import {getUrlPathRegex, pathIsValid, retrieveData} from './SensorDataHelper';
+import uuid from 'uuid';
 
 class SensorDataSource extends GenericObject<ISensorDataSource> {
 
@@ -95,7 +95,7 @@ class SensorDataSource extends GenericObject<ISensorDataSource> {
     }
 
     get timeResolution(): string | null {
-        return this.urlSearchParams.get(`timeResolution`);
+        return this.urlSearchParams.get('timeResolution');
     }
 
     set timeResolution(value: string | null) {
@@ -180,6 +180,96 @@ class SensorDataSource extends GenericObject<ISensorDataSource> {
         this.url = url;
     }
 
+    get gt(): number | null {
+        const gt = this.urlSearchParams.get('gt');
+        if (gt === null) {
+            return null;
+        }
+
+        return parseFloat(gt);
+    }
+
+    set gt(value: number | null) {
+        const url = this.url;
+        url.searchParams.delete('gt');
+        if (value !== null) {
+            url.searchParams.append('gt', value.toString());
+        }
+        this.url = url;
+    }
+
+    get gte(): number | null {
+        const gte = this.urlSearchParams.get('gte');
+        if (gte === null) {
+            return null;
+        }
+
+        return parseFloat(gte);
+    }
+
+    set gte(value: number | null) {
+        const url = this.url;
+        url.searchParams.delete('gte');
+        if (value !== null) {
+            url.searchParams.append('gte', value.toString());
+        }
+        this.url = url;
+    }
+
+    get lt(): number | null {
+        const lt = this.urlSearchParams.get('lt');
+        if (lt === null) {
+            return null;
+        }
+
+        return parseFloat(lt);
+    }
+
+    set lt(value: number | null) {
+        const url = this.url;
+        url.searchParams.delete('lt');
+        if (value !== null) {
+            url.searchParams.append('lt', value.toString());
+        }
+        this.url = url;
+    }
+
+    get lte(): number | null {
+        const lte = this.urlSearchParams.get('lte');
+        if (lte === null) {
+            return null;
+        }
+
+        return parseFloat(lte);
+    }
+
+    set lte(value: number | null) {
+        const url = this.url;
+        url.searchParams.delete('lte');
+        if (value !== null) {
+            url.searchParams.append('lte', value.toString());
+        }
+        this.url = url;
+    }
+
+    get excl(): number | null {
+        const excl = this.urlSearchParams.get('excl');
+        if (excl === null) {
+            return null;
+        }
+
+        return parseFloat(excl);
+    }
+
+    set excl(value: number | null) {
+        const url = this.url;
+        url.searchParams.delete('excl');
+        if (value !== null) {
+            url.searchParams.append('excl', value.toString());
+        }
+        this.url = url;
+    }
+
     get isIdempotent() {
         return this.end !== null;
     }

diff --git a/src/scenes/shared/complexTools/ResultsSelectorFlow.tsx b/src/scenes/shared/complexTools/ResultsSelectorFlow.tsx
@@ -140,7 +140,7 @@ const ResultsSelectorFlow = (props: IProps) => {
                     <Segment color={'grey'}>
                         <Header textAlign={'center'} as={'h4'}>Select total time [days]</Header>
                         <SliderWithTooltip
-                            dots={props.totalTimes.length < 20}
+                            dots={false}
                             dotStyle={styles.dot}
                             trackStyle={styles.track}
                             defaultValue={props.totalTimes[props.data.totim]}

diff --git a/src/scenes/t07/components/CrossSection.tsx b/src/scenes/t07/components/CrossSection.tsx
@@ -8,13 +8,12 @@ import {ICalculation} from '../../../core/model/modflow/Calculation.type';
 import {IModflowModel} from '../../../core/model/modflow/ModflowModel.type';
 import {ScenarioAnalysis} from '../../../core/model/scenarioAnalysis';
 import {Viewport} from 'react-leaflet';
-import {chunk, compact, flatten} from 'lodash';
 import {fetchCalculationResultsFlow} from '../../../services/api';
 import React, {useEffect, useState} from 'react';
 import ResultsChart from '../../shared/complexTools/ResultsChart';
 import ResultsMap from '../../shared/complexTools/ResultsMap';
 import ResultsSelectorFlow from '../../shared/complexTools/ResultsSelectorFlow';
-import _ from 'lodash';
+import _, {chunk, compact, flatten} from 'lodash';
 
 interface IProps {
     basemodel: ModflowModel;
@@ -54,11 +53,12 @@ const CrossSection = (props: IProps) => {
         setSelectedCol(Math.floor(basemodel.gridSize.nX / 2));
         setSelectedRow(Math.floor(basemodel.gridSize.nY / 2));
         setSelectedModels(cSelectedModels as IModflowModel[]);
+        setLayerValues(basemodelCalculation.layer_values);
         if (basemodelCalculation.times) {
-            setSelectedTotim(basemodelCalculation.times.total_times[0]);
-            setTotalTimes(basemodelCalculation.times.total_times);
+            const times = selectedType === EResultType.HEAD ? basemodelCalculation.times.head : basemodelCalculation.times.drawdown;
+            setSelectedTotim(times.idx.slice(-1)[0]);
+            setTotalTimes(times.total_times);
         }
-        setLayerValues(basemodelCalculation.layer_values);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
@@ -111,12 +111,10 @@ const CrossSection = (props: IProps) => {
             return setData(result);
         }
 
-        const t = totalTimes.indexOf(totim);
-
         fetchCalculationResultsFlow({
             calculationId: m.calculation_id,
             type,
-            totim: t >= 0 ? t : 0,
+            totim,
             layer
         }, (d) => {
             result[m.id] = d;

diff --git a/src/scenes/t07/components/Difference.tsx b/src/scenes/t07/components/Difference.tsx
@@ -77,7 +77,7 @@ const Difference = (props: IProps) => {
             return null;
         }
 
-        const modelToFetch = selectedModels.filter((m) => !results.hasOwnProperty(m.id));
+        const modelToFetch = selectedModels.filter((m) => !(m.id in results));
         if (modelToFetch.length === 0) {
             setIsLoading(false);
             return setData(results);
@@ -147,16 +147,16 @@ const Difference = (props: IProps) => {
         const stressperiods = basemodel.discretization.stressperiods;
         const soilmodel = props.soilmodels[basemodel.id];
 
-        if (!basemodelResults) {
+        if (!basemodelResults || !basemodelResults.times) {
             return (
                 <div>Results not found.</div>
             );
         }
 
         const layerValues = basemodelResults.layer_values;
-        const totalTimes = basemodelResults.times ? basemodelResults.times.total_times : null;
+        const times = selectedType === EResultType.HEAD ? basemodelResults.times.head : basemodelResults.times.drawdown;
 
-        if (!stressperiods || !soilmodel || selectedLay === null || selectedTotim === null || !totalTimes) {
+        if (!stressperiods || !soilmodel || selectedLay === null || selectedTotim === null || !times) {
             return (
                 <div>Data not found.</div>
             );
@@ -174,7 +174,7 @@ const Difference = (props: IProps) => {
                     layerValues={layerValues}
                     soilmodel={Soilmodel.fromObject(soilmodel)}
                     stressperiods={Stressperiods.fromObject(stressperiods)}
-                    totalTimes={totalTimes}
+                    totalTimes={times.total_times}
                 />
             </Segment>
         );