Skip to content

Commit

Permalink
meteoland logo
Browse files Browse the repository at this point in the history
  • Loading branch information
miquelcaceres committed Jul 20, 2024
1 parent 0a8e39f commit 870d69e
Show file tree
Hide file tree
Showing 13 changed files with 1,079 additions and 34 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
vignettes/examples/*
data-raw/*
^docs/*$
^pkgdown$
^README\.Rmd$
^README\.md$
_pkgdown.yml
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ interpolator_test*
inst/doc
CRAN-SUBMISSION
revdep/
pkgdown/favicon/*
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LinkingTo: Rcpp
Encoding: UTF-8
NeedsCompilation: yes
VignetteBuilder: knitr
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Config/testthat/edition: 3
Config/testthat/parallel: true
Roxygen: list(markdown = TRUE)
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
NEWS for R Package "meteoland"
-------------------------------

# meteoland 2.2.1
- Correction of error caused by Rcpp bug

# meteoland 2.2.0
- New interpolation parameters for PET calculation (defaults compatible with previous versions)

Expand Down
28 changes: 20 additions & 8 deletions README.Rmd
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
---
title: "meteoland - Landscape meteorology tools"
output: github_document
editor_options:
markdown:
wrap: 72
---

```{r setup, echo = FALSE}
knitr::opts_chunk$set(collapse = TRUE, comment = "#>", fig.path = "README-")
knitr::opts_chunk$set(fig.path = "man/figures/")
```

# meteoland - Landscape meteorology tools <a href="https://emf-creaf.github.io/meteoland/"><img src="man/figures/logo.png" align="right" height="139" alt="meteoland website" /></a>

[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/meteoland)](https://cran.r-project.org/package=meteoland)
[![](https://cranlogs.r-pkg.org/badges/meteoland)](https://cran.rstudio.com/web/packages/meteoland/index.html)
[![R-CMD-check](https://github.com/emf-creaf/meteoland/workflows/R-CMD-check/badge.svg)](https://github.com/emf-creaf/meteoland/actions)
Expand Down Expand Up @@ -56,7 +57,7 @@ in De Cáceres et al. (2018).

## Package installation and documentation

Package `meteoland` can be found at [CRAN](https://cran.r-project.org/),
Package **meteoland** can be found at [CRAN](https://cran.r-project.org/),
but the version in this repository may not be the most recent one.
Latest stable versions can be downloaded and installed from GitHub as
follows (package `remotes` should be installed first):
Expand All @@ -74,23 +75,34 @@ remotes::install_github("emf-creaf/meteoland",
build_vignettes = TRUE)
```

Detailed documentation on `meteoland` calculation routines can be found
Detailed documentation on **meteoland** calculation routines can be found
at (<https://emf-creaf.github.io/meteolandbook/index.html>).

## Companion packages

During the development of `meteoland` some functions to download weather
### Package meteospain

During the development of **meteoland** some functions to download weather
station data from several Spanish networks were originally developed.
After `meteoland` version 1.0.1, the user is recommended to use package
After **meteoland** version 1.0.1, the user is recommended to use package
[**meteospain**](https://emf-creaf.github.io/meteospain/), which can
also be found at
[CRAN](https://cran.rstudio.com/web/packages/meteospain/index.html).
Functions to download weather station data are still available in
`meteoland` but they have been deprecated and make internal calls to
**meteoland** but they have been deprecated and make internal calls to
functions in package
[**meteospain**](https://emf-creaf.github.io/meteospain/).

The two R packages are developed and maintained by the [*Ecosystem
### Packages medfate and medfateland

Package **meteoland** has been designed to provide input weather data for simulations of forest function and dynamics via the following packages

+ Package [**medfate**](https://emf-creaf.github.io/medfate) provides functions for simulating forest function and dynamics.
+ Package [**medfateland**](https://emf-creaf.github.io/medfateland) extends **medfate** by allowing simulations to be performed in a spatially explicit context.

## Authorship

R package **meteoland** is developed and maintained by the [*Ecosystem
Modelling Facility*](https://emf.creaf.cat) at CREAF (Catalonia, Spain).

## References
Expand Down
47 changes: 32 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
meteoland - Landscape meteorology tools
================

# meteoland - Landscape meteorology tools <a href="https://emf-creaf.github.io/meteoland/"><img src="man/figures/logo.png" align="right" height="139" alt="meteoland website" /></a>

[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/meteoland)](https://cran.r-project.org/package=meteoland)
[![](https://cranlogs.r-pkg.org/badges/meteoland)](https://cran.rstudio.com/web/packages/meteoland/index.html)
Expand Down Expand Up @@ -49,10 +49,11 @@ in De Cáceres et al. (2018).

## Package installation and documentation

Package `meteoland` can be found at [CRAN](https://cran.r-project.org/),
but the version in this repository may not be the most recent one.
Latest stable versions can be downloaded and installed from GitHub as
follows (package `remotes` should be installed first):
Package **meteoland** can be found at
[CRAN](https://cran.r-project.org/), but the version in this repository
may not be the most recent one. Latest stable versions can be downloaded
and installed from GitHub as follows (package `remotes` should be
installed first):

``` r
remotes::install_github("emf-creaf/meteoland")
Expand All @@ -67,23 +68,39 @@ remotes::install_github("emf-creaf/meteoland",
build_vignettes = TRUE)
```

Detailed documentation on `meteoland` calculation routines can be found
at (<https://emf-creaf.github.io/meteolandbook/index.html>).
Detailed documentation on **meteoland** calculation routines can be
found at (<https://emf-creaf.github.io/meteolandbook/index.html>).

## Companion packages

During the development of `meteoland` some functions to download weather
station data from several Spanish networks were originally developed.
After `meteoland` version 1.0.1, the user is recommended to use package
[**meteospain**](https://emf-creaf.github.io/meteospain/), which can
also be found at
### Package meteospain

During the development of **meteoland** some functions to download
weather station data from several Spanish networks were originally
developed. After **meteoland** version 1.0.1, the user is recommended to
use package [**meteospain**](https://emf-creaf.github.io/meteospain/),
which can also be found at
[CRAN](https://cran.rstudio.com/web/packages/meteospain/index.html).
Functions to download weather station data are still available in
`meteoland` but they have been deprecated and make internal calls to
**meteoland** but they have been deprecated and make internal calls to
functions in package
[**meteospain**](https://emf-creaf.github.io/meteospain/).

The two R packages are developed and maintained by the [*Ecosystem
### Packages medfate and medfateland

Package **meteoland** has been designed to provide input weather data
for simulations of forest function and dynamics via the following
packages

- Package [**medfate**](https://emf-creaf.github.io/medfate) provides
functions for simulating forest function and dynamics.
- Package [**medfateland**](https://emf-creaf.github.io/medfateland)
extends **medfate** by allowing simulations to be performed in a
spatially explicit context.

## Authorship

R package **meteoland** is developed and maintained by the [*Ecosystem
Modelling Facility*](https://emf.creaf.cat) at CREAF (Catalonia, Spain).

## References
Expand Down
33 changes: 24 additions & 9 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
url: https://emf-creaf.github.io/meteoland/

template:
bootstrap: 5
bslib:
bootswatch: materia
pkgdown-nav-height: 100px
primary: "#241F1C"

home:
links:
- text: Reference book
href: https://emf-creaf.github.io/meteolandbook/index.html

articles:
- title: Using meteoland
contents:
- starts_with("tidy-meteoland")
- starts_with("reshaping-meteo")

- title: Examples
contents:
- starts_with("examples/interpolation-senegal")

navbar:
components:
articles:
text: Articles
menu:
- text: Using meteoland
- text: Tidy meteoland
href: articles/tidy-meteoland.html
- text: Reshaping meteorological data for meteoland
href: articles/reshaping-meteo.html
- text: -------
- text: Examples
- text: Daily weather interpolation over Senegal
href: articles/examples/interpolation-senegal.html

reference:
- title: Daily weather interpolation
desc: Functions for daily weather interpolation
Expand Down
11 changes: 11 additions & 0 deletions data-raw/hex_logo.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
library(hexSticker)

logo_image <- fs::path("data-raw", "meteoland_logo_image.png")
sticker(
logo_image,
package = "meteoland", p_size = 16, p_y = 1.60, p_color = "#D4AA00",
s_x = 0.98, s_y = .75, s_width = .75,
filename = fs::path("data-raw", "meteoland.png"),
# url = "emf.creaf.cat", u_size = 6, u_color = "#BFD77A", u_y = .2, u_x = 1.2,
h_fill = "#6C5d53", h_color = "#D4AA00"
)
Binary file added data-raw/meteoland.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data-raw/meteoland_logo_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 870d69e

Please sign in to comment.