Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #172 from nuest/master
Browse files Browse the repository at this point in the history
Bugfix release
  • Loading branch information
nuest authored Jun 10, 2020
2 parents ddecc41 + 4704d01 commit 061c3bb
Show file tree
Hide file tree
Showing 80 changed files with 660 additions and 474 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
release:
working_directory: ~/main
docker:
- image: rocker/geospatial:3.6.3
- image: rocker/geospatial:4.0.0
steps:
- devtoolscheck:
rversion: "3.6.3"
rversion: "4.0.0"

workflows:
version: 2
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@ vignettes/sos4R.toc
cache/
\.vscode/
revdep/

vignettes/figure/

vignettes/sos4R-vignette-10-egu-2020.log
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: sos4R
Type: Package
Title: Client for OGC Sensor Observation Services
Version: 0.4.0
Date: 2020-04-22
Version: 0.4.1
Date: 2020-06-09
Authors@R:
c(person(given = "Daniel",
family = "Nuest",
Expand Down
18 changes: 14 additions & 4 deletions DEV-README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# sos4R developer documentation

[![Build Status](https://travis-ci.org/52North/sos4R.png?branch=dev)](https://travis-ci.org/52North/sos4R)
[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/52North/sos4R?branch=dev&svg=true)](https://ci.appveyor.com/project/52North/sos4R)

<!-- TOC START min:2 max:4 link:true update:true -->
- [Requirements](#requirements)
- [Package structure](#package-structure)
Expand All @@ -20,11 +23,16 @@
<!-- part of this page previously published at https://wiki.52north.org/Geostatistics/Sos4R -->

This file contains information for developers of the [R](http://r-project.org/) package `sos4R`.
Documentation for users can be found in the package's vignette (see `browseVignettes("sos4R")`).
Documentation for users can be found in the package's vignettes (see `browseVignettes("sos4R")`).

sos4R is developed on GitHub using the [fork & pull development model](https://help.github.com/articles/using-pull-requests/#fork--pull).
The [main repository's issue tracker](https://github.com/52North/sos4R/issues) is used to coordinate development.

The `master` branch represents the current version that is [published on CRAN](https://CRAN.R-project.org/package=sos4R), the `dev` branch is the current development version.

## Requirements

* **System packages (e.g. on Ubuntu 18.04)**
* **System packages (e.g., on Ubuntu 18.04)**
* r-base-dev
* libxml2-dev
* libgdal-dev
Expand Down Expand Up @@ -67,6 +75,7 @@ You can also dive right in and join the chat room: [![Join the chat at https://g
- Bugfix versions can be used extensively (for several, or even just one bug) to show users that errors are resolved.
- Minor versions shall include several major bug fixes or a considerable addition of tested and working functionality.
- Code changes that possibly break existing code shall only be released with a major version change and should be discussed in the developer community beforehand.
- You can inspect the changes between releases very comfortably on the CRAN GitHub organization: [https://github.com/cran/sos4R/commits/master](https://github.com/cran/sos4R/commits/master)

Users may install the current development version or local branches using respective functions of [`devtools`](https://devtools.r-lib.org/).

Expand Down Expand Up @@ -185,6 +194,7 @@ Data models, i.e. requests and responses, are modelled as **S4 classes**. Docume
## Troubleshooting

- "non-ASCII characters" in a file > find them with `tools::showNonASCIIfile()`
- If there are problems with specific test environments, see the [CRAN Package Check Flavors](https://cran.r-project.org/web/checks/check_flavors.html) and the [list of R-Hub and CRAN platforms](https://docs.r-hub.io/#rhub-cran-platforms) if you must investigate or recreate on of these system configurations more closely

## Tests

Expand Down Expand Up @@ -235,7 +245,7 @@ A new release shall be uploaded to CRAN after testing and under the following pr
- Update version and date in `man/sos4R-package.Rd`
- Update version in `DESCRIPTION`
- Update version number in `NEWS.md`
- Create a PR from `dev` to `master` and check the CI status, fix all problems
- Create a PR from `dev` to `master` and check the CI status, fix all problems (for quick bugfix releases, you may create a PR from your fork or a bugfix branch straight to `master`)
- https://travis-ci.org/52North/sos4R
- https://ci.appveyor.com/project/52North/sos4r
- If there are problems with the `devel` release of R, you can use a local Docker container to run the checks while fixing them (from the path of the parten folder of `sos4R`): `docker run --rm -it -v $(pwd)/sos4R:/home/sos4R rocker/geospatial:devel bash`, switch to `/home`, then run the commands below (`R CMD build` & `check`)
Expand All @@ -245,7 +255,7 @@ A new release shall be uploaded to CRAN after testing and under the following pr
- `devtools::check_win_release()` and `devtools::check_win_devel()` for testing Windows using CRAN infrastructure
- `rhub::check_for_cran(email = <...>)` for testing for CRAN submissions using RHub infrastructure
- (optional) `rhub::check(email = <...>)` for running checks on different operating systems
- Regenerate the website with `pkgdown::build_site()` and re-knit `README.Rmd`, commit changes
- Regenerate the website with `options(rmarkdown.html_vignette.check_title = FALSE); pkgdown::build_site()` and re-knit `README.Rmd`, commit changes
- Push changes to `dev` branch
- Read and follow http://cran.r-project.org/web/packages/policies.html and http://r-pkgs.had.co.nz/release.html#release-check again, make necessary changes
- Merge the PR
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
---
title: sos4R News
---
# sos4R 0.4.1

- Bugfix release to fix checks on CRAN (after switch to R 4.0 and new projection strings from R-spatial packages)
- Update README according to https://wiki.52north.org/Documentation/GitHubProjectDocumentation

# sos4R 0.4.0

- Add support for SOS 2.0 operations: GetObservationById (KVP, POX), GetFeatureOfInterest (KVP, POX), DescribeSensor (KVP, POX)
Expand Down
109 changes: 81 additions & 28 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
output: github_document
---

<!-- README.md is generated from README.Rmd. Please edit that file -->
<!-- README.md is generated from README.Rmd. Please edit that file!
Also see the README guidelines at https://wiki.52north.org/Documentation/GitHubProjectDocumentation -->

```{r, echo = FALSE}
knitr::opts_chunk$set(
Expand All @@ -12,9 +13,7 @@ knitr::opts_chunk$set(
)
```

# sos4R - R client for OGC SOS

sos4R is an extension for the R environment for statistical computing and visualization. It allows to query data from standard conform SOS instances using simple R function calls and does no require any knowledge about the Sensor Web. It is easily extendible for new data models and opens the huge amount of analysis and visualization features of the R environment for the Sensor Web.
# sos4R

<!-- badges: start -->
[![cran checks](https://cranchecks.info/badges/summary/sos4R)](https://cran.r-project.org/web/checks/check_results_sos4R.html) [![Build Status](https://travis-ci.org/52North/sos4R.png)](https://travis-ci.org/52North/sos4R)
Expand All @@ -24,54 +23,108 @@ sos4R is an extension for the R environment for statistical computing and visual
[![Launch Rstudio Binder](http://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/52North/sos4R/master?urlpath=rstudio)
<!-- badges: end -->

## Documentation & Links
## Description

### R client for OGC SOS

**Easing the access to environmental time series data from an OGC Sensor Observation Service**

sos4R is an extension package of the R environment for statistical computing and visualization.
sos4R is [available on CRAN](https://CRAN.R-project.org/package=sos4R).
The user can use it to query data from standardized SOS instances (with specific consideration of the OGC SOS 2.0 Hydrology Profile) using simple R function calls.
It provides a convenience layer for R users to integrate observation data from SOS servers compliant with the SOS standard without any knowledge about the underlying OGC Sensor Web Enablement standards.

- **Website**: https://52north.github.io/sos4R
- CRAN: https://CRAN.R-project.org/package=sos4R
- Source code: https://github.com/52North/sos4R
- **Support**: [![Join the chat at https://gitter.im/52North/sos4R](https://badges.gitter.im/52North/sos4R.svg)](https://gitter.im/52North/sos4R)
- **Developer documentation:** https://52north.github.io/sos4R/DEV-README.html
- Open Hub: <https://www.openhub.net/p/sos4R>
### Features

## Development
**Key Technologies**

[![Build Status](https://travis-ci.org/52North/sos4R.png?branch=dev)](https://travis-ci.org/52North/sos4R)
[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/52North/sos4R?branch=dev&svg=true)](https://ci.appveyor.com/project/52North/sos4R)
- R Programming Language
- OGC Sensor Observation Service 2.0
- OGC WaterML 2.0
- OGC Observations and Measurements 2.0

sos4R is developed on GitHub using the [fork & pull development model](https://help.github.com/articles/using-pull-requests/#fork--pull).
The [main repository's issue tracker](https://github.com/52North/sos4R/issues) is used to coordinate development.
**Benefits**

The `master` branch represents the current version that is [published on CRAN](https://CRAN.R-project.org/package=sos4R), the `dev` branch is the current development version.
- Easier access to environmental time series data
- Automatic generation of SOS requests
- Result handling and parsing into standard R objects
- Convenience API: Data Science oriented functions to load data

See file `DEV-README.md` for developer documentation.
## Quick start

### Install the development version
```{r quickstart, eval = FALSE}
install.packages("sos4R")
library("sos4R")
You can install the current development version (= the next release for CRAN) directly from GitHub with the following commands.
# connect to SOS and request metadata
mySos <- SOS(url = "http://sensorweb.demo.52north.org/sensorwebtestbed/sos",
binding = "KVP", useDCPs = FALSE, version = "2.0.0")
# retrieve available phenomena and sites
phenomena <- phenomena(sos = mySos, includeSiteId = TRUE, includeTemporalBBox = TRUE)
phenomena
siteList(sos = mySos)
# retrieve data
getData(sos = mySos,
phenomena = phenomena[5,1],
sites = phenomena[5,2],
begin = as.POSIXct("2018-01-01"),
end = as.POSIXct("2018-01-3"))
```

```{r, eval = FALSE}
**Install the development version**

You can install the current development version (= the next release for CRAN) directly from GitHub:

```{r install_dev, eval = FALSE}
#install.packages("remotes")
remotes::install_github("52North/sos4R", ref = "dev")
```

### Contributors
## User guide

The project website is at [https://52north.github.io/sos4R](https://52north.github.io/sos4R).
You can also join the chat at [on Gitter](https://gitter.im/52North/sos4R) if you have any questions.

## Demo

sos4R can used to download observation data or build user interfaces for requesting and rendering time series observatoins.
The screenshot below shows a demo Shiny application, which you can run locally with

```{r demo, eval=FALSE}
shiny::runApp(appDir = file.path(path.package("sos4R"), "shiny"))
```

![sos4R Shiny app](https://blog.52north.org/wp-content/uploads/sites/2/2020/04/sos4r-vignette-10-egu-2020_shiny-app.jpg)

## Changelog

The latest changes, updates, bug fixes can be found in the package changelog at [https://52north.github.io/sos4R/news/](https://52north.github.io/sos4R/news/).

## References

sos4R is used in the following projects.

- MuDak-WRM, https://www.mudak-wrm.kit.edu/
- NIWA, https://niwa.co.nz/ (NIWA presented the project results at a dedicated [workshop at the FOSS4G SOTM Oceania 2019](https://2019.foss4g-oceania.org/schedule/2019-11-12?sessionId=NNWXKL))

## Credits

- [\@nuest](https://github.com/nuest)
- [\@edzer](https://github.com/edzer)
- [\@BenGraeler](https://github.com/BenGraeler)
- [\@bpross-52n](https://github.com/bpross-52n)
- [\@EHJ-52n](https://github.com/EHJ-52n)

sos4R is a project of [52°North Initiative for Geospatial Open Source Software](https://52north.org).

[![](https://52north.org/wp-content/uploads/2016/06/logo-main.png)](https://52north.org)
## Contribute

### Contact

Do you have a question that is not answered in the links above? Contact Daniel: [[email protected]]([email protected])
See file `DEV-README.md` for developer documentation or read the developer documentation online at [https://52north.github.io/sos4R/DEV-README.html](https://52north.github.io/sos4R/DEV-README.html).

## License

This R extension package is licensed under [GPL v2.0](https://tldrlegal.com/license/gnu-general-public-license-v2).

Documentation (e.g. vignette) is published under [CC BY 4.0](http://creativecommons.org/licenses/by/4.0/).

sos4R is a project of [52°North Initiative for Geospatial Open Source Software](https://52north.org).
Loading

0 comments on commit 061c3bb

Please sign in to comment.