Merge pull request #36 from CUAHSI/develop

Compact=False for geojson from HydroCron
CUAHSI · Jun 24, 2024 · aa1387b · aa1387b
2 parents 20dccad + 32a417c
commit aa1387b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/frontend/src/_helpers/hydroCron.js b/frontend/src/_helpers/hydroCron.js
@@ -62,7 +62,7 @@ const queryHydroCron = async (swordFeature = null, output = 'geojson') => {
     output: output,
     fields: fields,
     // https://podaac.github.io/hydrocron/timeseries.html#compact-string-required-no
-    compact: 'true'
+    compact: 'false'
   }
   let response = await fetchHydroCronData(HYDROCRON_URL, params, swordFeature)
   if (response == null) {

diff --git a/frontend/src/stores/charts.js b/frontend/src/stores/charts.js
@@ -36,8 +36,8 @@ export const useChartsStore = defineStore('charts', () => {
 
   const getNodeLabels = (nodes) => {
     const labels = nodes.map((node) => {
-      // TODO:nodes this will only grab the first node dist value -- there is variation among the hits
-      return node.queries[0].results.geojson.features[0].properties.node_dist
+      // TODO:nodes this will only grab the first p_dist_out value -- there is variation among the hits
+      return node.queries[0].results.geojson.features[0].properties.p_dist_out
     })
     return labels.filter((l) => l != undefined)
   }
@@ -153,8 +153,6 @@ export const useChartsStore = defineStore('charts', () => {
   const getNodeChartDatasets = (nodes) => {
     const featureStore = useFeaturesStore()
     console.log('getting node chart datasets for nodes', nodes)
-    // TODO:nodes I was expecting that the node_dist would be constant across timestamps but it isn't
-    // https://www.chartjs.org/docs/latest/general/data-structures.html#parsing
     let measurements = nodes.map((node) => {
       console.log('Parsing node', node)
       return node.queries[0].results.geojson.features.map((feature) => {
@@ -169,7 +167,7 @@ export const useChartsStore = defineStore('charts', () => {
       label: `${featureStore.getFeatureName(nodes[0])} | ${nodes[0]?.properties?.reach_id}`,
       data: measurements,
       parsing: {
-        xAxisKey: 'node_dist',
+        xAxisKey: 'p_dist_out',
         yAxisKey: 'wse'
       },
       ...getDataSetStyle(measurements)

diff --git a/frontend/src/stores/hydrologic.js b/frontend/src/stores/hydrologic.js
@@ -57,11 +57,11 @@ export const useHydrologicStore = defineStore('hydrologic', () => {
       unit: 'm^2',
       definition:
         'Total estimated water surface area, including area_detct and any dark water that was not detected as water in the SWOT observation but identified through the use of a prior water probability map.',
-      default: false,
+      default: true,
       always: false,
-      selectable: false,
+      selectable: true,
       fileType: 'all',
-      plottable: false,
+      plottable: true,
     },
     {
       abbreviation: 'd_x_area',
@@ -123,10 +123,21 @@ export const useHydrologicStore = defineStore('hydrologic', () => {
     },
     {
       abbreviation: 'node_dist',
-      name: 'Node Distance',
+      name: 'Node Delta',
       unit: 'm',
       definition: 'Mean distance between observed and prior river database node locations.',
       default: false,
+      always: false,
+      selectable: false,
+      fileType: 'node',
+      plottable: true,
+    },
+    {
+      abbreviation: 'p_dist_out',
+      name: 'Distance to Outlet',
+      unit: 'm',
+      definition: 'Along-stream distance from the reach center to the outlet, from the PRD.',
+      default: false,
       always: true,
       selectable: false,
       fileType: 'node',