Skip to content

Commit

Permalink
CRAN Version 1.2.0
Browse files Browse the repository at this point in the history
rxtracto() now works with projected data
utility to convert rxtracto_3D() output to long form
  • Loading branch information
rmendels committed Jan 12, 2024
1 parent 989bff7 commit a1e2718
Show file tree
Hide file tree
Showing 36 changed files with 525 additions and 117 deletions.
10 changes: 6 additions & 4 deletions DESCRIPTION
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Package: rerddapXtracto
Type: Package
Title: Extracts Environmental Data from 'ERDDAP' Web Services
Version: 1.1.7
Date: 2023-10-18
Version: 1.2.0
Date: 2024-1-12
Authors@R: c(
person("Roy", "Mendelssohn", email = "[email protected]", role = c("aut","cre")),
person("Marie", "Auger-Methe", role = "ctb")
)
person("Marie", "Auger-Methe", role = "ctb"),
person("Sunny", "Bak-Hospital", role = "ctb")
)
Description: Contains three functions that access
environmental data from any 'ERDDAP' data web service. The rxtracto() function extracts
data along a trajectory for a given "radius" around the point. The
Expand Down Expand Up @@ -40,6 +41,7 @@ Suggests:
cmocean,
gganimate,
knitr,
lubridate,
mapdata,
rmarkdown
RoxygenNote: 7.2.3
Expand Down
Binary file added Meta/vignette.rds
Binary file not shown.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# rerddapXtracto 1.2.0

'rxtracto()' now works in coordinate space for projected data

# rerddapXtracto 1.1.7

removed archived packages maptools and rgdal from Suggests
Expand Down
18 changes: 18 additions & 0 deletions R/PB_Argos.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#' Polar Bear Track Data
#'
#' Telemetry data of a tagged polar bear
#'
#'@format A data frame with 1919 obs. of 4 variables:
#' \describe{
#' \item{DateTime}{time of observation}
#' \item{QualClass}{Quality Flag}
#' \item{Lat}{latitude of observation}
#' \item{Lon}{longitude of observation}
#' }
#' @source
#' \describe{
#' \item{dryad dataset}{https://datadryad.org/stash/dataset/doi:10.5061/dryad.4qrfj6q96}
#' \item{Citation}{Auger-Méthé, Marie; Derocher, Andrew E. (2021). Argos and GPS data for a polar bear track [Dataset]. Dryad. https://doi.org/10.5061/dryad.4qrfj6q96}
#' \item{Associated Paper}{Auger-Méthé, M., Newman, K., Cole, D., Empacher, F., Gryba, R., King, A. A., Leos-Barajas, V., Mills Flemming, J., Nielsen, A., Petris, G., and Thomas, L.. 2021. A guide to state–space modeling of ecological time series. Ecological Monographs 91(4):e01470. 10.1002/ecm.1470}
#' }
"PB_Argos"
28 changes: 28 additions & 0 deletions R/cmocean.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#' cmocean colors
#' The cmocean color palette by Kristen Thyng
#'
#' str(cmocean)
#' List of 22
#' $ algae
#' $ amp
#' $ balance
#' $ curl
#' $ deep
#' $ delta
#' $ dense
#' $ diff
#' $ gray
#' $ haline
#' $ ice
#' $ matter
#' $ oxy
#' $ phase
#' $ rain
#' $ solar
#' $ speed
#' $ tarn
#' $ tempo
#' $ topo
#' $ thermal
#' $ turbid
"cmocean"
19 changes: 19 additions & 0 deletions R/colors.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#' cmocean colors
#' The cmocean color palette by Kristen Thyng as implemented in the R package "oce"
#'
#' str(colors)
#' List of 13
#' $ viridis
#' $ cdom
#' $ chlorophyll
#' $ density
#' $ freesurface
#' $ oxygen
#' $ par
#' $ phase
#' $ salinity
#' $ temperature
#' $ turbidity
#' $ velocity
#' $ vorticity
"colors"
7 changes: 6 additions & 1 deletion R/rxtracto.R
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,12 @@ rxtracto <- function(dataInfo, parameter = NULL, xcoord=NULL, ycoord = NULL,


}
out_dataframe <- structure(out_dataframe, class = c('list', 'rxtractoTrack'))
out_dataframe <- structure(out_dataframe,
class = c('list', 'rxtractoTrack'),
base_url = urlbase,
datasetid = attributes(dataInfo)$datasetid

)
if (progress_bar) {
close(pb)
}
Expand Down
6 changes: 5 additions & 1 deletion R/rxtracto_3D.R
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,11 @@ if (!is.list(extract)) {
return("URL call error")
}

extract <- structure(extract, class = c('list', 'rxtracto3D'))
extract <- structure(extract,
class = c('list', 'rxtracto3D'),
base_url = urlbase,
datasetid = attributes(dataInfo)$datasetid
)

}

7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# rerddapXtracto (Version 1.1.6)
# rerddapXtracto (Version 1.2.0)
rerddapXtracto - R package for accessing environmental data using 'rerddap'

******
`rxtracto()`now works in coordinate space for projected data
******


******
`tidy_grid()`function to convert result of 'rxtracto_3D()' or 'rxtractogon()' to "tidy"" long-format
******
Expand Down
7 changes: 4 additions & 3 deletions cran-comments.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## Version 1.1.7
## Version 1.2.7

'rxtracto()' now works in coordinate space for projected data

removed maptools and rgdal from Suggests

## Test environments
* local OS X install, R 4.3.1
* local OS X install, R 4.3.2
* rhub
* win-buider
* mac-builder
Expand Down
Binary file added data/Marlintag38606.rda
Binary file not shown.
Binary file added data/PB_Argos.RData
Binary file not shown.
Binary file added data/cmocean.RData
Binary file not shown.
Binary file added data/colors.rda
Binary file not shown.
Empty file modified data/mbnms.RData
100755 → 100644
Empty file.
Binary file added data/mbnms.rda
Binary file not shown.
Empty file modified data/swchl.RData
100755 → 100644
Empty file.
29 changes: 29 additions & 0 deletions man/PB_Argos.Rd

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

44 changes: 44 additions & 0 deletions man/checkBounds.Rd

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

38 changes: 38 additions & 0 deletions man/cmocean.Rd

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

29 changes: 29 additions & 0 deletions man/colors.Rd

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

33 changes: 33 additions & 0 deletions man/getfileCoords.Rd

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

32 changes: 32 additions & 0 deletions man/make180.Rd

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

32 changes: 32 additions & 0 deletions man/make360.Rd

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

Loading

0 comments on commit a1e2718

Please sign in to comment.