Skip to content

Commit

Permalink
Version 1.1.4rc
Browse files Browse the repository at this point in the history
update cache handling
  • Loading branch information
rmendels committed Dec 11, 2022
1 parent 6299090 commit 1f35ad9
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 30 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: rerddapXtracto
Type: Package
Title: Extracts Environmental Data from 'ERDDAP' Web Services
Version: 1.1.3
Date: 2022-10-16
Version: 1.1.4
Date: 2022-12-13
Authors@R: c(
person("Roy", "Mendelssohn", email = "[email protected]", role = c("aut","cre")),
person("Marie", "Auger-Methe", role = "ctb")
Expand Down Expand Up @@ -44,7 +44,7 @@ Suggests:
maptools,
rgdal,
rmarkdown
RoxygenNote: 7.2.1
RoxygenNote: 7.2.3
Encoding: UTF-8
LazyData: TRUE
VignetteBuilder: knitr
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# rerddapXtracto 1.1.4

Cache use changes

# rerddapXtracto 1.1.3

Fixed minor bug in ploBBox example
Expand Down
1 change: 0 additions & 1 deletion R/data_extract_read.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ data_extract_read <- function(dataInfo, callDims, urlbase,
griddapCmd <- makeCmd(dataInfo, urlbase, xName, yName, zName, tName, parameter,
erddapXcoord, erddapYcoord, erddapTcoord, erddapZcoord,
verbose)
#print(griddapCmd)
# Get the data ------------------------------------------------------------

numtries <- 10
Expand Down
9 changes: 4 additions & 5 deletions R/rxtracto.R
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@
#' # extract <- rxtracto(dataInfo, parameter = parameter, xcoord = xcoord,
#' # ycoord = ycoord, tcoord= tcoord
#' # )
#' \donttest{
#' # 2-D example getting bathymetry
#' ##
#' ## bathymetry example
#' ## 2-D example getting bathymetry
#' dataInfo <- rerddap::info('etopo360')
#' parameter <- 'altitude'
#' extract <- rxtracto(dataInfo, parameter, xcoord = xcoord, ycoord = ycoord
#' )
#' }
#' # extract <- rxtracto(dataInfo, parameter, xcoord = xcoord, ycoord = ycoord)
#'


Expand Down
7 changes: 3 additions & 4 deletions R/rxtracto_3D.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@
#' # extract <- rxtracto_3D(dataInfo, parameter, xcoord = xcoord, ycoord = ycoord,
#' # tcoord = tcoord)
#'
#' \donttest{
#' # 2-D example getting bathymetry
#' ## bathymetry example
#' ## 2-D example getting bathymetry
#' dataInfo <- rerddap::info('etopo360')
#' parameter <- 'altitude'
#' extract <- rxtracto_3D(dataInfo, parameter, xcoord = xcoord, ycoord = ycoord)
#'}
#' # extract <- rxtracto_3D(dataInfo, parameter, xcoord = xcoord, ycoord = ycoord)
rxtracto_3D <- function(dataInfo, parameter = NULL, xcoord = NULL,
ycoord = NULL, zcoord = NULL, tcoord = NULL,
xName = 'longitude', yName = 'latitude',
Expand Down
8 changes: 4 additions & 4 deletions R/rxtractogon.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
#' ycoord <- mbnms$Latitude[1:3]
#' # sanctSST <- rxtractogon (dataInfo, parameter=parameter, xcoord = xcoord,
#' # ycoord = ycoord, tcoord= tcoord)
#' \donttest{
#' #
#' ## MBMS bathymetry example
#' xcoord <- mbnms$Longitude
#' ycoord <- mbnms$Latitude
#' dataInfo <- rerddap::info('etopo180')
#' parameter = 'altitude'
#' xName <- 'longitude'
#' yName <- 'latitude'
#' bathy <- rxtractogon (dataInfo, parameter = parameter, xcoord = xcoord,
#' ycoord = ycoord)
#' }
#' # bathy <- rxtractogon (dataInfo, parameter = parameter, xcoord = xcoord, ycoord = ycoord)

#' @section Details:
#' rxtractogon extracts the data from the smallest bounding box that contains
#' the polygon, and then uses the function "point.in.polygon" from the "sp"
Expand Down
4 changes: 4 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Version 1.1.4

Resolves problem of files in user's cache

## Version 1.1.3

Fixed CRAN check problem with ploBBox and plotTrack examples
Expand Down
9 changes: 4 additions & 5 deletions man/rxtracto.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions man/rxtracto_3D.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions man/rxtractogon.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1f35ad9

Please sign in to comment.