Merge pull request #200 from CUAHSI/CAM-876/version-d-hydrocron-simple

[CAM-876] Version D data

Author: devincowan

api/swotvis/app/routers/hydrocron/router.py

@@ -47,6 +47,9 @@ async def proxy_hydrocron_timeseries(
 
     try:
         async with httpx.AsyncClient() as client:
+            print(
+                f"Original request url with params: {client.build_request('GET', HYDROCRON_BASE_URL, params=params).url}"
+            )
             response = await client.get(HYDROCRON_BASE_URL, params=params, timeout=30.0)
 
             # If the response is successful, return the content
@@ -57,7 +60,15 @@ async def proxy_hydrocron_timeseries(
                     return JSONResponse(content=response.json())
             else:
                 # Forward the error from the external API
-                raise HTTPException(status_code=response.status_code, detail=f"HydroCron API error: {response.text}")
+                # check if response has json content
+                if response.headers.get("Content-Type") == "application/json":
+                    error_detail = response.json()
+                else:
+                    error_detail = response.text
+                # ensure we include statusText as well
+                if "statusText" in response.headers:
+                    error_detail += f": {response.headers['statusText']}"
+                return JSONResponse(content=error_detail, status_code=response.status_code)
 
     except httpx.TimeoutException:
         raise HTTPException(status_code=504, detail="Request timeout")

frontend/docker-entrypoint.sh

@@ -7,7 +7,6 @@ for file in $DIST_DIR/assets/*.js $DIST_DIR/index.html; do
     sed -i 's|VITE_APP_API_URL_PLACEHOLDER|'${VITE_APP_API_URL}'|g' $file
     sed -i 's|VITE_APP_FULL_URL_PLACEHOLDER|'${VITE_APP_FULL_URL}'|g' $file
     sed -i 's|VITE_APP_BASE_PLACEHOLDER|'${VITE_APP_BASE}'|g' $file
-    sed -i 's|VITE_HYDROCRON_URL_PLACEHOLDER|'${VITE_HYDROCRON_URL}'|g' $file
     sed -i 's|VITE_HYDROSHARE_NOTEBOOKS_COLLECTION_PLACEHOLDER|'${VITE_HYDROSHARE_NOTEBOOKS_COLLECTION}'|g' $file
 done
 

frontend/src/App.vue

@@ -2,7 +2,6 @@
   <v-app>
     <v-main>
       <TheAppBar :paths="paths" @toggle-mobile-nav="toggleMobileNav" />
-      <AlertPopup v-bind="alertStore.displayed" />
       <TheMobileNavDrawer
         :show="showMobileNavigation"
         :paths="paths"
@@ -17,6 +16,7 @@
         href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
         rel="stylesheet"
       />
+      <AlertPopup v-bind="alertStore.displayed" />
       <TheFooter />
     </v-main>
   </v-app>

frontend/src/_helpers/hydroCron.js

@@ -1,4 +1,4 @@
-import { HYDROCRON_URL } from '@/constants'
+import { ENDPOINTS } from '@/constants'
 import { useFeaturesStore } from '@/stores/features'
 import { useAlertStore } from '@/stores/alerts'
 import { useHydrologicStore } from '@/stores/hydrologic'
@@ -87,6 +87,12 @@ const queryHydroCron = async (swordFeature = null, output = 'geojson') => {
   const start_time = EARLIEST_HYDROCRON_DATETIME
   const end_time = new Date(Date.now() + MS_TO_KEEP_CACHE).toISOString().split('.')[0] + 'Z'
 
+  // determine which collection name to use based on feature type ('Reach' or 'PriorLake')
+  let collection_name = 'SWOT_L2_HR_RiverSP_D'
+  if (feature_type === 'PriorLake') {
+    collection_name = 'SWOT_L2_HR_LakeSP_D'
+  }
+
   params = {
     feature: feature_type,
     feature_id,
@@ -95,9 +101,15 @@ const queryHydroCron = async (swordFeature = null, output = 'geojson') => {
     output,
     fields,
     // https://podaac.github.io/hydrocron/timeseries.html#compact-string-required-no
-    compact: 'true'
+    compact: 'true',
+    // https://podaac.github.io/hydrocron/timeseries.html#collection-name-string-required-no
+    collection_name
   }
-  let response = await fetchHydroCronData(HYDROCRON_URL, params, swordFeature)
+
+  // Use our API proxy URL instead of the direct HydroCron URL
+  // This is due to CORS issues with the HydroCron server
+  // https://github.com/podaac/hydrocron/issues/306
+  let response = await fetchHydroCronData(ENDPOINTS.hydrocron, params, swordFeature)
   if (response == null) {
     return
   }
@@ -134,19 +146,31 @@ const fetchHydroCronData = async (url, params, swordFeature) => {
       })
       if (response.status < 500) {
         if (response.status == 400) {
+          let text = 'No data found for: '
+          if (params.feature && params.feature_id) {
+            text += `${params.feature} ${params.feature_id}`
+          } else {
+            text += JSON.stringify(params)
+          }
           alertStore.displayAlert({
             title: 'No data found',
-            text: `No data found for ${JSON.stringify(params)}`,
+            text,
             type: 'warning',
             closable: true,
             duration: 6
           })
           return null
         }
       } else {
+        let text = 'Error while fetching SWOT data: '
+        if (response.statusText) {
+          text += response.statusText
+        } else {
+          text += 'Unknown error'
+        }
         alertStore.displayAlert({
           title: 'Error fetching SWOT data',
-          text: `Error while fetching SWOT data: ${response.statusText}`,
+          text,
           type: 'error',
           closable: true,
           duration: 3

frontend/src/components/TheLeafletMap.vue

@@ -140,7 +140,7 @@ onMounted(async () => {
 
   // add reaches layer to map
   url =
-    'https://arcgis.cuahsi.org/arcgis/services/SWOT/world_SWORD_reaches_mercator/MapServer/WMSServer?'
+    'https://arcgis.cuahsi.org/arcgis/services/SWOT/world_SWORD_reaches_mercator_v17b/MapServer/WMSServer?'
   const reachesWMS = L.tileLayer.wms(url, {
     layers: 0,
     transparent: 'true',
@@ -153,7 +153,7 @@ onMounted(async () => {
 
   // add nodes layer to map
   url =
-    'https://arcgis.cuahsi.org/arcgis/services/SWOT/world_SWORD_nodes_mercator/MapServer/WMSServer?'
+    'https://arcgis.cuahsi.org/arcgis/services/SWOT/world_SWORD_nodes_mercator_v17b/MapServer/WMSServer?'
   L.tileLayer.wms(url, {
     layers: 0,
     transparent: 'true',

frontend/src/constants.js

@@ -4,12 +4,12 @@ let APP_FULL_URL_IN = import.meta.env.VITE_APP_FULL_URL || 'VITE_APP_FULL_URL_PL
 export const APP_FULL_URL = APP_FULL_URL_IN.endsWith('/') ? APP_FULL_URL_IN : `${APP_FULL_URL_IN}/`
 
 export const APP_API_URL = import.meta.env.VITE_APP_API_URL || 'VITE_APP_API_URL_PLACEHOLDER'
-export const HYDROCRON_URL = import.meta.env.VITE_HYDROCRON_URL || 'VITE_HYDROCRON_URL_PLACEHOLDER'
 export const VITE_HYDROSHARE_NOTEBOOKS_COLLECTION =
   import.meta.env.VITE_HYDROSHARE_NOTEBOOKS_COLLECTION ||
   'VITE_HYDROSHARE_NOTEBOOKS_COLLECTION_PLACEHOLDER'
 export const ENDPOINTS = {
-  openapi: `${APP_API_URL}/openapi.json`
+  openapi: `${APP_API_URL}/openapi.json`,
+  hydrocron: `${APP_API_URL}/hydrocron/timeseries`
 }
 
 export const NODE_DATETIME_VARIATION = 1 // minutes