Merge pull request #66 from bczernecki/dev

Dev

.github/workflows/R-CMD-check.yaml

@@ -31,7 +31,6 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,   r: 'release'}
-          - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: '3.6'}
           - {os: ubuntu-16.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
           - {os: ubuntu-16.04,   r: '3.5',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}

NEWS.md

@@ -2,6 +2,7 @@
 
 * Adding possibility to download BUFR vertical sounding dataset from `http://weather.uwyo.edu/upperair/sounding.html`; extra information with supporting example added to the `sounding_wyoming`'s documentation
 * `hydro_imgw` supports now exception for current year which has no flow data until it is verified by the IMGW-PIB
+* `ogimet_daily` automatically detects column names to be used for extraction in final data.frame
 
 # climate 1.0.1
 

R/hydro_imgw.R

@@ -1,6 +1,6 @@
 #' Hydrological data from IMGW
 #'
-#' Downloading hourly, daily, and monthly hydrological data from the measurement stations available in the danepubliczne.imgw.pl collection
+#' Downloading daily, and monthly hydrological data from the measurement stations available in the danepubliczne.imgw.pl collection
 #'
 #' @param interval temporal resolution of the data ("daily" , "monthly", or "semiannual_and_annual")
 #' @param year vector of years (e.g., 1966:2000)

R/ogimet_daily.R

@@ -109,7 +109,7 @@ ogimet_daily = function(date = c(Sys.Date() - 30, Sys.Date()), coords = FALSE, s
           test = b[1:2, ]
 
           if (is.null(test) ) {
-            warning(paste0("Wrong station ID: ", station_nr, " You can check station ID at https://ogimet.com/display_stations.php?lang=en&tipo=AND&isyn=&oaci=&nombre=&estado=&Send=Send"))
+            warning(paste0("Wrong station ID: ", station_nr, " You can check available stations ID at https://ogimet.com/display_stations.php?lang=en&tipo=AND&isyn=&oaci=&nombre=&estado=&Send=Send"))
             return(data_station)
           } 
 

R/ogimet_hourly.R

@@ -144,10 +144,12 @@ ogimet_hourly = function(date = c("2019-06-01","2019-07-31"), coords = FALSE, st
     data_station$hour = NULL
 
     # other columns to numeric:
-    suppressWarnings(data_station[, c("TC", "TdC", "ffkmh",  "Gustkmh", "P0hPa", "PseahPa", "PTnd", "Nt", "Nh",
-                    "HKm", "InsoD1", "Viskm", "Snowcm","station_ID")] <-
-      as.data.frame(sapply(data_station[,c("TC", "TdC", "ffkmh", "Gustkmh", "P0hPa", "PseahPa", "PTnd", "Nt","Nh",
-                                           "HKm", "InsoD1", "Viskm", "Snowcm","station_ID")], as.numeric)))
+    columns = c("TC", "TdC", "ffkmh",  "Gustkmh", "P0hPa", "PseahPa", "PTnd", "Nt", "Nh",
+                "HKm", "InsoD1", "Viskm", "Snowcm", "station_ID")
+    columns = colnames(data_station)[(colnames(data_station) %in% columns)]
+
+    suppressWarnings(data_station[, columns] <-
+      as.data.frame(sapply(data_station[,columns], as.numeric)))
 
     #  TODO:
     # changing order of columns and removing blank records: