Replace isMultiRun with hasMultiRuns

pacificclimate · Jun 3, 2024 · 0996b52 · 0996b52
1 parent dce958a
commit 0996b52
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/src/components/data-presentation/FilteredDatasetsSummary/FilteredDatasetsSummary.js b/src/components/data-presentation/FilteredDatasetsSummary/FilteredDatasetsSummary.js
@@ -5,7 +5,7 @@ import Accordion from "../../guidance-tools/Accordion";
 import { BootstrapTable, TableHeaderColumn } from "react-bootstrap-table";
 import { MEVSummary } from "../MEVSummary/MEVSummary";
 import { filteredDatasetSummaryPanelLabel } from "../../guidance-content/info/InformationItems";
-import { isMultiRun } from "../../map-controllers/map-helpers";
+import { hasMultiRuns } from "../../map-controllers/map-helpers";
 
 import _ from "lodash";
 import { HalfWidthCol } from "../../layout/rb-derived-components";
@@ -46,7 +46,7 @@ export default class FilteredDatasetsSummary extends React.Component {
     };
 
     const keyedData = this.props.meta.map(metaToKeyedData);
-    if (this.props.meta.length && !isMultiRun(this.props.meta)) {
+    if (this.props.meta.length && !hasMultiRuns(this.props.meta)) {
       // Remove run in cases where there is only one run
       keyedData.forEach((el) => (el.key = el.key.split(" ")[1]));
     }
@@ -56,7 +56,7 @@ export default class FilteredDatasetsSummary extends React.Component {
     if (
       keyedComparandData &&
       this.props.comparandMeta.length &&
-      !isMultiRun(this.props.comparandMeta)
+      !hasMultiRuns(this.props.comparandMeta)
     ) {
       keyedComparandData.forEach((el) => (el.key = el.key.split(" ")[1]));
     }

diff --git a/src/components/map-controllers/DualMapController/DualMapController.js b/src/components/map-controllers/DualMapController/DualMapController.js
@@ -44,7 +44,7 @@ import {
   updateLayerSimpleState,
   updateLayerTime,
   getDatasetIdentifiers,
-  isMultiRun,
+  hasMultiRuns,
 } from "../map-helpers.js";
 
 import styles from "../MapController.module.css";
@@ -70,7 +70,7 @@ export default class DualMapController extends React.Component {
       run: undefined,
       start_date: undefined,
       end_date: undefined,
-      multi_run: false,
+      has_multi_runs: false,
 
       raster: {
         variableId: undefined, // formerly 'variable'
@@ -130,7 +130,7 @@ export default class DualMapController extends React.Component {
     // (aside from variable_id) display the same dataspec.
 
     const { start_date, end_date, ensemble_member } = dataSpec;
-    const multi_run = isMultiRun(props.meta);
+    const has_multi_runs = hasMultiRuns(props.meta);
 
     const rasterScalarParams = scalarParams.bind(null, props.variable_id);
     const rasterParamsPromise = getTimeParametersPromise(dataSpec, props.meta)
@@ -176,7 +176,7 @@ export default class DualMapController extends React.Component {
         run: ensemble_member,
         start_date,
         end_date,
-        multi_run,
+        has_multi_runs,
         raster: rasterParams,
         isoline: isolineParams,
       }));

diff --git a/src/components/map-controllers/PrecipMapController/PrecipMapController.js b/src/components/map-controllers/PrecipMapController/PrecipMapController.js
@@ -45,7 +45,7 @@ import {
   scalarParams,
   selectRasterPalette,
   getTimeParametersPromise,
-  isMultiRun,
+  hasMultiRuns,
 } from "../map-helpers.js";
 
 import styles from "../MapController.module.css";
@@ -71,7 +71,7 @@ export default class PrecipMapController extends React.Component {
       run: undefined,
       start_date: undefined,
       end_date: undefined,
-      multi_run: false,
+      has_multi_runs: false,
 
       raster: {
         variableId: undefined, // formerly 'variable'
@@ -116,7 +116,7 @@ export default class PrecipMapController extends React.Component {
     // timestamp is determined at render time and passed to the viewer component.
 
     const { start_date, end_date, ensemble_member } = dataSpec;
-    const multi_run = isMultiRun(props.meta);
+    const has_multi_runs = hasMultiRuns(props.meta);
 
     const rasterScalarParams = scalarParams.bind(null, props.variable_id);
     const rasterParamsPromise = getTimeParametersPromise(dataSpec, props.meta)
@@ -150,7 +150,7 @@ export default class PrecipMapController extends React.Component {
           run: ensemble_member,
           start_date,
           end_date,
-          multi_run,
+          has_multi_runs,
           raster: rasterParams,
           annotated: annotatedParams,
         }));

diff --git a/src/components/map-controllers/SingleMapController/SingleMapController.js b/src/components/map-controllers/SingleMapController/SingleMapController.js
@@ -45,7 +45,7 @@ import {
   getTimeParametersPromise,
   scalarParams,
   getDatasetIdentifiers,
-  isMultiRun,
+  hasMultiRuns,
 } from "../map-helpers.js";
 
 import styles from "../MapController.module.css";
@@ -74,7 +74,7 @@ export default class SingleMapController extends React.Component {
       run: undefined,
       start_date: undefined,
       end_date: undefined,
-      multi_run: false,
+      has_multi_runs: false,
 
       raster: {
         variableId: undefined, // formerly 'variable'
@@ -104,7 +104,7 @@ export default class SingleMapController extends React.Component {
     // is passed to the viewer component.
 
     const { start_date, end_date, ensemble_member } = dataSpec;
-    const multi_run = isMultiRun(props.meta);
+    const has_multi_runs = hasMultiRuns(props.meta);
 
     const rasterScalarParams = scalarParams.bind(null, props.variable_id);
     const rasterParamsPromise = getTimeParametersPromise(dataSpec, props.meta)
@@ -123,7 +123,7 @@ export default class SingleMapController extends React.Component {
         run: ensemble_member,
         start_date,
         end_date,
-        multi_run,
+        has_multi_runs,
         raster: params,
       }));
     });

diff --git a/src/components/map-controllers/map-helpers.js b/src/components/map-controllers/map-helpers.js
@@ -176,16 +176,16 @@ export function selectIsolinePalette(params) {
  **************************************************************************/
 
 // TODO: https://github.com/pacificclimate/climate-explorer-frontend/issues/118
-export function currentDataSpec({ run, start_date, end_date, multi_run }) {
+export function currentDataSpec({ run, start_date, end_date, has_multi_runs }) {
   // Return encoding of currently selected dataspec.
   // If the model that this dataspec comes from only has one run, then only the start_date-end_date
   // portion is displayed in labels
-  return multi_run
+  return has_multi_runs
     ? `${run} ${start_date}-${end_date}`
     : `${start_date}-${end_date}`;
 }
 
-export function isMultiRun(meta) {
+export function hasMultiRuns(meta) {
   // Check if there are multiple runs making up the datasets for the given model (e.g. CMIP5 MIROC5 has r1i1p1 and r3i1p1).
   let ids = meta.map(
     (el) => `${el.ensemble_member} ${el.start_date}-${el.end_date}`,
@@ -194,6 +194,7 @@ export function isMultiRun(meta) {
     _.sortBy(ids, (item) => item),
     (item) => item,
   );
+  // Check if first run is the same as last run
   return ids[0].split(" ")[0] != ids[ids.length - 1].split(" ")[0];
 }