Skip to content

Commit ec3619e

Browse files
committed
Fix EASIN functions and increase time out for downloading railways data
1 parent 24d95ae commit ec3619e

File tree

4 files changed

+39
-15
lines changed

4 files changed

+39
-15
lines changed

R/DWF_EASIN_Down.R

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ EASIN_Down <- function(
4141
AllArgs = AllArgs, Type = "numeric",
4242
Args = c("Timeout", "NSearch", "SleepTime"))
4343

44-
4544
# # ..................................................................... ###
4645

4746
# Environment variables ----
48-
IASDT.R::CatTime("Environment variables")
4947

5048
EnvVars2Read <- tibble::tribble(
5149
~VarName, ~Value, ~CheckDir, ~CheckFile,
52-
"EASIN_URL", "DP_R_EASIN_url", FALSE, FALSE,
50+
"EASIN_URL", "DP_R_EASIN_data_url", FALSE, FALSE,
5351
"Path_EASIN", "DP_R_EASIN_interim", FALSE, FALSE)
5452
# Assign environment variables and check file and paths
5553
IASDT.R::AssignEnvVars(EnvFile = EnvFile, EnvVarDT = EnvVars2Read)
@@ -90,6 +88,7 @@ EASIN_Down <- function(
9088

9189
Path_Part <- IASDT.R::Path(
9290
Path_EASIN, "FileParts", paste0(Obj_Out, ".RData"))
91+
9392
if (IASDT.R::CheckData(Path_Part, warning = FALSE)) {
9493
next
9594
}
@@ -131,7 +130,6 @@ EASIN_Down <- function(
131130
}
132131
}
133132

