diff --git a/.github/workflows/pkgdown-gh-pages-clean.yaml b/.github/workflows/pkgdown-gh-pages-clean.yaml index 23107175..60902491 100644 --- a/.github/workflows/pkgdown-gh-pages-clean.yaml +++ b/.github/workflows/pkgdown-gh-pages-clean.yaml @@ -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/github-pages-deploy-action@v4.4.1 - with: - clean: false - branch: gh-pages - folder: docs + - name: Deploy package + run: | + git config --local user.name "dieghernan" + git config --local user.email "dieghernan@users.noreply.github.com" + Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, clean = TRUE, run_dont_run = TRUE)' diff --git a/.github/workflows/rostemplate-gh-pages.yaml b/.github/workflows/rostemplate-gh-pages.yaml index bf7b05a1..d507c513 100644 --- a/.github/workflows/rostemplate-gh-pages.yaml +++ b/.github/workflows/rostemplate-gh-pages.yaml @@ -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/github-pages-deploy-action@v4.4.1 - with: - clean: false - branch: gh-pages - folder: docs + - name: Deploy package + run: | + git config --local user.name "$GITHUB_ACTOR" + git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" + Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)' + diff --git a/.github/workflows/update-docs.yaml b/.github/workflows/update-docs.yaml index 2ff49a1b..79c5554a 100644 --- a/.github/workflows/update-docs.yaml +++ b/.github/workflows/update-docs.yaml @@ -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/github-pages-deploy-action@v4.4.1 - with: - clean: false - branch: gh-pages - folder: docs - + - name: Deploy package + run: | + git config --local user.name "$GITHUB_ACTOR" + git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" + Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)' diff --git a/CITATION.cff b/CITATION.cff index a8605ed3..42ee37fd 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -92,7 +92,7 @@ references: email: vincent.arel-bundock@umontreal.ca 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 @@ -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 @@ -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 @@ -132,7 +130,6 @@ references: email: edzer.pebesma@uni-muenster.de 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 @@ -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 @@ -191,7 +187,7 @@ references: email: xie@yihui.name 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'' @@ -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 @@ -217,7 +213,7 @@ references: given-names: Simon email: Simon.Urbanek@r-project.org year: '2022' - url: https://CRAN.R-project.org/package=png + url: http://www.rforge.net/png/ version: '>= 0.1-5' - type: software title: rmarkdown @@ -257,7 +253,6 @@ references: email: rich@rstudio.com 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' @@ -271,7 +266,7 @@ references: given-names: Michael email: mdsumner@gmail.com 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 @@ -283,7 +278,7 @@ references: email: r.hijmans@gmail.com 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 @@ -294,7 +289,6 @@ references: given-names: Hadley email: hadley@rstudio.com year: '2022' - url: https://CRAN.R-project.org/package=testthat version: '>= 3.0.0' - type: software title: tidyterra @@ -307,4 +301,3 @@ references: email: diego.hernangomezherrero@gmail.com orcid: https://orcid.org/0000-0001-8457-4658 year: '2022' - url: https://CRAN.R-project.org/package=tidyterra diff --git a/README.md b/README.md index 5b383f83..a0842b1b 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ install_github("rOpenSpain/mapSpain", dependencies = TRUE) This script highlights some features of **mapSpain** : ``` r + library(mapSpain) census <- mapSpain::pobmun19 @@ -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 @@ -139,8 +141,7 @@ shape_pop <- merge(shape, tile <- esp_getTiles(shape_pop, type = "IGNBase.Todo", - zoom = 10, - bbox_expand = .1 + zoommin = 1 ) # Plot @@ -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 @@ -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 @@ -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/}, diff --git a/codemeta.json b/codemeta.json index dd3f942d..f1a72e7e 100644 --- a/codemeta.json +++ b/codemeta.json @@ -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", diff --git a/data/esp_codelist.rda b/data/esp_codelist.rda index a0f8c444..5447cfde 100644 Binary files a/data/esp_codelist.rda and b/data/esp_codelist.rda differ diff --git a/data/leaflet.providersESP.df.rda b/data/leaflet.providersESP.df.rda index 78cd54e8..871d33cd 100644 Binary files a/data/leaflet.providersESP.df.rda and b/data/leaflet.providersESP.df.rda differ diff --git a/img/README-giscoR-1.png b/img/README-giscoR-1.png index a43b939b..6a469bfb 100644 Binary files a/img/README-giscoR-1.png and b/img/README-giscoR-1.png differ diff --git a/img/README-tile-1.png b/img/README-tile-1.png index 6a0fb5f3..044e3c63 100644 Binary files a/img/README-tile-1.png and b/img/README-tile-1.png differ