From a3d2db87f7cda0edae72747aee212f8f338f958e Mon Sep 17 00:00:00 2001 From: Konstantinos Vantas Date: Sun, 21 Mar 2021 16:26:20 +0200 Subject: [PATCH] check urls --- .travis.yml | 1 - NEWS.md | 8 +++++++- README.Rmd | 8 +++----- README.md | 14 ++++---------- cran-comments.md | 6 +++--- docs/articles/intro_hydroscoper.html | 20 ++++++++++---------- docs/articles/stations_with_data.html | 2 +- docs/index.html | 11 +++-------- docs/news/index.html | 11 ++++++++++- docs/pkgdown.yml | 2 +- vignettes/intro_hydroscoper.Rmd | 18 +++++++++--------- 11 files changed, 51 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75a2975..ba74cdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ os: - linux - - osx language: R sudo: false diff --git a/NEWS.md b/NEWS.md index b41c873..2a9ce37 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,12 @@ +# hydroscoper 1.4 (Release date: 2021-03-20) + +* Fail gracefully with an informative message if the hydroscope site is not + available or has changed +* Update dependencies + # hydroscoper 1.3 (Release date: 2020-07-03) -* update dependencies +* Update dependencies # hydroscoper 1.2 (Release date: 2019-06-02) diff --git a/README.Rmd b/README.Rmd index b2e0959..d5b1221 100644 --- a/README.Rmd +++ b/README.Rmd @@ -32,9 +32,9 @@ chk_online <- online("kyy.hydroscope.gr") [![codecov](https://codecov.io/github/ropensci/hydroscoper/branch/master/graphs/badge.svg)](https://codecov.io/gh/ropensci/hydroscoper) [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.4-6666ff.svg)](https://cran.r-project.org/) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/hydroscoper)](https://cran.r-project.org/package=hydroscoper) -[![packageversion](https://img.shields.io/badge/Package%20version-1.3-orange.svg?style=flat-square)](https://github.com/ropensci/hydroscoper) +[![packageversion](https://img.shields.io/badge/Package%20version-1.4-orange.svg?style=flat-square)](https://github.com/ropensci/hydroscoper) [![](https://cranlogs.r-pkg.org/badges/grand-total/hydroscoper)](https://cran.r-project.org/package=hydroscoper) -[![ropensci](https://badges.ropensci.org/185_status.svg)](https://github.com/ropensci/onboarding/issues/185) +[![ropensci](https://badges.ropensci.org/185_status.svg)](https://github.com/ropensci/software-review/issues/185) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1196540.svg)](https://doi.org/10.5281/zenodo.1196540) [![DOI](http://joss.theoj.org/papers/10.21105/joss.00625/status.svg)](https://doi.org/10.21105/joss.00625) @@ -78,7 +78,7 @@ The data sets that are provided by `hydroscoper` are: ## Example -This is a minimal example which shows how to get the station's [200200](http://kyy.hydroscope.gr/stations/d/200200/) precipitation time series [56](http://kyy.hydroscope.gr/timeseries/d/56/) from the [kyy](http://kyy.hydroscope.gr) sub-domain. +This is a minimal example which shows how to get the station's *200200* precipitation time series *56* from the *kyy* sub-domain. Load libraries and get data: @@ -127,7 +127,5 @@ number = {23}, journal = {The Journal of Open Source Software} } ``` -## References -[Hydroscope](http://www.hydroscope.gr/) [![ropensci_footer](http://ropensci.org/public_images/github_footer.png)](https://ropensci.org) diff --git a/README.md b/README.md index 8dc3a08..0179e13 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ Status](https://ci.appveyor.com/api/projects/status/github/ropensci/hydroscoper? [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.4-6666ff.svg)](https://cran.r-project.org/) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/hydroscoper)](https://cran.r-project.org/package=hydroscoper) -[![packageversion](https://img.shields.io/badge/Package%20version-1.3-orange.svg?style=flat-square)](https://github.com/ropensci/hydroscoper) +[![packageversion](https://img.shields.io/badge/Package%20version-1.4-orange.svg?style=flat-square)](https://github.com/ropensci/hydroscoper) [![](https://cranlogs.r-pkg.org/badges/grand-total/hydroscoper)](https://cran.r-project.org/package=hydroscoper) -[![ropensci](https://badges.ropensci.org/185_status.svg)](https://github.com/ropensci/onboarding/issues/185) +[![ropensci](https://badges.ropensci.org/185_status.svg)](https://github.com/ropensci/software-review/issues/185) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1196540.svg)](https://doi.org/10.5281/zenodo.1196540) [![DOI](http://joss.theoj.org/papers/10.21105/joss.00625/status.svg)](https://doi.org/10.21105/joss.00625) @@ -67,10 +67,8 @@ The data sets that are provided by `hydroscoper` are: ## Example -This is a minimal example which shows how to get the station’s -[200200](http://kyy.hydroscope.gr/stations/d/200200/) precipitation time -series [56](http://kyy.hydroscope.gr/timeseries/d/56/) from the -[kyy](http://kyy.hydroscope.gr) sub-domain. +This is a minimal example which shows how to get the station’s *200200* +precipitation time series *56* from the *kyy* sub-domain. Load libraries and get data: @@ -123,8 +121,4 @@ or the BibTeX entry: journal = {The Journal of Open Source Software} } -## References - -[Hydroscope](http://www.hydroscope.gr/) - [![ropensci\_footer](http://ropensci.org/public_images/github_footer.png)](https://ropensci.org) diff --git a/cran-comments.md b/cran-comments.md index 1cb74be..632a5b3 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,9 +1,9 @@ ## Test environments -* local Mac OS X install, R 3.6.2 +* local Mac OS X install, R 4.0.3 * travis.ci Linux, x64, R 3.5.0 -* travis.ci Mac OS X, R 3.5.0 -* ci.appveyor, R 3.5.0 +* ci.appveyor, R 4.0.4 * win-builder (devel and release) +* check-rhub ## R CMD check results There were no ERRORs or WARNINGs. diff --git a/docs/articles/intro_hydroscoper.html b/docs/articles/intro_hydroscoper.html index 4ac648b..9f225cc 100644 --- a/docs/articles/intro_hydroscoper.html +++ b/docs/articles/intro_hydroscoper.html @@ -89,7 +89,7 @@

