From 44e2efc1b84184264371e61eb5867de3892f895c Mon Sep 17 00:00:00 2001 From: Sam Albers Date: Sat, 16 Nov 2024 21:14:51 -0800 Subject: [PATCH] fix date --- R/realtime-webservice.R | 4 +++- R/utils.R | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/R/realtime-webservice.R b/R/realtime-webservice.R index 3d7e154..267a42a 100755 --- a/R/realtime-webservice.R +++ b/R/realtime-webservice.R @@ -83,12 +83,14 @@ realtime_ws <- function(station_number, ) } + if (inherits(start_date, "Date")) start_date <- paste0(start_date, " 00:00:00") + if (inherits(end_date, "Date")) end_date <- paste0(end_date, " 23:59:59") + validate_params(parameters, start_date, end_date) ## Build link for GET baseurl <- "https://wateroffice.ec.gc.ca/services/real_time_data/csv/inline?" - browser() query_url <- construct_url( baseurl, station_number, diff --git a/R/utils.R b/R/utils.R index ba3865f..09dcc1a 100644 --- a/R/utils.R +++ b/R/utils.R @@ -264,9 +264,6 @@ validate_params <- function(parameters, start_date, end_date) { if (!is.numeric(parameters)) stop("parameters should be a number", call. = FALSE) - if (inherits(start_date, "Date")) start_date <- paste0(start_date, " 00:00:00") - if (inherits(end_date, "Date")) end_date <- paste0(end_date, " 23:59:59") - if (!grepl("[0-9]{4}-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]", start_date)) { stop(