initial globalTime config

Author: BryonLewis

client/src/MapStore.ts

@@ -17,6 +17,7 @@ import {
   VectorMapLayer,
 } from './types';
 import UVdatApi from './api/UVDATApi';
+import { visibleNetCDFLayers } from './map/mapNetCDFLayer';
 
 export const VECTOR_PMTILES_URL = '/public/vectortiles/us.pmtiles';
 
@@ -34,6 +35,8 @@ export default class MapStore {
 
   public static proModeButtonEnabled = ref(true);
 
+  public static globalTime = ref(new Date());
+
   public static displayConfiguration: Ref<DisplayConfiguration> = ref(
     { default_displayed_layers: [], enabled_ui: ['Collections', 'Datasets', 'Metadata'], default_tab: 'Scenarios' },
   );
@@ -353,4 +356,38 @@ export default class MapStore {
       }
     }
   };
+
+  // Graph Charts current Min/Max Values in unix_time
+  public static graphChartsMinMax = ref({
+    min: 0,
+    max: 0,
+  });
+
+  public static updateChartsMinMax = (min: number, max: number) => {
+    MapStore.graphChartsMinMax.value.min = min;
+    MapStore.graphChartsMinMax.value.max = max;
+  };
+
+  // Computes in Unix Time
+  public static globalTimeRange = computed(() => {
+    let globalMin = Infinity;
+    let globalMax = -Infinity;
+    MapStore.visibleMapLayers.value.forEach((visibleMapLayer) => {
+      const [type, layerId] = visibleMapLayer.split('_');
+      const foundLayer = MapStore.selectedMapLayers.value.find((layer) => layer.id === parseInt(layerId, 10) && layer.type === type);
+      if (type === 'netcdf' && foundLayer !== undefined) {
+        const netCDFLayer = visibleNetCDFLayers.value.find((item) => item.netCDFLayer === foundLayer.id);
+        if (netCDFLayer && netCDFLayer.sliding) {
+          const { min, max } = netCDFLayer.sliding;
+          globalMin = Math.min(globalMin, min);
+          globalMax = Math.max(globalMax, max);
+        }
+      }
+    });
+    if (MapStore.mapLayerFeatureGraphsVisible.value && MapStore.mapLayerFeatureGraphs.value.length) {
+      globalMin = Math.min(globalMin, MapStore.graphChartsMinMax.value.min);
+      globalMax = Math.max(globalMax, MapStore.graphChartsMinMax.value.max);
+    }
+    return { min: globalMin, max: globalMax };
+  });
 }

client/src/components/FeatureSelection/VectorFeatureChart.vue

@@ -66,7 +66,6 @@ export default defineComponent({
           confidenceLevel.value,
           false,
           movingAverageValue.value,
-
         );
         if (data.graphs && Object.keys(data.graphs).length === 0) {
           noGraphData.value = true;

client/src/components/TabularData/MapLayerTableGraph.vue

@@ -114,7 +114,15 @@ export default defineComponent({
           movingAverageValue.value,
         );
         graphData.value = data;
-
+        let minGraph = Infinity;
+        let maxGraph = -Infinity;
+        Object.keys(data.graphs).forEach((key) => {
+          const index = parseInt(key, 10);
+          const [min, max] = data.graphs[index].xAxisRange;
+          minGraph = Math.min(minGraph, min);
+          maxGraph = Math.max(maxGraph, max);
+        });
+        MapStore.updateChartsMinMax(minGraph, maxGraph);
         if (graphContainer.value) {
           const colorMapping = renderVectorFeatureGraph(
             data,

client/src/types.ts

@@ -802,6 +802,8 @@ export interface FeatureGraphData {
     trendLine?:[number, number][];
     confidenceIntervals?:[number, number, number][];
     movingAverage?:[number, number][];
+    xAxisRange:[number, number];
+    yAxisRange:[number, number];
   }>
 }
 

uvdat/core/rest/vector_feature_table_data.py

@@ -172,6 +172,8 @@ def get_graphs(
 
         table_data = {'tableName': tables.first().name, 'graphs': {}}
         all_x_vals = {}
+        all_x_list = []  # <<< Added
+        all_y_list = []  # <<< Added
 
         for table in tables:
             if y_axis not in table.columns or x_axis not in table.columns:
@@ -205,6 +207,10 @@ def get_graphs(
             x_vals = sorted_x_vals
             y_vals = [np.mean(data[x]) for x in sorted_x_vals]
 
+            # Add x and y values to global list for min/max later
+            all_x_list.extend(x_vals)
+            all_y_list.extend(y_vals)
+
             for x, y in zip(x_vals, y_vals):
                 if x not in all_x_vals:
                     all_x_vals[x] = []
@@ -251,6 +257,9 @@ def get_graphs(
             avg_y_vals = [np.mean(all_x_vals[x]) for x in sorted_x_vals]
             aggregate_result = {'indexer': 'all', 'vectorFeatureId': 'all'}
 
+            all_x_list.extend(sorted_x_vals)
+            all_y_list.extend(avg_y_vals)
+
             if 'data' in data_types:
                 aggregate_result['data'] = list(zip(sorted_x_vals, avg_y_vals))
 
@@ -280,6 +289,10 @@ def get_graphs(
 
             table_data['graphs'][-1] = aggregate_result
 
+        if all_x_list and all_y_list:
+            table_data['xAxisRange'] = [min(all_x_list), max(all_x_list)]
+            table_data['yAxisRange'] = [min(all_y_list), max(all_y_list)]
+
         return table_data
 
     @action(detail=False, methods=['get'], url_path='feature-graph')