From 66fe5b4be10f42e5d58d5ce3838dd942a1371847 Mon Sep 17 00:00:00 2001 From: Zwart Date: Mon, 4 Mar 2024 16:39:07 -0800 Subject: [PATCH 1/2] update metadata --- dashboard/targets.qmd | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dashboard/targets.qmd b/dashboard/targets.qmd index 7e729c6395..b14395db83 100644 --- a/dashboard/targets.qmd +++ b/dashboard/targets.qmd @@ -11,9 +11,7 @@ aquatics_focal_sites <- c("USGS-05553700", "USGS-01463500") ``` ```{r message=FALSE, echo = FALSE} -# TODO: need to update this -googlesheets4::gs4_deauth() -target_metadata <- googlesheets4::read_sheet("https://docs.google.com/spreadsheets/d/10YTX9ae_C1rFdLgEDkUcCRCpUkVYv06leY01BtD1BgM/edit?usp=sharing") +target_metadata <- readr::read_csv("https://raw.githubusercontent.com/eco4cast/usgsrc4cast-ci/prod/targets/in/controlled_vocab_targets.csv") ``` ```{r echo = FALSE} @@ -65,10 +63,9 @@ The aquatics theme challenges you to forecast daily mean water quality variables url <- "https://sdsc.osn.xsede.org/bio230014-bucket01/challenges/targets/project_id=usgsrc4cast/duration=P1D/river-chl-targets.csv.gz" read_csv(url, show_col_types = FALSE) |> distinct(variable, duration) |> - # TODO: need to fix target_metadata - # left_join(target_metadata, by = c("variable","duration")) |> + left_join(target_metadata, by = c("variable","duration")) |> filter(variable %in% c("chla")) |> - # select(-class) |> + select(-class) |> knitr::kable() ``` From 045700489f54d6e270ed7069b6e35aea22a3f935 Mon Sep 17 00:00:00 2001 From: Zwart Date: Mon, 4 Mar 2024 16:48:34 -0800 Subject: [PATCH 2/2] fix bug in noaa parquet theme --- catalog/noaa_forecasts/noaa_forecasts.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog/noaa_forecasts/noaa_forecasts.R b/catalog/noaa_forecasts/noaa_forecasts.R index 6fbdeab7f3..e80cef999c 100644 --- a/catalog/noaa_forecasts/noaa_forecasts.R +++ b/catalog/noaa_forecasts/noaa_forecasts.R @@ -26,7 +26,9 @@ noaa_description_create <- data.frame(site_id = 'For forecasts that are not on a latitude = 'forecast site latitude') -noaa_theme_df <- arrow::open_dataset(arrow::s3_bucket(paste0(config$noaa_forecast_bucket,"stage2/parquet/0/2023-08-01/feea"), endpoint_override = config$noaa_endpoint, anonymous = TRUE)) +noaa_theme_df <- arrow::open_dataset(arrow::s3_bucket(paste0(config$driver_bucket, "/gefs-v12/stage2"), + endpoint_override = config$endpoint, + anonymous = TRUE)) noaa_theme_dates <- arrow::open_dataset(arrow::s3_bucket(paste0(config$driver_bucket,"/gefs-v12/stage2"),