change zenodo record ID and update timeout download option, closes #29

weecology · May 18, 2021 · 16fea99 · 16fea99
1 parent cca1397
commit 16fea99
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 23 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,7 +8,7 @@ Description: A benchmark dataset and evaluation routine for individual tree crow
 License: MIT
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 6.0.1
+RoxygenNote: 7.1.1
 Suggests: knitr,
     rmarkdown,
     testthat

diff --git a/R/download.R b/R/download.R
@@ -18,6 +18,10 @@
 #' @export
 download<-function(training=FALSE,savedir=NULL,force=F){
 
+  #Store users timeout options
+  timeout_option_backup <- getOption("timeout")
+  options(timeout = max(3600, getOption("timeout")))
+
   if(is.null(savedir)){
     destination<-paste(system.file(package = "NeonTreeEvaluation"),"/extdata/NeonTreeEvaluation.zip",sep="")
     dirname <-paste(system.file(package = "NeonTreeEvaluation"),"/extdata/NeonTreeEvaluation/",sep="")
@@ -37,18 +41,19 @@ download<-function(training=FALSE,savedir=NULL,force=F){
   }
 
   #Evaluation data
-  eval_url<-zenodo_url(concept_rec_id=3723356)
+  eval_url<-zenodo_url(concept_rec_id=4770593)
   message(paste("Downloading file to",destination))
   download.file(eval_url,destination, mode = "wb")
   unzip_download(destination)
 
   #Optional Training Data
   if(training){
-    url<-zenodo_url(concept_rec_id=3459802)
+    url<-zenodo_url(concept_rec_id=4746605)
     destination<-paste(system.file(package = "NeonTreeEvaluation"),"/extdata/",sep="")
     download.file(eval_url,destination, mode = "wb")
     unzip_download(destination)
   }
+  options(timeout = timeout_option_backup)
 }
 
 unzip_download <- function(destination){

diff --git a/man/compute_precision_recall.Rd b/man/compute_precision_recall.Rd
diff --git a/man/crown_polygons.Rd b/man/crown_polygons.Rd
diff --git a/man/evaluate_field_crowns.Rd b/man/evaluate_field_crowns.Rd
diff --git a/man/evaluate_image_crowns.Rd b/man/evaluate_image_crowns.Rd
diff --git a/man/field.Rd b/man/field.Rd
diff --git a/man/get_data.Rd b/man/get_data.Rd
diff --git a/man/image_crowns.Rd b/man/image_crowns.Rd
diff --git a/man/site_summary.Rd b/man/site_summary.Rd
diff --git a/man/submission.Rd b/man/submission.Rd
diff --git a/man/zenodo_url.Rd b/man/zenodo_url.Rd