Skip to content

Commit

Permalink
Merge pull request #81 from rOpenSpain/ghaction
Browse files Browse the repository at this point in the history
Update GH actions
  • Loading branch information
dieghernan authored Oct 27, 2022
2 parents ecf2073 + ffc4616 commit fdc80de
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 56 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/pkgdown-gh-pages-clean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,8 @@ jobs:
IamKDO/GADMTools
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, run_dont_run = TRUE, clean = TRUE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
- name: Deploy package
run: |
git config --local user.name "dieghernan"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, clean = TRUE, run_dont_run = TRUE)'
17 changes: 6 additions & 11 deletions .github/workflows/rostemplate-gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,9 @@ jobs:
IamKDO/GADMTools
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, run_dont_run = TRUE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
- name: Deploy package
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)'
17 changes: 5 additions & 12 deletions .github/workflows/update-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,8 @@ jobs:
- uses: r-lib/actions/check-r-package@v2

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, run_dont_run = TRUE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs

- name: Deploy package
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)'
19 changes: 6 additions & 13 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0003-2042-7063
year: '2022'
url: https://CRAN.R-project.org/package=countrycode
url: https://vincentarelbundock.github.io/countrycode/
version: '>= 1.2.0'
- type: software
title: giscoR
Expand All @@ -105,7 +105,6 @@ references:
orcid: https://orcid.org/0000-0001-8457-4658
affiliation: rOpenGov
year: '2022'
url: https://CRAN.R-project.org/package=giscoR
version: '>= 0.2.4'
- type: software
title: rappdirs
Expand All @@ -120,7 +119,6 @@ references:
- family-names: Davis
given-names: Trevor
year: '2022'
url: https://CRAN.R-project.org/package=rappdirs
version: '>= 0.3.0'
- type: software
title: sf
Expand All @@ -132,7 +130,6 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-8049-7069
year: '2022'
url: https://CRAN.R-project.org/package=sf
version: '>= 0.9.0'
- type: software
title: utils
Expand Down Expand Up @@ -179,7 +176,6 @@ references:
given-names: Dewey
orcid: https://orcid.org/0000-0002-9415-4582
year: '2022'
url: https://CRAN.R-project.org/package=ggplot2
version: '>= 3.0.0'
- type: software
title: knitr
Expand All @@ -191,7 +187,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0003-0645-5666
year: '2022'
url: https://CRAN.R-project.org/package=knitr
url: https://yihui.org/knitr/
- type: software
title: leaflet
abstract: 'leaflet: Create Interactive Web Maps with the JavaScript ''Leaflet''
Expand All @@ -206,7 +202,7 @@ references:
- family-names: Xie
given-names: Yihui
year: '2022'
url: https://CRAN.R-project.org/package=leaflet
url: https://rstudio.github.io/leaflet/
version: '>= 2.0.0'
- type: software
title: png
Expand All @@ -217,7 +213,7 @@ references:
given-names: Simon
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=png
url: http://www.rforge.net/png/
version: '>= 0.1-5'
- type: software
title: rmarkdown
Expand Down Expand Up @@ -257,7 +253,6 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0003-3925-190X
year: '2022'
url: https://CRAN.R-project.org/package=rmarkdown
- type: software
title: slippymath
abstract: 'slippymath: Slippy Map Tile Tools'
Expand All @@ -271,7 +266,7 @@ references:
given-names: Michael
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=slippymath
url: https://www.github.com/milesmcbain/slippymath
version: '>= 0.3.1'
- type: software
title: terra
Expand All @@ -283,7 +278,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-5872-2872
year: '2022'
url: https://CRAN.R-project.org/package=terra
url: https://rspatial.org/terra/
version: '>= 1.1-4'
- type: software
title: testthat
Expand All @@ -294,7 +289,6 @@ references:
given-names: Hadley
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=testthat
version: '>= 3.0.0'
- type: software
title: tidyterra
Expand All @@ -307,4 +301,3 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-8457-4658
year: '2022'
url: https://CRAN.R-project.org/package=tidyterra
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ install_github("rOpenSpain/mapSpain", dependencies = TRUE)
This script highlights some features of **mapSpain** :

``` r

library(mapSpain)

census <- mapSpain::pobmun19
Expand Down Expand Up @@ -121,6 +122,7 @@ ggplot(CCAA_sf) +
You can combine `sf` objects with static tiles

``` r

# Get census
census <- mapSpain::pobmun19
census$porc_women <- census$women / census$pob19
Expand All @@ -139,8 +141,7 @@ shape_pop <- merge(shape,
tile <-
esp_getTiles(shape_pop,
type = "IGNBase.Todo",
zoom = 10,
bbox_expand = .1
zoommin = 1
)

# Plot
Expand Down Expand Up @@ -187,6 +188,7 @@ installed as a dependency when you installed **mapSpain**. A basic
example:

``` r

library(giscoR)

# Set the same resolution for a perfect fit
Expand Down Expand Up @@ -248,11 +250,11 @@ it will load it, speeding up the process.

Some packages recommended for visualization are:

- [**tmap**](https://github.com/r-tmap/tmap)
- [**mapsf**](https://riatelab.github.io/mapsf/)
- [**ggplot2**](https://github.com/tidyverse/ggplot2) +
[**ggspatial**](https://github.com/paleolimbot/ggspatial)
- [**leaflet**](https://rstudio.github.io/leaflet/)
- [**tmap**](https://github.com/r-tmap/tmap)
- [**mapsf**](https://riatelab.github.io/mapsf/)
- [**ggplot2**](https://github.com/tidyverse/ggplot2) +
[**ggspatial**](https://github.com/paleolimbot/ggspatial)
- [**leaflet**](https://rstudio.github.io/leaflet/)

## Citation

Expand All @@ -267,7 +269,7 @@ A BibTeX entry for LaTeX users is:
@Manual{R-mapspain,
title = {{mapSpain}: Administrative Boundaries of Spain},
year = {2022},
version = {0.6.2},
version = {0.6.2.9000},
author = {Diego Hernangómez},
doi = {10.5281/zenodo.5366622},
url = {https://ropenspain.github.io/mapSpain/},
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"applicationCategory": "cartography",
"isPartOf": "https://ropenspain.es/",
"keywords": ["rOpenSpain", "tiles", "r", "maps", "spatial", "rstats", "r-package", "municipalities", "Spain", "gisco", "provinces", "ign", "administrative-boundaries", "ccaa", "static-tiles", "spain", "cran", "ropenspain", "ggplot2", "gis"],
"fileSize": "2622.307KB",
"fileSize": "2623.437KB",
"citation": [
{
"@type": "SoftwareSourceCode",
Expand Down
Binary file modified data/esp_codelist.rda
Binary file not shown.
Binary file modified data/leaflet.providersESP.df.rda
Binary file not shown.
Binary file modified img/README-giscoR-1.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 modified img/README-tile-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fdc80de

Please sign in to comment.