fix: hydro-imgw

bczernecki · Oct 20, 2024 · 572811a · 572811a
1 parent d114c26
commit 572811a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/R/hydro_imgw_annual.R b/R/hydro_imgw_annual.R
@@ -93,9 +93,13 @@ hydro_imgw_annual_bp = function(year = year,
     file1 = paste(temp2, dir(temp2), sep = "/")[1]
 
     if (translit) {
-      data1 = as.data.frame(data.table::fread(cmd = paste("iconv -f CP1250 -t ASCII//TRANSLIT", file1)))
+      data1 = as.data.frame(data.table::fread(cmd = paste("iconv -f ISO-8859-2 -t ASCII//TRANSLIT", file1)))
     } else {
-      data1 = read.csv(file1, header = FALSE, stringsAsFactors = FALSE, fileEncoding = "CP1250")
+      data1 = tryCatch(expr = read.csv(file1, header = FALSE, stringsAsFactors = FALSE, sep = ",", 
+                                       fileEncoding = "CP1250"),
+                       warning = function(w) {
+                         read.csv(file1, header = FALSE, stringsAsFactors = FALSE, sep = ";")
+                       })
     }
 
     colnames(data1) = meta[[value]]$parameters

diff --git a/R/hydro_imgw_monthly.R b/R/hydro_imgw_monthly.R
@@ -75,9 +75,9 @@ hydro_imgw_monthly_bp = function(year,
   meta = hydro_metadata_imgw(interval)
 
   all_data = vector("list", length = length(catalogs))
+
   for (i in seq_along(catalogs)) {
     catalog = catalogs[i]
-
     adres = paste0(base_url, interval_pl, "/", catalog, "/mies_", catalog, ".zip")
 
     temp = tempfile()
@@ -87,9 +87,13 @@ hydro_imgw_monthly_bp = function(year,
     file1 = paste(temp2, dir(temp2), sep = "/")[1]
 
     if (translit) {
-      data1 = as.data.frame(data.table::fread(cmd = paste("iconv -f CP1250 -t ASCII//TRANSLIT", file1)))
+      data1 = as.data.frame(data.table::fread(cmd = paste("iconv -f ISO-8859-2 -t ASCII//TRANSLIT", file1)))
     } else {
-      data1 = read.csv(file1, header = FALSE, stringsAsFactors = FALSE, fileEncoding = "CP1250")
+      data1 = tryCatch(expr = read.csv(file1, header = FALSE, stringsAsFactors = FALSE, sep = ",", 
+                                       fileEncoding = "CP1250"),
+                       warning = function(w) {
+                         read.csv(file1, header = FALSE, stringsAsFactors = FALSE, sep = ";")
+                       })
     }
 
     colnames(data1) = meta[[1]][, 1]