FIX: add additional columns (#214)

* rename  with additional columns

* add cols to test

* fix partial matching

* update versions

* fix ascii error

Author: boshek

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: tidyhydat
 Title: Extract and Tidy Canadian 'Hydrometric' Data
-Version: 0.7.0
+Version: 0.7.0.9999
 Authors@R: c(person("Sam", "Albers", email = "sam.albers@gmail.com", role = c("aut", "cre"),
     comment = c(ORCID = "0000-0002-9270-7884")),
     person("David", "Hutchinson", email = "david.hutchinson@canada.ca", role = "ctb"),

NEWS.md

@@ -1,3 +1,7 @@
+# tidyhydat 0.7.0.9999
+- add columns added by a webservice update (#213)
+- fix some partial matching in `realtime_add_local_datetime` internals
+
 # tidyhydat 0.7.0
 - bump minimum R version to 4.2.0
 - dropped httr in favour of httr2

R/realtime-webservice.R

@@ -167,7 +167,16 @@ realtime_ws <- function(station_number,
   }
 
   ## Rename columns to reflect tidyhydat naming
-  colnames(csv_df) <- c("STATION_NUMBER", "Date", "Parameter", "Value", "Grade", "Symbol", "Approval")
+  csv_df = dplyr::rename(csv_df,
+    STATION_NUMBER = ID,
+    Parameter = "Parameter/Param\u00e8tre",
+    Value = "Value/Valeur",
+    Qualifier = "Qualifier/Qualificatif", 
+    Symbol = "Symbol/Symbole", 
+    Approval = "Approval/Approbation", 
+    Grade = "Grade/Classification" ,
+    Qualifiers = "Qualifiers/Qualificatifs"
+  )
 
   csv_df <- dplyr::left_join(
     csv_df,
@@ -176,7 +185,7 @@ realtime_ws <- function(station_number,
   )
   csv_df <- dplyr::select(
     csv_df, STATION_NUMBER, Date, Name_En, Value, Unit,
-    Grade, Symbol, Approval, Parameter, Code
+    Grade, Symbol, Approval, Parameter, Code, Qualifier, Qualifiers
   )
 
   ## What stations were missed?

R/realtime.R

@@ -167,7 +167,7 @@ realtime_add_local_datetime <- function(.data, set_tz = NULL) {
     tz_used <- set_tz
   }
 
-  timezone_data$local_datetime <- lubridate::with_tz(timezone_data$Date, tz = tz_used)
+  timezone_data$local_datetime <- lubridate::with_tz(timezone_data$Date, tzone = tz_used)
 
   timezone_data$tz_used <- tz_used
 

tests/testthat/test-realtime-webservice.R

@@ -12,7 +12,7 @@ test_that("realtime_ws returns the correct data header", {
     colnames(ws_test),
     c(
       "STATION_NUMBER", "Date", "Name_En", "Value", "Unit", "Grade",
-      "Symbol", "Approval", "Parameter", "Code"
+      "Symbol", "Approval", "Parameter", "Code", "Qualifier", "Qualifiers"
     )
   )