diff --git a/DESCRIPTION b/DESCRIPTION index 1d9f300..29c33b9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: geoknife Type: Package Title: Web-Processing of Large Gridded Datasets -Version: 1.1.6 -Date: 2016-01-15 +Version: 1.2.0 +Date: 2016-02-11 Authors@R: c( person("Jordan", "Read", role = c("aut","cre"), email = "jread@usgs.gov"), person("Jordan", "Walker", role = c("aut"), diff --git a/NAMESPACE b/NAMESPACE index 8cb5775..74de984 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -94,5 +94,6 @@ importFrom(sp,Polygons) importFrom(sp,SpatialPolygons) importFrom(sp,coordinates) importFrom(utils,lsf.str) +importFrom(utils,packageName) importFrom(utils,packageVersion) importFrom(utils,read.table) diff --git a/R/01-webdata-obj.R b/R/01-webdata-obj.R index fac0880..db21273 100644 --- a/R/01-webdata-obj.R +++ b/R/01-webdata-obj.R @@ -8,7 +8,7 @@ pkg.env$gconfig <- list('wps.url'='http://cida.usgs.gov/gdp/process/WebProcessin 'verbose' = FALSE, 'version' = '1.0.0') -#' @importFrom utils lsf.str +#' @importFrom utils lsf.str packageName .onLoad <- function(libname, pkgname){ setJobState() funs <- unclass(lsf.str(envir = asNamespace(packageName()), all = TRUE)) diff --git a/README.Rmd b/README.Rmd index 82554f7..2863e54 100644 --- a/README.Rmd +++ b/README.Rmd @@ -103,10 +103,11 @@ plot(data[,1:2], ylab = variables(fabric)) job <- geoknife(webgeom('state::New Hampshire'), fabric = 'prism', email = 'fake.email@gmail.com') ``` -###`geoknife` Functions (as of v0.12.1) +###`geoknife` Functions (as of v1.1.5) | Function | Title | | ------------- |:-------------| | `geoknife` | slice up gridded data according to overlap with feature(s) | +| `gconfig` | set or query package settings for `geoknife` processing defaults | | `algorithm` | the algorithm of a `webprocess` | | `attribute` | the attribute of an `webgeom` | | `check` | check status of `geojob` | diff --git a/README.md b/README.md index a801a6b..dc79432 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -`geoknife` package version 1.1.4 +`geoknife` package version 1.1.6 ================================ [![Build status](https://ci.appveyor.com/api/projects/status/0iacmg82mp50426o/branch/master)](https://ci.appveyor.com/project/jread-usgs/geoknife/branch/master) [![Build Status](https://travis-ci.org/USGS-R/geoknife.svg)](https://travis-ci.org/USGS-R/geoknife) [![Coverage Status](https://coveralls.io/repos/USGS-R/geoknife/badge.svg)](https://coveralls.io/r/USGS-R/geoknife) [![Download Count](http://cranlogs.r-pkg.org/badges/geoknife)](https://cran.r-project.org/package=geoknife) @@ -87,7 +87,7 @@ check(job) ## [1] "Process successful" ## ## $URL - ## [1] "http://cida.usgs.gov:80/gdp/process/RetrieveResultServlet?id=0ac86798-7a2f-47c8-b153-3673e77e3e80OUTPUT" + ## [1] "http://cida.usgs.gov:80/gdp/process/RetrieveResultServlet?id=3089e8d3-1ce7-4058-aa14-989ee4e67ae1OUTPUT" ## ## $statusType ## [1] "ProcessSucceeded" @@ -115,31 +115,32 @@ plot(data[,1:2], ylab = variables(fabric)) job <- geoknife(webgeom('state::New Hampshire'), fabric = 'prism', email = 'fake.email@gmail.com') ``` -### `geoknife` Functions (as of v0.12.1) - -| Function | Title | -|--------------|:-------------------------------------------------------------| -| `geoknife` | slice up gridded data according to overlap with feature(s) | -| `algorithm` | the algorithm of a `webprocess` | -| `attribute` | the attribute of an `webgeom` | -| `check` | check status of `geojob` | -| `download` | download the results of a `geojob` | -| `error` | convenience function for state of `geojob` | -| `running` | convenience function for state of `geojob` | -| `successful` | convenience function for state of `geojob` | -| `start` | start a `geojob` | -| `cancel` | cancel a `geojob` | -| `geom` | the geom of a `webgeom` | -| `inputs` | the inputs of a `webprocess` | -| `id` | the process id of a `geojob` | -| `values` | the values of a `webgeom` | -| `result` | load the output of a completed `geojob` into data.frame | -| `variables` | the variables for a `webdata` object | -| `times` | the times of a `webdata` object | -| `url` | the url of a `webdata`, `webgeom`, `geojob`, or `webprocess` | -| `version` | the version of a `webgeom` or `webdata` | -| `xml` | the xml of a `geojob` | -| `query` | query datasets or variables | +### `geoknife` Functions (as of v1.1.5) + +| Function | Title | +|--------------|:-----------------------------------------------------------------| +| `geoknife` | slice up gridded data according to overlap with feature(s) | +| `gconfig` | set or query package settings for `geoknife` processing defaults | +| `algorithm` | the algorithm of a `webprocess` | +| `attribute` | the attribute of an `webgeom` | +| `check` | check status of `geojob` | +| `download` | download the results of a `geojob` | +| `error` | convenience function for state of `geojob` | +| `running` | convenience function for state of `geojob` | +| `successful` | convenience function for state of `geojob` | +| `start` | start a `geojob` | +| `cancel` | cancel a `geojob` | +| `geom` | the geom of a `webgeom` | +| `inputs` | the inputs of a `webprocess` | +| `id` | the process id of a `geojob` | +| `values` | the values of a `webgeom` | +| `result` | load the output of a completed `geojob` into data.frame | +| `variables` | the variables for a `webdata` object | +| `times` | the times of a `webdata` object | +| `url` | the url of a `webdata`, `webgeom`, `geojob`, or `webprocess` | +| `version` | the version of a `webgeom` or `webdata` | +| `xml` | the xml of a `geojob` | +| `query` | query datasets or variables | ### `geoknife` classes (as of v0.12.0) diff --git a/cran-comments.md b/cran-comments.md index ec1c108..90076bf 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,17 +1,10 @@ ## Resubmission This is a resubmission. In this version I have: -* Added a new output type to data subsets (geotiff) +* Added a new vignette (plotting geotiffs) -* Modified the GET and POST requests to work correctly with the release and dev version of the httr package +* Modified the GET and POST requests to capture a warning message from the new CRAN version of the httr package -* improved documentation +* Added a new feature that allows users to turn on a verbose mode for web requests, and also set defaults for a number of variables. -* Fixed the CITATION file DOI, which was improperly formatted - -### a note about geoknife URLs: -this package has a numer of service URLs that can be found in code, -in help text, and in vignettes. Some of these URLs will return 404s -without the proper POST body -(e.g., http://cida.usgs.gov/gdp/process/WebProcessingService). These -should be ignored for the purpose of testing valid urls. \ No newline at end of file +* Removed urls in the vignette that cause 404s to url checks (as they are urls that receive POST bodies, not GET/HEAD requests) diff --git a/inst/doc/geoknife.html b/inst/doc/geoknife.html index 49792ea..d36fc0e 100644 --- a/inst/doc/geoknife.html +++ b/inst/doc/geoknife.html @@ -71,7 +71,7 @@
@@ -369,20 +369,19 @@

query function for webgeom

## [4] "derivative:CONUS_States" ## [5] "sample:CONUS_states" ## [6] "sample:CSC_Boundaries" -## [7] "upload:E4_UTM" -## [8] "derivative:FWS_LCC" -## [9] "sample:FWS_LCC" -## [10] "draw:GL" -## [11] "draw:GRSF" -## [12] "derivative:wbdhu8_alb_simp" -## [13] "derivative:Level_III_Ecoregions" -## [14] "derivative:NCA_Regions" -## [15] "derivative:US_Counties" -## [16] "draw:box" -## [17] "upload:climate_E4" -## [18] "upload:layers" -## [19] "sample:nps_boundary_2013" -## [20] "sample:simplified_HUC8s" +## [7] "derivative:FWS_LCC" +## [8] "sample:FWS_LCC" +## [9] "draw:GRSF" +## [10] "derivative:wbdhu8_alb_simp" +## [11] "derivative:Level_III_Ecoregions" +## [12] "derivative:NCA_Regions" +## [13] "draw:SD" +## [14] "derivative:US_Counties" +## [15] "draw:box" +## [16] "upload:haynes_wshed_project" +## [17] "upload:layers" +## [18] "sample:nps_boundary_2013" +## [19] "sample:simplified_HUC8s" 
query(stencil, 'attributes')
## [1] "STATE"
query(stencil, 'values')
@@ -653,7 +652,7 @@

cancel geojob

The geoknife package currently limits the user processing requests to single-running processes, so as to avoid creating thousands of requests in error, which could overwhelm the processing resources. If there is a reason to support additional jobs at one time, please email the package maintainers with your query.

To cancel and existing job: Cancel a running job but retain the details:

id(job)
-
## [1] "http://cida.usgs.gov:80/gdp/process/RetrieveResultServlet?id=8d6f59b2-09be-4802-ab8a-a2609da1c158"
+
## [1] "http://cida.usgs.gov:80/gdp/process/RetrieveResultServlet?id=8ec535ed-711f-4192-b139-e6119fb89154"
job <- cancel(job)
 id(job)
## [1] "<no active job>"
diff --git a/inst/doc/plot_geotiff.html b/inst/doc/plot_geotiff.html index d94ffc3..b42d2b8 100644 --- a/inst/doc/plot_geotiff.html +++ b/inst/doc/plot_geotiff.html @@ -71,7 +71,7 @@