Adding germany and argentina scripts.

Author: Ryan-Riggs

R/argentina.R

@@ -183,11 +183,13 @@ download_argentina_data <- function(site, var_id, start_date, end_date) {
 
   types_present <- unique(dt$procedimiento)
   if (length(types_present) <= 1) {
-    dt <- dt[, .SD, .SDcols = c("Date", value_col)]
+    cols <- c("Date", value_col)
+    dt <- dt[, cols, with = FALSE]
     data.table::setorder(dt, Date)
   } else {
     data.table::setnames(dt, "procedimiento", "Measurement_type")
-    dt <- dt[, .SD, .SDcols = c("Date", value_col, "Measurement_type")]
+    cols <- c("Date", value_col, "Measurement_type")
+    dt <- dt[, cols, with = FALSE]
     data.table::setorder(dt, Date, Measurement_type)
   }
 

R/germany.R

@@ -16,7 +16,7 @@
 #' @return data frame of discharge time-series
 #' @examples
 #' \dontrun{
-#' #Note the German API currently only provides access to stage data from the previous 30 days.
+#' #Note the German API currently only provides access to stage data from the previous 30 days, so start and end date is ignored for this function.
 #' site <- "593647aa-9fea-43ec-a7d6-6476a76ae868"
 #' stage <- germany(site, variable = "stage")
 #' plot(stage$Date, stage$H, type = "l")
@@ -38,7 +38,7 @@ germany <- function(site,
   }
   param_code  <- if (variable == "stage") "W" else "Q"
   column_name <- if (variable == "discharge") "Q" else "H"
-
+  latest_available=Sys.Date()
   end_date <- if (is.null(end_date)) Sys.Date() else as.Date(end_date)
 
   # --- PEGELONLINE-specific: clamp start_date to the 30-day window --------
@@ -52,6 +52,14 @@ germany <- function(site,
     start_date <- earliest_available
   }
 
+  if (end_date < earliest_available|end_date>latest_available) {
+    warning(
+      "PEGELONLINE only retains 30 days of raw data. Requested end_date ",
+      end_date, " is outside of data range -- clamping to ", latest_available, "."
+    )
+    end_date <- latest_available
+  }
+
   original_data <- try(
     download_germany_data(site, param_code, start_date, end_date),
     silent = TRUE
@@ -66,11 +74,9 @@ germany <- function(site,
   dt <- data.table::as.data.table(original_data)
   dt[, Date := as.Date(timestamp)]
   data.table::setnames(dt, "value", column_name)
-  dt <- dt[Date >= start_date & Date <= end_date, .SD, .SDcols = c("Date", column_name)]
-  # PEGELONLINE reports sub-daily (often 15-min) readings; collapse to a
-  # daily mean so the output matches every other RivRetrieve function's
-  # one-row-per-day convention.
-  dt <- dt[, .(value = mean(get(column_name), na.rm = TRUE)), by = Date]
+
+  dt <- dt[Date>=start_date&Date<=end_date, .(value = mean(get(column_name), na.rm = TRUE)), by = Date]
+
   data.table::setnames(dt, "value", column_name)
   data.table::setorder(dt, Date)
 

R/sysdata.rda

@@ -1,10 +1,12 @@
 ## TODO
 
 load("data-raw/australia_sites.rda")
+load("data-raw/argentina_sites.rda")
 load("data-raw/brazil_sites.rda")
 load("data-raw/canada_sites.rda")
 load("data-raw/chile_sites.rda")
 load("data-raw/french_sites.rda")
+load("data-raw/german_sites.rda")
 load("data-raw/ireland_sites.rda")
 load("data-raw/japan_sites.rda")
 load("data-raw/quebec_sites.rda")
@@ -16,10 +18,12 @@ load("data-raw/usa_sites.rda")
 
 usethis::use_data(
          australia_sites,
+         argentina_sites,
          brazil_sites,
          canada_sites,
          chile_sites,
          french_sites,
+         german_sites,
          ireland_sites,
          japan_sites,
          quebec_sites,