Skip to content

Commit

Permalink
Version 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rmendels committed Oct 24, 2020
1 parent e9903e7 commit 727559c
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 19 deletions.
4 changes: 2 additions & 2 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.0.0
Date: 2020-07-29
Version: 1.0.1
Date: 2020-10-23
Authors@R: person("Roy", "Mendelssohn", email = "[email protected]", role = c("aut","cre"))
Description: Contains three functions that access
environmental data from any 'ERDDAP' data web service. The rxtracto() function extracts
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# rerddapXtracto 1.0.1

Fixed bug in 'rxracto()' request date element of the return structure.

# rerddapXtracto 1.0.0

- Major changes in how 'rxtracto()' works.
Expand Down
2 changes: 1 addition & 1 deletion R/mbnms.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
#' \item{Longitude}{Longitudes of a boundary polygon}
#' \item{Latitude}{Latitudes of a boundary polygon}
#' }
#' @source \url{http://sanctuaries.noaa.gov/library/imast_gis.html}
#' @source \url{https://sanctuaries.noaa.gov/library/imast_gis.html}
"mbnms"
9 changes: 6 additions & 3 deletions R/rxtracto.R
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ rxtracto <- function(dataInfo, parameter = NULL, xcoord=NULL, ycoord = NULL,
paste0('median ', parameter),
paste0('mad ', parameter))
}
if (!is.null(working_coords$tcoord1)) {
out_dataframe[, 11] <- as.character.Date(tcoord)
}

# get unique time periods that actually will be called ..........

Expand Down Expand Up @@ -407,9 +410,9 @@ rxtracto <- function(dataInfo, parameter = NULL, xcoord=NULL, ycoord = NULL,
out_dataframe[ipos, 8] <- ymax
out_dataframe[ipos, 9] <- zmin
out_dataframe[ipos, 10] <- zmax
if (!is.null(working_coords$tcoord1)) {
out_dataframe[ipos, 11] <- as.character.Date(tcoord[i])
}
# if (!is.null(working_coords$tcoord1)) {
# out_dataframe[ipos, 11] <- as.character.Date(tcoord[i])
# }
out_dataframe[ipos, 12] <- stats::median(param, na.rm = TRUE)
out_dataframe[ipos, 13] <- stats::mad(param, na.rm = TRUE)

Expand Down
20 changes: 9 additions & 11 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
## update Version 1.0.0
## update Version 1.0.1

rewrite of 'rxtracto()' to improve speed
fixed warnings in CRAN tests
bug fix in return structure of 'rxtracto()'

## Test environments
* local OS X install, R 4.0.2
* local OS X install, R 4.0.3
* local Fedora-32 install, R 4.0.2
* rhub check_for_cran Windows
* winbuilder (devel and release)

## R CMD check result

On Mac OS X R 4.0.2 I get:
On Mac OS X R 4.0.3 I get:

Duration: 1m 58.8s
Duration: 2m 15.8s

0 errors ✓ | 0 warnings ✓ | 0 notes ✓

On Fedora-32, R 4.0.2, I get:

Duration: 4m 19.1s
Duration: 3m 20.8s

0 errors ✓ | 0 warnings ✓ | 0 notes ✓

Expand All @@ -29,10 +28,9 @@ On rhub Windows Server I get:
* checking examples ... NOTE
Examples with CPU (user + system) or elapsed time > 5s
user system elapsed
rxtracto 0.36 0.05 6.53
rxtracto_3D 0.11 0.02 5.78
rxtractogon 0.11 0.00 5.83

rxtracto 0.42 0.11 7.25
rxtracto_3D 0.13 0.00 6.42
rxtractogon 0.11 0.00 6.38


on winbuilder_release:
Expand Down
2 changes: 1 addition & 1 deletion man/mbnms.Rd

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

2 changes: 1 addition & 1 deletion vignettes/UsingrerddapXtracto.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ sodaPlot

### Irish Marine Institute {#hourly}

The Irish Marine Institute has an <span style="color:red">ERDDAP</span> server at https://erddap.marine.ie/erddap. Among other datasets, there is hourly output from a model of the North Atlantic ocean, with a variety of ocean related parameters, see https://erddap.marine.ie/erddap/griddap/IMI_NEATL.html. To obtain sea surface salinity at latest time available for the domain of the model:
The Irish Marine Institute has an <span style="color:red">ERDDAP</span> server at https://erddap.marine.ie/erddap/. Among other datasets, there is hourly output from a model of the North Atlantic ocean, with a variety of ocean related parameters, see https://erddap.marine.ie/erddap/griddap/IMI_NEATL.html. To obtain sea surface salinity at latest time available for the domain of the model:

```{r NAtlSSS, eval = FALSE, echo = TRUE}
require("rerddap")
Expand Down

0 comments on commit 727559c

Please sign in to comment.