134-
135133
if (inherits(ChunkDT, "data.frame")) {
136134
IASDT.R::SaveAs(InObj = ChunkDT, OutObj = Obj_Out, OutPath = Path_Part)
137135

R/DWF_EASIN_Process.R

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,30 @@
6666
#' @export
6767
#' @order 1
6868

69+
70+
71+
72+
setwd("U:/Workflow/")
73+
ExtractTaxa = TRUE
74+
ExtractData = TRUE
75+
NDownTries = 10L
76+
NCores = 6L
77+
SleepTime = 10L
78+
NSearch = 1000L
79+
EnvFile = ".env"
80+
DeleteChunks = TRUE
81+
StartYear = 1981L
82+
Plot = TRUE
83+
84+
85+
86+
87+
88+
89+
90+
91+
92+
6993
EASIN_Process <- function(
7094
ExtractTaxa = TRUE, ExtractData = TRUE, NDownTries = 10L, NCores = 6L,
7195
SleepTime = 10L, NSearch = 1000L, EnvFile = ".env", DeleteChunks = TRUE,
@@ -116,7 +140,6 @@ EASIN_Process <- function(
116140
"Path_Grid_Ref", "DP_R_Grid_raw", TRUE, FALSE,
117141
"Path_EASIN", "DP_R_EASIN_processed", FALSE, FALSE,
118142
"Path_EASIN_Interim", "DP_R_EASIN_interim", FALSE, FALSE,
119-
"EASIN_URL", "DP_R_EASIN_url", FALSE, FALSE,
120143
"TaxaInfoFile", "DP_R_Taxa_info_rdata", FALSE, TRUE,
121144
"EASIN_Ref", "DP_R_Taxa_easin", FALSE, TRUE)
122145
# Assign environment variables and check file and paths
@@ -175,7 +198,10 @@ EASIN_Process <- function(
175198

176199
IASDT.R::CatTime("Extract EASIN taxonomy list")
177200

178-
if (ExtractTaxa) {
201+
Path_EASIN_Taxa <- IASDT.R::Path(Path_EASIN, "EASIN_Taxa.RData")
202+
Taxa_Okay <- IASDT.R::CheckData(Path_EASIN_Taxa, warning = FALSE)
203+
204+
if (ExtractTaxa || isFALSE(Taxa_Okay)) {
179205
IASDT.R::CatTime("Download EASIN taxa", Level = 1)
180206

181207
# Download EASIN taxa
@@ -209,8 +235,7 @@ EASIN_Process <- function(
209235
"Cenchrus setaceus", 5828232, "R03000",
210236
"Neltuma juliflora", 5358460, "R12278",
211237
"Persicaria perfoliata", 4033648, "R19287",
212-
"Pueraria montana (Lour.) Merr. var. lobata", 2977636, "R12644")
213-
)
238+
"Pueraria montana (Lour.) Merr. var. lobata", 2977636, "R12644"))
214239

215240
EASIN_Taxa <- EASIN_Taxa_Orig %>%
216241
# Merge with EASIN reference list of taxonomy standardization
@@ -237,10 +262,10 @@ EASIN_Process <- function(
237262
}
238263
## Save EASIN taxa - RData ----
239264
IASDT.R::CatTime("Save EASIN taxa - RData", Level = 1)
240-
save(EASIN_Taxa, file = IASDT.R::Path(Path_EASIN, "EASIN_Taxa.RData"))
265+
save(EASIN_Taxa, file = Path_EASIN_Taxa)
241266
} else {
242267
IASDT.R::CatTime("Loading EASIN taxa list")
243-
load(IASDT.R::Path(Path_EASIN, "EASIN_Taxa.RData"))
268+
EASIN_Taxa <- IASDT.R::LoadAs(Path_EASIN_Taxa)
244269
}
245270

246271
# # ..................................................................... ###
@@ -252,6 +277,7 @@ EASIN_Process <- function(
252277
IASDT.R::CatTime("Download EASIN data")
253278

254279
if (ExtractData) {
280+
255281
TimeStartData <- lubridate::now(tzone = "CET")
256282

257283
## Prepare working on parallel ----
@@ -272,6 +298,8 @@ EASIN_Process <- function(
272298
on.exit(future::plan("future::sequential", gc = TRUE), add = TRUE)
273299
}
274300

301+
IASDT.R::CatTime("Processing EASIN data", Level = 1)
302+
275303
# Start downloading, allow for a maximum of `NumDownTries` trials
276304
Try <- 0
277305

@@ -302,7 +330,6 @@ EASIN_Process <- function(
302330
break
303331
}
304332

305-
IASDT.R::CatTime("Processing EASIN data", Level = 1)
306333
Down <- try(
307334
future.apply::future_lapply(
308335
X = NotProcessed, FUN = IASDT.R::EASIN_Down, EnvFile = EnvFile,

R/DWF_EASIN_Taxonomy.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ EASIN_Taxonomy <- function(
2828
# # ..................................................................... ###
2929

3030
# Environment variables ----
31-
IASDT.R::CatTime("Environment variables")
3231

3332
EnvVars2Read <- tibble::tribble(
3433
~VarName, ~Value, ~CheckDir, ~CheckFile,
35-
"EASIN_URL", "DP_R_EASIN_url", FALSE, FALSE)
34+
"EASIN_URL", "DP_R_EASIN_taxa_url", FALSE, FALSE)
3635
# Assign environment variables and check file and paths
3736
IASDT.R::AssignEnvVars(EnvFile = EnvFile, EnvVarDT = EnvVars2Read)
3837
rm(EnvVars2Read, envir = environment())

R/DWF_Railway_Intensity.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,12 @@ Railway_Intensity <- function(
296296
expr = {
297297

298298
stringr::str_glue(
299-
'curl -k -L --connect-timeout 120 --max-time 1800 --retry 5 \\
299+
'curl -k -L --connect-timeout 180 --max-time 3600 --retry 5 \\
300300
"{URL}" -o "{Path}" --silent') %>%
301301
system()
302302

303303
Success <- IASDT.R::CheckZip(Path)
304-
304+
305305
if (isFALSE(Success)) {
306306
fs::file_delete(Path)
307307
}

0 commit comments

Comments
 (0)