Merge pull request #46 from bczernecki/dev

Dev

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: climate
 Title: Interface to Download Meteorological (and Hydrological) Datasets
-Version: 0.9.7
+Version: 0.9.8
 Authors@R: c(person(given = "Bartosz",
            family = "Czernecki",
            role = c("aut", "cre"),

NEWS.md

@@ -1,7 +1,11 @@
-# climate 0.9.7
+# climate 0.9.8
 
 * Adding informative message if problems with NOAA hourly dataset occur
-* Informative message if problems with downloading detected
+* Informative message if problems with downloading detected for non-IMGW dataset
+
+# climate 0.9.7
+
+* stop working if no internet connection detected
 
 # climate 0.9.6
 

R/meteo_noaa_co2.R

@@ -49,8 +49,16 @@ meteo_noaa_co2 <- function(){
   temp = tempfile()
   test_url(link = base_url, output = temp)
 
-  co2 = read.table(temp, na.strings = "-99.99")
-  colnames(co2) = c("yy", "mm", "yy_d","co2_avg", "co2_interp", "co2_seas", "ndays")
+  # run only if downloaded file is valid
+  co2 = NULL
+  if(!is.na(file.size(temp)) & (file.size(temp) > 800)) { 
+
+    co2 = read.table(temp, na.strings = "-99.99")
+    colnames(co2) = c("yy", "mm", "yy_d","co2_avg", "co2_interp", "co2_seas", "ndays")
+
+  } else {
+    cat(paste0("Service not working or problems with internet connection. Check url:\n", base_url)) 
+  }
 
   unlink(temp)
   return(co2)

R/nearest_stations_noaa.R

@@ -49,6 +49,10 @@ nearest_stations_nooa <- function(country,
   #a <-  getURL(linkpl2)
   temp = tempfile()
   test_url(link = linkpl2, output = temp)
+
+  # check connection:
+  if(!is.na(file.size(temp)) & (file.size(temp) > 800)) { 
+
   a = readLines(temp)
   a = trimws(a, which = "right")
   b = strsplit(a, "          ")
@@ -144,5 +148,11 @@ nearest_stations_nooa <- function(country,
 
   }
 
+
+  } else { # end of checking connection
+    cat(paste0("Service not working, wrong query or problems with internet connection.\n"))
+    result = NULL
+  }
+
   return(result)
 }

R/nearest_stations_ogimet.R

@@ -62,62 +62,70 @@ nearest_stations_ogimet <- function(country = "United+Kingdom",
   #a <-  getURL(linkpl2)
   temp = tempfile()
   test_url(link = linkpl2, output = temp)
-  a = readLines(temp)
-  a = paste(a, sep="", collapse="") 
 
-  b <- strsplit(a, "Decoded synops since")
+  # run only if downloaded file is valid
+  if(!is.na(file.size(temp)) & (file.size(temp) > 0)) {
 
-  b1 <- lapply(b, function(x) substr(x, 1, 400))
-  b1[[1]] <- b1[[1]][-1] # header
-
-  b21 <- unlist(lapply(gregexpr('Lat=', b1[[1]], fixed = TRUE), function(x) x[1]))
-
-  pattern <- paste0(" (", gsub(x = number_countries, pattern = "+", replacement = " ", fixed = TRUE))
-  b22 <- unlist(lapply(gregexpr(pattern = pattern, b1[[1]], fixed = TRUE), function(x) x[1]))
-
-  b1 <- data.frame(str = b1[[1]], start = b21, stop = b22, stringsAsFactors = FALSE)
-
-  res <- substr(b1$str, b1$start, b1$stop)
-
-  station_names <- unlist(lapply(strsplit(res, " - "), function(x) x[length(x)]))
-
-
-  res <- gsub(x = res, pattern = ", CAPTION, '", replacement = '', fixed = TRUE)
-  res <- gsub(x = res, pattern = " m'", replacement = ' ', fixed = TRUE)
-  res <- gsub(x = res, pattern = " - ", replacement = ' ', fixed = TRUE)
-  res <- gsub(x = res, pattern = "Lat=", replacement = '', fixed = TRUE)
-  res <- gsub(x = res, pattern = "Lon=", replacement = ' ', fixed = TRUE)
-  res <- gsub(x = res, pattern = "Alt=", replacement = ' ', fixed = TRUE)
-
-  res <- suppressWarnings(do.call("rbind", strsplit(res, " ")))
-
-  res1 <- res[,c(1,3,5:7)]
-
-  lat <- as.numeric(substr(res1[, 1], 1, 2)) +
-    (as.numeric(substr(res1[,1], 4, 5))/100) * 1.6667
-
-  lon_hemisphere <-  gsub("[0-9]", "\\1", res1[, 2])
-  lon_hemisphere <-  gsub("-", "", lon_hemisphere)
-  lon_hemisphere <- ifelse(lon_hemisphere == "W", -1, 1)
-
-  lat_hemisphere <-  gsub("[0-9]", "\\1", res1[, 1])
-  lat_hemisphere <-  gsub("-", "", lat_hemisphere)
-  lat_hemisphere <- ifelse(lat_hemisphere == "S", -1, 1)
-
-  lon <- as.numeric(substr(res1[, 2], 1, 3)) + (as.numeric(substr(res1[, 2], 5, 6)) / 100)*1.6667
-  lon <- lon*lon_hemisphere
-
-  lat <- as.numeric(substr(res1[, 1], 1, 2)) + (as.numeric(substr(res1[, 1], 4, 5)) / 100)*1.6667
-  lat <- lat * lat_hemisphere
+    a = readLines(temp)
+    a = paste(a, sep="", collapse="") 
+
+    b <- strsplit(a, "Decoded synops since")
+
+    b1 <- lapply(b, function(x) substr(x, 1, 400))
+    b1[[1]] <- b1[[1]][-1] # header
+
+    b21 <- unlist(lapply(gregexpr('Lat=', b1[[1]], fixed = TRUE), function(x) x[1]))
+
+    pattern <- paste0(" (", gsub(x = number_countries, pattern = "+", replacement = " ", fixed = TRUE))
+    b22 <- unlist(lapply(gregexpr(pattern = pattern, b1[[1]], fixed = TRUE), function(x) x[1]))
+
+    b1 <- data.frame(str = b1[[1]], start = b21, stop = b22, stringsAsFactors = FALSE)
+
+    res <- substr(b1$str, b1$start, b1$stop)
+
+    station_names <- unlist(lapply(strsplit(res, " - "), function(x) x[length(x)]))
+
+
+    res <- gsub(x = res, pattern = ", CAPTION, '", replacement = '', fixed = TRUE)
+    res <- gsub(x = res, pattern = " m'", replacement = ' ', fixed = TRUE)
+    res <- gsub(x = res, pattern = " - ", replacement = ' ', fixed = TRUE)
+    res <- gsub(x = res, pattern = "Lat=", replacement = '', fixed = TRUE)
+    res <- gsub(x = res, pattern = "Lon=", replacement = ' ', fixed = TRUE)
+    res <- gsub(x = res, pattern = "Alt=", replacement = ' ', fixed = TRUE)
+
+    res <- suppressWarnings(do.call("rbind", strsplit(res, " ")))
+
+    res1 <- res[,c(1,3,5:7)]
+
+    lat <- as.numeric(substr(res1[, 1], 1, 2)) +
+      (as.numeric(substr(res1[,1], 4, 5))/100) * 1.6667
+
+    lon_hemisphere <-  gsub("[0-9]", "\\1", res1[, 2])
+    lon_hemisphere <-  gsub("-", "", lon_hemisphere)
+    lon_hemisphere <- ifelse(lon_hemisphere == "W", -1, 1)
+
+    lat_hemisphere <-  gsub("[0-9]", "\\1", res1[, 1])
+    lat_hemisphere <-  gsub("-", "", lat_hemisphere)
+    lat_hemisphere <- ifelse(lat_hemisphere == "S", -1, 1)
+
+    lon <- as.numeric(substr(res1[, 2], 1, 3)) + (as.numeric(substr(res1[, 2], 5, 6)) / 100)*1.6667
+    lon <- lon*lon_hemisphere
+
+    lat <- as.numeric(substr(res1[, 1], 1, 2)) + (as.numeric(substr(res1[, 1], 4, 5)) / 100)*1.6667
+    lat <- lat * lat_hemisphere
+
+    res <- data.frame(wmo_id = res1[, 4], station_names = station_names,
+                      lon = lon, lat = lat, alt = as.numeric(res1[, 3]))
+    result=rbind(result,res)
+  } else {
+    result = NULL
+    cat(paste("Wrong name of a country. Please check countries names at 
+         https://ogimet.com/display_stations.php?lang=en&tipo=AND&isyn=&oaci=&nombre=&estado=&Send=Send"))
+  } # end of checking internet connection
 
-  res <- data.frame(wmo_id = res1[, 4], station_names = station_names,
-                    lon = lon, lat = lat, alt = as.numeric(res1[, 3]))
-  result=rbind(result,res)
-}
-  if (dim(result)[1]==0) {
-    stop("Wrong name of a country. Please check countries names at 
-         https://ogimet.com/display_stations.php?lang=en&tipo=AND&isyn=&oaci=&nombre=&estado=&Send=Send")
   } 
+
+  if (!is.null(result)) {
 
   point = as.data.frame(t(point))
   names(point) = c("lon", "lat")
@@ -176,6 +184,8 @@ nearest_stations_ogimet <- function(country = "United+Kingdom",
 
   }
 
+  } # end of checking whether result is null
+
   return(result)
 }