added more detailed check dates

Author: prcwiek

R/metar_get_historical.R

@@ -45,7 +45,7 @@ metar_get_historical <- function(airport = "EPWA",
     stop("pmetar package error: Only one airport at once!", call. = FALSE)
   }
 
-  # check whether airpot consist of spaces
+  # check whether airport consist of spaces
   if(stringr::str_detect(airport, pattern = "\\s")) {
     stop("pmetar package error: Airport code contains blank(s)!", call. = FALSE)
   }
@@ -59,18 +59,34 @@ metar_get_historical <- function(airport = "EPWA",
   if(!stringr::str_detect(airport, pattern = "^[A-Za-z]{4}$")){
     stop("pmetar package error: invalid format of an airport ICAO or IATA code!", call. = FALSE)
   }
+  
+  # check if airport exists 
+  if (metar_iata_icao(airport) == "Incorrect ICAO or IATA airport code!") {
+    stop("pmetar package error: Incorrect ICAO or IATA airport code!", call. = FALSE)
+  }
+  
   # check if dates have correct format
   if(!stringr::str_detect(start_date, pattern = "^\\d{4}[-]\\d\\d[-]\\d\\d$") |
      !stringr::str_detect(end_date, pattern = "^\\d{4}[-]\\d\\d[-]\\d\\d$")){
     stop("pmetar package error: invalid format of start_date and/or end_date!", call. = FALSE)
   }
 
+  # check if start_date is correct
+  if (is.na(lubridate::ymd(start_date))) {
+    stop("pmetar package error: start_date is invalid!", call. = FALSE)
+  }
+  
+  # check if end_date is correct
+  if (is.na(lubridate::ymd(end_date))) {
+    stop("pmetar package error: end_date is invalid!", call. = FALSE)
+  }
+  
   # check if dates range is correct
   if(as.Date(start_date) >= as.Date(end_date)) {
     stop("pmetar package error: start_date is equal or later than end_date!", call. = FALSE)
   }
 
-  # check the maximum period of 31 days for Ogimet web page
+  # check the maximum period of 365 days for Ogimet web page
   if(from == "ogimet" & (as.Date(end_date) - as.Date(start_date) > 365)) {
     stop("pmetar package error: Period longer than 365 days for the Ogimet source!", call. = FALSE)
   }
@@ -165,13 +181,15 @@ metar_get_historical <- function(airport = "EPWA",
                           colClasses = rep("character", 7))
     # check if ds is a data frame and number of rows is greater than 0
     if (!is.data.frame(ds) | nrow(ds) == 0) {
-      stop("pmetar package error: Malformed answer from the server www.ogimet.com! ", call. = FALSE)
+      #stop("pmetar package error: Malformed answer from the server www.ogimet.com! ", call. = FALSE)
+      return(invisible(NULL))
     }
     # check if there are all columns needed in ds
     if (!("ANO" %in% names(ds)) | !("MES" %in% names(ds)) | !("DIA" %in% names(ds)) |
         !("HORA" %in% names(ds)) | !("MINUTO" %in% names(ds)) | !("PARTE" %in% names(ds))) {
-      stop("pmetar package error: Missing columns in the answer from the server www.ogimet.com! ",
-           call. = FALSE)
+      # stop("pmetar package error: Missing columns in the answer from the server www.ogimet.com! ",
+      #      call. = FALSE)
+      return(invisible(NULL))
     }
     out <- ds %>% 
       dplyr::mutate(metar_reports = paste0(ANO, MES, DIA, HORA, MINUTO, " ", PARTE)) %>% 
@@ -181,12 +199,14 @@ metar_get_historical <- function(airport = "EPWA",
     ds <- utils::read.csv((textConnection(myfile)), stringsAsFactors = FALSE)
     # check if ds is a data frame and number of rows is greater than 0
     if (!is.data.frame(ds) | ncol(ds) != 3 | nrow(ds) == 0) {
-      stop("pmetar package error: Malformed answer from the server mesonet.agron.iastate.edu!", call. = FALSE)
+      #stop("pmetar package error: Malformed answer from the server mesonet.agron.iastate.edu!", call. = FALSE)
+      return(invisible(NULL))
     }
     # check if there are all columns needed in ds
     if (!("station" %in% names(ds)) | !("valid" %in% names(ds)) | !("metar" %in% names(ds))) {
-      stop("pmetar package error: Missing columns in the answer from the server www.ogimet.com! ",
-           call. = FALSE)
+      # stop("pmetar package error: Missing columns in the answer from the server www.ogimet.com! ",
+      #      call. = FALSE)
+      return(invisible(NULL))
     }
     ds[,2] <- stringr::str_replace_all(ds[,2], "[[:punct:]]", "")
     ds[,2] <- stringr::str_replace_all(ds[,2], " ", "")