An introduction to hydroscoper

Konstantinos Vantas

-

2021-03-20

+

2021-03-21

Source: vignettes/intro_hydroscoper.Rmd @@ -101,7 +101,7 @@

2021-03-20

What is Hydroscope?

-

Hydroscope is the Greek National Data Bank for Hydrological and Meteorological Information, a result of long-standing efforts by numerous Greek scientists in collaboration with various companies and associations. It was implemented in three phases, funded by the Ministry of Development, the Ministry of Environment and Energy and the European Union.

+

Hydroscope is the Greek National Data Bank for Hydrological and Meteorological Information, a result of long-standing efforts by numerous Greek scientists in collaboration with various companies and associations. It was implemented in three phases, funded by the Ministry of Development, the Ministry of Environment and Energy and the European Union.

This National Data Bank provides several data sources from various organisations via a web interface. Each participating organisation keeps its data on its own server using a database system for the storage and management of information. These organisations are:

diff --git a/docs/news/index.html b/docs/news/index.html index 7f94c5e..ac11cd6 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -129,12 +129,21 @@

Changelog

Source: NEWS.md
+
+

+hydroscoper 1.4 (Release date: 2021-03-20) Unreleased +

+ +

hydroscoper 1.3 (Release date: 2020-07-03) 2020-03-07

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 8a06a77..d9ed0cb 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -4,5 +4,5 @@ pkgdown_sha: ~ articles: intro_hydroscoper: intro_hydroscoper.html stations_with_data: stations_with_data.html -last_built: 2021-03-20T20:52Z +last_built: 2021-03-21T14:15Z diff --git a/vignettes/intro_hydroscoper.Rmd b/vignettes/intro_hydroscoper.Rmd index f3f9958..7681702 100644 --- a/vignettes/intro_hydroscoper.Rmd +++ b/vignettes/intro_hydroscoper.Rmd @@ -31,7 +31,7 @@ chk_online <- online("kyy.hydroscope.gr") ## What is Hydroscope? -[Hydroscope](http://www.hydroscope.gr/) is the Greek National Data Bank for Hydrological and Meteorological Information, a result of long-standing efforts by numerous Greek scientists in collaboration with various companies and associations. It was implemented in three phases, funded by the Ministry of Development, the Ministry of Environment and Energy and the European Union. +`Hydroscope` is the Greek National Data Bank for Hydrological and Meteorological Information, a result of long-standing efforts by numerous Greek scientists in collaboration with various companies and associations. It was implemented in three phases, funded by the Ministry of Development, the Ministry of Environment and Energy and the European Union. This National Data Bank provides several data sources from various organisations via a web interface. Each participating organisation keeps its data on its own server using a database system for the storage and management of information. These organisations are: @@ -46,13 +46,13 @@ The above data are structured as tables and space separated text files, but are ## What does `hydroscoper`? -`hydroscoper` provides functionality for automatic retrieval and translation of Hydroscope's data to English. The main functions that can be utilized is the family of functions, `get_stations`, `get_timeseries`, `get_data`, etc., to easily download Hydroscope's data as [tibbles](http://tibble.tidyverse.org/). +`hydroscoper` provides functionality for automatic retrieval and translation of Hydroscope's data to English. The main functions that can be utilized is the family of functions, `get_stations`, `get_timeseries`, `get_data`, etc., to easily download Hydroscope's data as `tibbles`. -The package covers Hydroscope's data sources using the Enhydris API. The Enhydris database is implemented in PostgreSQL and details about the database can be found [here](http://bit.ly/2D0cZgA), and about the Web-service API [here](http://bit.ly/2FlRtBB). +The package covers Hydroscope's data sources using the Enhydris API. The Enhydris database is implemented in PostgreSQL and details about the about the Web-service API [here](http://enhydris.readthedocs.io). ### Internal datasets -The internal datasets of the package can be used to run queries on the available Hydroscope's stations and time series data, reducing the time needed for downloading and [data wrangling](http://bit.ly/1KslZb7), as these data are rarely modified. These datasets are: +The internal datasets of the package can be used to run queries on the available Hydroscope's stations and time series data, reducing the time needed for downloading and data wrangling, as these data are rarely modified. These datasets are: #### `stations` @@ -63,8 +63,8 @@ It is a comprehensive look-up table with geographical and ownership information 3. `water_basin` The station's Water Basin. 4. `water_division` The station's Water Division. 5. `owner` The station's owner. - 6. `longitude` The station's longitude in decimal degrees, [ETRS89](http://bit.ly/2kJwFuf). - 7. `latitude` The station's latitude in decimal degrees, [ETRS89](http://bit.ly/2kJwFuf). + 6. `longitude` The station's longitude in decimal degrees, (ETRS89). + 7. `latitude` The station's latitude in decimal degrees, (ETRS89). 8. `altitude` The station's altitude, meters above sea level. 9. `subdomain` The corresponding Hydroscope's database. @@ -98,7 +98,7 @@ Note that: ## Example -This is a basic example which shows how to get the stations' and time series' data from the Hydroscope's Ministry of Environment and Energy database, http://kyy.hydroscope.gr/. +This is a basic example which shows how to get the stations' and time series' data from the Hydroscope's Ministry of Environment and Energy database, `http://kyy.hydroscope.gr/`. Load libraries: @@ -138,14 +138,14 @@ ggplot() + ``` -To get the time series' data for the station `200200` (http://kyy.hydroscope.gr/stations/d/200200/) we can use: +To get the time series' data for the station `200200` we can use: ```{r subset_timeseries, eval = chk_online} station_ts <- subset(timeseries, station_id == 200200) station_ts ``` -We can download the station's precipitation time series **56** (http://kyy.hydroscope.gr/timeseries/d/56/): +We can download the station's precipitation time series **56**: ``` {r get_timeseries, eval = chk_online} ts_raw <- get_data(subdomain = "kyy", time_id = 56)