diff --git a/DESCRIPTION b/DESCRIPTION index cff0431..dc2380e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: ecoengine Type: Package Title: Programmatic interface to the API serving UC Berkeley's Natural History Data -Version: 1.2.6 +Version: 1.3 Date: 2014-03-23 Authors@R: c(person("Karthik", "Ram", role = c("aut", "cre"), email = "karthik.ram@gmail.com")) diff --git a/NEWS b/NEWS index ce3c538..1e42934 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +ecoengine 1.3 +=============== +* Considerable speed improvements. zoom zoom. + + ecoengine 1.2.6 ================ * Package is now updated for httr 0.3 diff --git a/R/ee_photos.R b/R/ee_photos.R index c882ffa..163429a 100644 --- a/R/ee_photos.R +++ b/R/ee_photos.R @@ -109,7 +109,6 @@ ee_photos <- function(page = NULL, photos_data <- do.call(rbind.fill, lapply(photos[[4]], rbindfillnull)) results[[i]] <- photos_data if(progress) setTxtProgressBar(pb, i) - if(i %% 25 == 0) Sys.sleep(2) } photos_data <- do.call(rbind.fill, results) diff --git a/R/ee_search.R b/R/ee_search.R index dcad531..1f829cd 100644 --- a/R/ee_search.R +++ b/R/ee_search.R @@ -96,7 +96,6 @@ if(progress) pb <- txtProgressBar(min = 0, max = length(required_pages), style = obs_data <- rbind.fill(with_geojson_df, without_geojson_df) results[[i]] <- obs_data if(progress) setTxtProgressBar(pb, i) - if(i %% 25 == 0) Sys.sleep(2) } all_obs_data <- do.call(rbind.fill, results) diff --git a/R/ee_sensor_aggregation.R b/R/ee_sensor_aggregation.R index 956783d..c66d70e 100644 --- a/R/ee_sensor_aggregation.R +++ b/R/ee_sensor_aggregation.R @@ -64,7 +64,6 @@ if(progress) pb <- txtProgressBar(min = 0, max = length(required_pages), style = sensor_data_agg$begin_date <- ymd_hms(sensor_data_agg$begin_date) results[[i]] <- sensor_data_agg if(progress) setTxtProgressBar(pb, i) - if(i %% 25 == 0) Sys.sleep(2) } sensor_data_agg <- do.call(rbind, results) diff --git a/R/ee_sensors.R b/R/ee_sensors.R index 08371db..a6df8d9 100644 --- a/R/ee_sensors.R +++ b/R/ee_sensors.R @@ -51,7 +51,6 @@ sensor_url <- "http://ecoengine.berkeley.edu/api/sensors/?format=json" }) results[[i]] <- basic_sensor_data - if(i %% 25 == 0) Sys.sleep(2) } res <- do.call(rbind, results) diff --git a/README.md b/README.md index 7e2b0c7..c7ff29e 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ A quick start guide is available both as [markdown](https://github.com/ropensci/ To cite package ‘ecoengine’ in publications use: Karthik Ram (2014). ecoengine: Programmatic interface to the API - serving UC Berkeley's Natural History Data. R package version 1.2.2. + serving UC Berkeley's Natural History Data. R package version 1.3. https://github.com/ropensci/ecoengine A BibTeX entry for LaTeX users is @@ -53,7 +53,7 @@ A BibTeX entry for LaTeX users is Data}, author = {Karthik Ram}, year = {2014}, - note = {R package version 1.2.2}, + note = {R package version 1.3}, url = {https://github.com/ropensci/ecoengine}, } ```