Skip to content

Commit

Permalink
prep CRAN release 1.1.0 m
Browse files Browse the repository at this point in the history
  • Loading branch information
MiKatt committed May 11, 2018
1 parent a560b1b commit 791bb63
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 30 deletions.
3 changes: 1 addition & 2 deletions R/setup_grass_environment.R
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ setup_grass_environment <- function(dem, epsg = NULL, sites = NULL) {
message("Setting up GRASS Environment ...\n")

if(!is.null(sites))
message("'sites' is no longe a parameter of set_up_grass (see help).
The function will still execute normally. Please update your code.")
message("'sites' is no longe a parameter of set_up_grass (see help). \nThe function will still execute normally. Please update your code.")

dem_raster <- raster::raster(dem)
#dem_proj <- raster::projection(dem_raster)
Expand Down
9 changes: 3 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "cran-comments.md"
author: "Mira Kattwinkel"
date: "May 9, 2018"
date: "May 11, 2018"
output: html_document
---

Expand All @@ -15,7 +15,7 @@ now starting with a capital letter:

## Test environments
* Linux Mint 18.2 Sonya, R 3.4.1
* Windows 7, R 3.4.1
* Windows 7, R 3.5.0
* win-builder (devel and release)

## R CMD check results
Expand All @@ -28,13 +28,10 @@ Maintainer: 'Mira Kattwinkel <[email protected]>'
This is a stable e-mail address and the spam filter set to let through e-mails
from the domain r-project.org.

Notes on 'no visible binding for global variable' for (static) data.table column
names are prevented by including them as utils::globalVariables.

Some examples take quite a while to run (> 5s) because they all contain the full
workflow of loading and processing GIS files to be stand-alone examples.

## Downstream dependencies
There are no downstream dependencies as this is the first release of the package.
All downstream dependencies have been checked.


25 changes: 3 additions & 22 deletions vignettes/Warnings_and_Errors.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,6 @@ knitr::opts_chunk$set(
)
```

```{r eval = TRUE, echo = FALSE, results = 'hide', message = FALSE}
library(openSTARS)
if(.Platform$OS.type == "windows"){
gisbase = "c:/Program Files/GRASS GIS 7.4.0"
} else {
gisbase = "/usr/lib/grass74/"
}
initGRASS(gisBase = gisbase,
home = tempdir(),
override = TRUE)
# Load files into GRASS
dem_path <- system.file("extdata", "nc", "elev_ned_30m.tif", package = "openSTARS")
sites_path <- system.file("extdata", "nc", "sites_nc.shp", package = "openSTARS")
setup_grass_environment(dem = dem_path)
```


## Error when running the examples
**_Problem_** Error message in R console when running `import_data`on the examples files.

Expand All @@ -59,10 +41,9 @@ editing. Replace all empty cells with an arbitrary integer value. Save and close
## Message in setup_grass_environment()
**_Problem_** Message in R console when setting up the GRASS environment:

```{r setup, error = TRUE, eval = TRUE, message = TRUE, warning = TRUE}
pred_path <- system.file("extdata", "nc", "landuse.shp", package = "openSTARS")
setup_grass_environment(dem = dem_path, sites = sites_path)
```
`
'sites' is no longe a parameter of set_up_grass (see help). The function will still execute normally. Please update your code.
`

The function `setup_grass_environment` has been updated; the `sites` parameter is deprecated.

Expand Down

0 comments on commit 791bb63

Please sign in to comment.