diff --git a/.github/workflows/pkgdown-gh-pages-clean.yaml b/.github/workflows/pkgdown-gh-pages-clean.yaml index 8999ae6..cffae7e 100644 --- a/.github/workflows/pkgdown-gh-pages-clean.yaml +++ b/.github/workflows/pkgdown-gh-pages-clean.yaml @@ -5,7 +5,7 @@ name: Clean pkgdown manually jobs: pkgdown-gh-pages-manual: - runs-on: macos-latest + runs-on: windows-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: @@ -23,11 +23,21 @@ jobs: extra-packages: local::. any::pkgdown - ropenspain/rostemplate + ropenscilabs/r2readthedocs needs: website - - name: Deploy package + - name: Update docs + run: | + r2readthedocs::rtd_build() + + r2readthedocs::r2readthedocs(".") + + shell: Rscript {0} + + - name: Commit results 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)' + git add -A + git commit -m 'Update docs with pkgdev' || echo "No changes to commit" + git push origin || echo "No changes to commit" \ No newline at end of file diff --git a/.github/workflows/rostemplate-gh-pages.yaml b/.github/workflows/rostemplate-gh-pages.yaml index 5ff8f00..2eede37 100644 --- a/.github/workflows/rostemplate-gh-pages.yaml +++ b/.github/workflows/rostemplate-gh-pages.yaml @@ -8,7 +8,7 @@ name: rostemplate-gh-pages jobs: rostemplate-gh-pages: - runs-on: macos-latest + runs-on: windows-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: diff --git a/.github/workflows/update-docs.yaml b/.github/workflows/update-docs.yaml index c03e2a0..d2eb527 100644 --- a/.github/workflows/update-docs.yaml +++ b/.github/workflows/update-docs.yaml @@ -5,7 +5,7 @@ name: update-docs jobs: update-docs: - runs-on: macos-latest + runs-on: windows-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: diff --git a/.gitignore b/.gitignore index 46b0e12..e177f91 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,5 @@ vignettes/*.pdf revdep CRAN-SUBMISSION .github/pkg.lock -docs/ inst/doc cran-comments.md diff --git a/CITATION.cff b/CITATION.cff index 096d5e6..69e6dc8 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -# CITATION file created with {cffr} R package, v0.2.1 +# CITATION file created with {cffr} R package, v0.2.2 # See also: https://docs.ropensci.org/cffr/ # ----------------------------------------------------------- @@ -8,7 +8,7 @@ message: 'To cite package "CatastRo" in publications use:' type: software license: GPL-2.0-only title: 'CatastRo: Interface to the API ''Sede Electronica Del Catastro''' -version: 0.2.1 +version: 0.2.1.9000 doi: 10.5281/zenodo.6044091 abstract: Access public spatial data available under the 'INSPIRE' directive. Tools for downloading references and addresses of properties, as well as map images. @@ -34,7 +34,7 @@ preferred-citation: email: diego.hernangomezherrero@gmail.com orcid: https://orcid.org/0000-0001-8457-4658 year: '2022' - version: 0.2.1 + version: 0.2.1.9000 url: https://ropenspain.github.io/CatastRo/ doi: 10.5281/zenodo.6044091 abstract: Access public spatial data available under the 'INSPIRE' directive. Tools @@ -102,20 +102,6 @@ references: email: hadley@rstudio.com year: '2022' url: https://CRAN.R-project.org/package=httr -- type: software - title: lifecycle - abstract: 'lifecycle: Manage the Life Cycle of your Package Functions' - notes: Imports - authors: - - family-names: Henry - given-names: Lionel - email: lionel@rstudio.com - - family-names: Wickham - given-names: Hadley - email: hadley@rstudio.com - orcid: https://orcid.org/0000-0003-4757-117X - year: '2022' - url: https://CRAN.R-project.org/package=lifecycle - type: software title: mapSpain abstract: 'mapSpain: Administrative Boundaries of Spain' @@ -243,17 +229,6 @@ references: orcid: https://orcid.org/0000-0002-9415-4582 year: '2022' url: https://CRAN.R-project.org/package=ggplot2 -- type: software - title: ggspatial - abstract: 'ggspatial: Spatial Data Framework for ggplot2' - notes: Suggests - authors: - - family-names: Dunnington - given-names: Dewey - email: dewey@fishandwhistle.net - orcid: https://orcid.org/0000-0002-9415-4582 - year: '2022' - url: https://CRAN.R-project.org/package=ggspatial - type: software title: knitr abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R' @@ -275,17 +250,6 @@ references: email: Simon.Urbanek@r-project.org year: '2022' url: https://CRAN.R-project.org/package=png -- type: software - title: raster - abstract: 'raster: Geographic Data Analysis and Modeling' - notes: Suggests - authors: - - family-names: Hijmans - given-names: Robert J. - email: r.hijmans@gmail.com - orcid: https://orcid.org/0000-0001-5872-2872 - year: '2022' - url: https://CRAN.R-project.org/package=raster - type: software title: rmarkdown abstract: 'rmarkdown: Dynamic Documents for R' @@ -350,3 +314,15 @@ references: year: '2022' url: https://CRAN.R-project.org/package=testthat version: '>= 3.0.0' +- type: software + title: tidyterra + abstract: 'tidyterra: ''tidyverse'' Methods and ''ggplot2'' Utils for ''terra'' + Objects' + notes: Suggests + authors: + - family-names: Hernangómez + given-names: Diego + 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/DESCRIPTION b/DESCRIPTION index 4db8e43..81aa0d2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: CatastRo Title: Interface to the API 'Sede Electronica Del Catastro' -Version: 0.2.1 +Version: 0.2.1.9000 Authors@R: c( person("Ángel", "Delgado Panadero", , "delgadopanadero@gmail.com", role = c("aut", "cph"), comment = c(ORCID = "0000-0002-8189-9251")), @@ -22,7 +22,6 @@ Depends: Imports: dplyr, httr, - lifecycle, mapSpain (>= 0.6.0), rappdirs (>= 0.3.0), sf (>= 1.0.0), @@ -32,13 +31,12 @@ Imports: xml2 Suggests: ggplot2, - ggspatial, knitr, png, - raster, rmarkdown, slippymath, - testthat (>= 3.0.0) + testthat (>= 3.0.0), + tidyterra VignetteBuilder: knitr Config/testthat/edition: 3 @@ -46,4 +44,4 @@ Copyright: © Dirección General del Catastro Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.1.2 +RoxygenNote: 7.2.0 diff --git a/NAMESPACE b/NAMESPACE index acd8c36..4c8f0c1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -30,8 +30,5 @@ export(catr_wfs_get_parcels_parcel) export(catr_wfs_get_parcels_parcel_zoning) export(catr_wfs_get_parcels_zoning) export(catr_wms_get_layer) -export(get_coor) -export(get_rc) -export(near_rc) importFrom(utils,download.file) importFrom(utils,unzip) diff --git a/NEWS.md b/NEWS.md index c3e2d80..26a3a4a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# CatastRo (development version) + +- Add **tidyterra** to ‘Suggests’ + # CatastRo 0.2.1 - Fix CRAN tests. diff --git a/R/deprecated.R b/R/deprecated.R deleted file mode 100644 index a9c08be..0000000 --- a/R/deprecated.R +++ /dev/null @@ -1,106 +0,0 @@ -#' @rdname get_coor -#' -#' @title Interface to query Consulta_CPMRC -#' -#' @description -#' -#' `r lifecycle::badge("deprecated")` -#' -#' **This function was deprecated to adapt it to the new interface. Use** -#' [catr_ovc_get_cpmrc()] instead. -#' -#' -#' -#' @param RC Cadastral reference of the state. -#' @param SRS The Spatial Reference System desired for the coordinates, if it -#' is missed, the returned coordinates will be given in the Spatial Reference -#' System used by Googlemaps ('EPSG:4326'). The set of the available SRS to -#' use are available in the vector `coordinates` from this package. Apart -#' from that, the function accept as a SRS argument the values "Google" and -#' "Oficial". The first uses the SRS value used by Google maps ('EPSG:4326') -#' while the latter uses the official SRS ('EPSG:4258') in Europe. If no SRS -#' is given, the function by default choose the "Google" SRS. -#' @param Province A string with the Province of the state. It is not case -#' sensitive. -#' @param Municipality A string with the Municipality of the state. It is not -#' case sensitive. -#' -#' @return A list consisting on two numeric values: the coordinates (latitude, -#' longitude) and the reference system in which they are expressed. -#' -#' @references http://ovc.catastro.meh.es/ovcservweb/OVCSWLocalizacionRC/OVCCoordenadas.asmx?op=Consulta_CPMRC -#' -#' @author Angel Delgado Panadero. -#' -#' -#' @export -#' @keywords internal -#' @family deprecated functions -get_coor <- function(RC, SRS = "Google", Province = "", Municipality = "") { - lifecycle::deprecate_stop("0.2.0", "get_coor()", "catr_ovc_get_cpmrc()") -} - -#' @rdname get_rc -#' -#' @title Interface to query Consulta_RCCOOR -#' -#' -#' @description -#' `r lifecycle::badge("deprecated")` -#' -#' **This function was deprecated to adapt it to the new interface. Use** -#' [catr_ovc_get_rccoor()] instead. -#' -#' -#' -#' @inheritParams get_coor -#' -#' @param lat Latitude coordinate. -#' @param lon Longitude coordinate. -#' -#' @return A data.frame with the the addresses of the states and the cadastral -#' references for every SRS requested. -#' @references http://ovc.catastro.meh.es/ovcservweb/OVCSWLocalizacionRC/OVCCoordenadas.asmx?op=Consulta_RCCOOR -#' -#' @author Angel Delgado Panadero. -#' -#' -#' @export -#' @keywords internal -#' @family deprecated functions -get_rc <- function(lat, lon, SRS = "Google") { - lifecycle::deprecate_stop("0.2.0", "get_rc()", "catr_ovc_get_rccoor()") -} - - -#' @rdname near_rc -#' -#' @title Interface to query Consulta_RCCOOR_Distancia -#' -#' @description -#' `r lifecycle::badge("deprecated")` -#' -#' **This function was deprecated to adapt it to the new interface. Use** -#' [catr_ovc_get_rccoor_distancia()] instead. -#' -#' -#' @inheritParams get_coor -#' -#' @param lat Latitude coordinate. -#' @param lon Longitude coordinate. -#' -#' @return A data.frame with the the addresses of the states and the cadastral -#' references in the nearby area of the location given for every SRS -#' requested. -#' -#' @references http://ovc.catastro.meh.es/ovcservweb/OVCSWLocalizacionRC/OVCCoordenadas.asmx?op=Consulta_RCCOOR_Distancia -#' -#' @author Angel Delgado Panadero. -#' -#' -#' @export -#' @keywords internal -#' @family deprecated functions -near_rc <- function(lat, lon, SRS = "Google") { - lifecycle::deprecate_stop("0.2.0", "near_rc()", "catr_ovc_get_rccoor_distancia()") -} diff --git a/R/wms_all.R b/R/wms_all.R index 818cf35..948b796 100644 --- a/R/wms_all.R +++ b/R/wms_all.R @@ -20,7 +20,7 @@ #' @family WMS #' @family spatial #' -#' @seealso [mapSpain::esp_getTiles()], [mapSpain::layer_spatraster()], +#' @seealso [mapSpain::esp_getTiles()], [tidyterra::geom_spatraster_rgb()], #' [terra::plotRGB()]. #' #' @export @@ -80,11 +80,12 @@ #' what = "parcel" #' ) #' -#' library(ggplot2) #' library(mapSpain) +#' library(ggplot2) +#' library(tidyterra) #' #' ggplot() + -#' layer_spatraster(pict) +#' geom_spatraster_rgb(data = pict) #' #' #' # With a spatial object @@ -105,7 +106,7 @@ #' #' ggplot() + #' geom_sf(data = parcels, fill = "blue", alpha = 0.5) + -#' layer_spatraster(parcels_img) +#' geom_spatraster_rgb(data = parcels_img) #' } catr_wms_get_layer <- function(x, srs, diff --git a/README.Rmd b/README.Rmd index 74b0856..526202b 100644 --- a/README.Rmd +++ b/README.Rmd @@ -194,10 +194,10 @@ ggplot(wfs_get_buildings) + wms_bu <- catr_wms_get_layer(wfs_get_buildings, bbox_expand = 0.2) # Map -# Load mapSpain for using layer_spatraster -library(mapSpain) +# Load tidyterra +library(tidyterra) ggplot() + - layer_spatraster(wms_bu) + + geom_spatraster_rgb(data = wms_bu) + geom_sf(data = wfs_get_buildings, fill = "red", alpha = 0.6) ``` diff --git a/README.md b/README.md index 4a445f0..bf5d3ca 100644 --- a/README.md +++ b/README.md @@ -189,10 +189,10 @@ ggplot(wfs_get_buildings) + wms_bu <- catr_wms_get_layer(wfs_get_buildings, bbox_expand = 0.2) # Map -# Load mapSpain for using layer_spatraster -library(mapSpain) +# Load tidyterra +library(tidyterra) ggplot() + - layer_spatraster(wms_bu) + + geom_spatraster_rgb(data = wms_bu) + geom_sf(data = wfs_get_buildings, fill = "red", alpha = 0.6) ``` @@ -216,9 +216,9 @@ it will load it, speeding up the process. To cite ‘CatastRo’ in publications use: Delgado Panadero Á, Hernangómez D (2022). *CatastRo: Interface to the -API Sede Electrónica Del Catastro*. doi: 10.5281/zenodo.6044091 (URL: -), \\>. +API Sede Electrónica Del Catastro*. +, +. A BibTeX entry for LaTeX users is: @@ -226,7 +226,7 @@ A BibTeX entry for LaTeX users is: title = {{CatastRo}: Interface to the {API} Sede Electrónica Del Catastro}, author = {Ángel {Delgado Panadero} and Diego Hernangómez}, year = {2022}, - version = {0.2.1}, + version = {0.2.1.9000}, url = {https://ropenspain.github.io/CatastRo/}, doi = {10.5281/zenodo.6044091}, abstract = {Access public spatial data available under the 'INSPIRE' directive. Tools for downloading references and addresses of properties, as well as map images.}, diff --git a/codemeta.json b/codemeta.json index 507c870..6179c10 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,13 +8,13 @@ "codeRepository": "https://github.com/rOpenSpain/CatastRo", "issueTracker": "https://github.com/rOpenSpain/CatastRo/issues", "license": "https://spdx.org/licenses/GPL-2.0", - "version": "0.2.1", + "version": "0.2.1.9000", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.1.2 (2021-11-01)", + "runtimePlatform": "R version 4.2.0 (2022-04-22 ucrt)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -76,18 +76,6 @@ }, "sameAs": "https://CRAN.R-project.org/package=ggplot2" }, - { - "@type": "SoftwareApplication", - "identifier": "ggspatial", - "name": "ggspatial", - "provider": { - "@id": "https://cran.r-project.org", - "@type": "Organization", - "name": "Comprehensive R Archive Network (CRAN)", - "url": "https://cran.r-project.org" - }, - "sameAs": "https://CRAN.R-project.org/package=ggspatial" - }, { "@type": "SoftwareApplication", "identifier": "knitr", @@ -112,18 +100,6 @@ }, "sameAs": "https://CRAN.R-project.org/package=png" }, - { - "@type": "SoftwareApplication", - "identifier": "raster", - "name": "raster", - "provider": { - "@id": "https://cran.r-project.org", - "@type": "Organization", - "name": "Comprehensive R Archive Network (CRAN)", - "url": "https://cran.r-project.org" - }, - "sameAs": "https://CRAN.R-project.org/package=raster" - }, { "@type": "SoftwareApplication", "identifier": "rmarkdown", @@ -160,6 +136,18 @@ "url": "https://cran.r-project.org" }, "sameAs": "https://CRAN.R-project.org/package=testthat" + }, + { + "@type": "SoftwareApplication", + "identifier": "tidyterra", + "name": "tidyterra", + "provider": { + "@id": "https://cran.r-project.org", + "@type": "Organization", + "name": "Comprehensive R Archive Network (CRAN)", + "url": "https://cran.r-project.org" + }, + "sameAs": "https://CRAN.R-project.org/package=tidyterra" } ], "softwareRequirements": { @@ -294,7 +282,7 @@ }, "SystemRequirements": null }, - "fileSize": "1512.277KB", + "fileSize": "1512.567KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/data/catr_srs_values.rda b/data/catr_srs_values.rda index 7dcf487..d3996f5 100644 Binary files a/data/catr_srs_values.rda and b/data/catr_srs_values.rda differ diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/man/CatastRo-package.Rd b/man/CatastRo-package.Rd index a55cbe3..191f6d6 100644 --- a/man/CatastRo-package.Rd +++ b/man/CatastRo-package.Rd @@ -6,7 +6,7 @@ \alias{CatastRo-package} \title{CatastRo: Interface to the API 'Sede Electronica Del Catastro'} \description{ -\if{html}{\figure{logo.png}{options: align='right' alt='logo' width='120'}} +\if{html}{\figure{logo.png}{options: style='float: right' alt='logo' width='120'}} Access public spatial data available under the 'INSPIRE' directive. Tools for downloading references and addresses of properties, as well as map images. } diff --git a/man/catr_wms_get_layer.Rd b/man/catr_wms_get_layer.Rd index 17913cf..14da326 100644 --- a/man/catr_wms_get_layer.Rd +++ b/man/catr_wms_get_layer.Rd @@ -117,11 +117,12 @@ pict <- catr_wms_get_layer(c(222500, 4019500, 223700, 4020700), what = "parcel" ) -library(ggplot2) library(mapSpain) +library(ggplot2) +library(tidyterra) ggplot() + - layer_spatraster(pict) + geom_spatraster_rgb(data = pict) # With a spatial object @@ -142,7 +143,7 @@ parcels_img <- catr_wms_get_layer(parcels, ggplot() + geom_sf(data = parcels, fill = "blue", alpha = 0.5) + - layer_spatraster(parcels_img) + geom_spatraster_rgb(data = parcels_img) } \dontshow{\}) # examplesIf} } @@ -152,7 +153,7 @@ ggplot() + \href{https://www.catastro.minhap.es/webinspire/index.html}{INSPIRE Services for Cadastral Cartography} } \seealso{ -\code{\link[mapSpain:esp_getTiles]{mapSpain::esp_getTiles()}}, \code{\link[mapSpain:layer_spatraster]{mapSpain::layer_spatraster()}}, +\code{\link[mapSpain:esp_getTiles]{mapSpain::esp_getTiles()}}, \code{\link[tidyterra:geom_spatraster_rgb]{tidyterra::geom_spatraster_rgb()}}, \code{\link[terra:plotRGB]{terra::plotRGB()}}. INSPIRE API functions: diff --git a/man/figures/README-atom-1.png b/man/figures/README-atom-1.png index 85eb2e4..d8a7ece 100644 Binary files a/man/figures/README-atom-1.png and b/man/figures/README-atom-1.png differ diff --git a/man/figures/README-wfs-1.png b/man/figures/README-wfs-1.png index 64e6c1b..3315a46 100644 Binary files a/man/figures/README-wfs-1.png and b/man/figures/README-wfs-1.png differ diff --git a/man/figures/README-wms-1.png b/man/figures/README-wms-1.png index eee8995..0f0a75e 100644 Binary files a/man/figures/README-wms-1.png and b/man/figures/README-wms-1.png differ diff --git a/man/get_coor.Rd b/man/get_coor.Rd deleted file mode 100644 index 751f45a..0000000 --- a/man/get_coor.Rd +++ /dev/null @@ -1,49 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/deprecated.R -\name{get_coor} -\alias{get_coor} -\title{Interface to query Consulta_CPMRC} -\usage{ -get_coor(RC, SRS = "Google", Province = "", Municipality = "") -} -\arguments{ -\item{RC}{Cadastral reference of the state.} - -\item{SRS}{The Spatial Reference System desired for the coordinates, if it -is missed, the returned coordinates will be given in the Spatial Reference -System used by Googlemaps ('EPSG:4326'). The set of the available SRS to -use are available in the vector \code{coordinates} from this package. Apart -from that, the function accept as a SRS argument the values "Google" and -"Oficial". The first uses the SRS value used by Google maps ('EPSG:4326') -while the latter uses the official SRS ('EPSG:4258') in Europe. If no SRS -is given, the function by default choose the "Google" SRS.} - -\item{Province}{A string with the Province of the state. It is not case -sensitive.} - -\item{Municipality}{A string with the Municipality of the state. It is not -case sensitive.} -} -\value{ -A list consisting on two numeric values: the coordinates (latitude, -longitude) and the reference system in which they are expressed. -} -\description{ -\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}} - -\strong{This function was deprecated to adapt it to the new interface. Use} -\code{\link[=catr_ovc_get_cpmrc]{catr_ovc_get_cpmrc()}} instead. -} -\references{ -http://ovc.catastro.meh.es/ovcservweb/OVCSWLocalizacionRC/OVCCoordenadas.asmx?op=Consulta_CPMRC -} -\seealso{ -Other deprecated functions: -\code{\link{get_rc}()}, -\code{\link{near_rc}()} -} -\author{ -Angel Delgado Panadero. -} -\concept{deprecated functions} -\keyword{internal} diff --git a/man/get_rc.Rd b/man/get_rc.Rd deleted file mode 100644 index 7fcdea0..0000000 --- a/man/get_rc.Rd +++ /dev/null @@ -1,45 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/deprecated.R -\name{get_rc} -\alias{get_rc} -\title{Interface to query Consulta_RCCOOR} -\usage{ -get_rc(lat, lon, SRS = "Google") -} -\arguments{ -\item{lat}{Latitude coordinate.} - -\item{lon}{Longitude coordinate.} - -\item{SRS}{The Spatial Reference System desired for the coordinates, if it -is missed, the returned coordinates will be given in the Spatial Reference -System used by Googlemaps ('EPSG:4326'). The set of the available SRS to -use are available in the vector \code{coordinates} from this package. Apart -from that, the function accept as a SRS argument the values "Google" and -"Oficial". The first uses the SRS value used by Google maps ('EPSG:4326') -while the latter uses the official SRS ('EPSG:4258') in Europe. If no SRS -is given, the function by default choose the "Google" SRS.} -} -\value{ -A data.frame with the the addresses of the states and the cadastral -references for every SRS requested. -} -\description{ -\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}} - -\strong{This function was deprecated to adapt it to the new interface. Use} -\code{\link[=catr_ovc_get_rccoor]{catr_ovc_get_rccoor()}} instead. -} -\references{ -http://ovc.catastro.meh.es/ovcservweb/OVCSWLocalizacionRC/OVCCoordenadas.asmx?op=Consulta_RCCOOR -} -\seealso{ -Other deprecated functions: -\code{\link{get_coor}()}, -\code{\link{near_rc}()} -} -\author{ -Angel Delgado Panadero. -} -\concept{deprecated functions} -\keyword{internal} diff --git a/man/near_rc.Rd b/man/near_rc.Rd deleted file mode 100644 index e3154d3..0000000 --- a/man/near_rc.Rd +++ /dev/null @@ -1,46 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/deprecated.R -\name{near_rc} -\alias{near_rc} -\title{Interface to query Consulta_RCCOOR_Distancia} -\usage{ -near_rc(lat, lon, SRS = "Google") -} -\arguments{ -\item{lat}{Latitude coordinate.} - -\item{lon}{Longitude coordinate.} - -\item{SRS}{The Spatial Reference System desired for the coordinates, if it -is missed, the returned coordinates will be given in the Spatial Reference -System used by Googlemaps ('EPSG:4326'). The set of the available SRS to -use are available in the vector \code{coordinates} from this package. Apart -from that, the function accept as a SRS argument the values "Google" and -"Oficial". The first uses the SRS value used by Google maps ('EPSG:4326') -while the latter uses the official SRS ('EPSG:4258') in Europe. If no SRS -is given, the function by default choose the "Google" SRS.} -} -\value{ -A data.frame with the the addresses of the states and the cadastral -references in the nearby area of the location given for every SRS -requested. -} -\description{ -\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}} - -\strong{This function was deprecated to adapt it to the new interface. Use} -\code{\link[=catr_ovc_get_rccoor_distancia]{catr_ovc_get_rccoor_distancia()}} instead. -} -\references{ -http://ovc.catastro.meh.es/ovcservweb/OVCSWLocalizacionRC/OVCCoordenadas.asmx?op=Consulta_RCCOOR_Distancia -} -\seealso{ -Other deprecated functions: -\code{\link{get_coor}()}, -\code{\link{get_rc}()} -} -\author{ -Angel Delgado Panadero. -} -\concept{deprecated functions} -\keyword{internal} diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml index 741f8b4..5032246 100644 --- a/pkgdown/_pkgdown.yml +++ b/pkgdown/_pkgdown.yml @@ -28,7 +28,7 @@ reference: - has_concept("WMS") - mapSpain::esp_getTiles() - terra::plotRGB() - - ggspatial::layer_spatial.Raster() + - tidyterra::geom_spatraster_rgb() - title: OVCCoordenadas API desc: These functions allows to access the [OVCCoordenadas](https://ovc.catastro.meh.es/ovcservweb/ovcswlocalizacionrc/ovccoordenadas.asmx) service. @@ -48,12 +48,6 @@ reference: - title: Databases and reference data contents: - has_concept("databases") - - title: Deprecated functions - desc: These functions has been deprecated. All these functions have a replacement following the new package API. - contents: - - get_rc - - near_rc - - get_coor - title: About the package contents: diff --git a/vignettes/CatastRo.Rmd b/vignettes/CatastRo.Rmd index 6d5046c..6e731be 100644 --- a/vignettes/CatastRo.Rmd +++ b/vignettes/CatastRo.Rmd @@ -103,15 +103,15 @@ labs <- catr_wms_get_layer(stadium_parcel, # Plot library(ggplot2) -library(mapSpain) # For terra tiles +library(tidyterra) # For terra tiles ggplot() + - layer_spatraster(labs) + + geom_spatraster_rgb(data = labs) + geom_sf(data = stadium_parcel, fill = NA, col = "red", size = 2) + geom_sf(data = stadium, fill = "red", alpha = .5) ``` -plot of chunk santbernabeu +plot of chunk santbernabeu ### Thematic maps @@ -178,7 +178,7 @@ ggplot(dataviz) + geom_sf() ``` -plot of chunk minimal +plot of chunk minimal Let's extract now the construction year, available in the column `beginning`: @@ -238,7 +238,7 @@ ggplot(dataviz) + ) ``` -plot of chunk dataviz +plot of chunk dataviz diff --git a/vignettes/CatastRo.Rmd.orig b/vignettes/CatastRo.Rmd.orig index f6002a3..7dd599f 100644 --- a/vignettes/CatastRo.Rmd.orig +++ b/vignettes/CatastRo.Rmd.orig @@ -120,10 +120,10 @@ labs <- catr_wms_get_layer(stadium_parcel, # Plot library(ggplot2) -library(mapSpain) # For terra tiles +library(tidyterra) # For terra tiles ggplot() + - layer_spatraster(labs) + + geom_spatraster_rgb(data = labs) + geom_sf(data = stadium_parcel, fill = NA, col = "red", size = 2) + geom_sf(data = stadium, fill = "red", alpha = .5) ``` diff --git a/vignettes/dataviz-1.png b/vignettes/dataviz-1.png index 9842cd4..4504320 100644 Binary files a/vignettes/dataviz-1.png and b/vignettes/dataviz-1.png differ diff --git a/vignettes/minimal-1.png b/vignettes/minimal-1.png index 7c36946..446f452 100644 Binary files a/vignettes/minimal-1.png and b/vignettes/minimal-1.png differ diff --git a/vignettes/santbernabeu-1.png b/vignettes/santbernabeu-1.png index 970af97..3356819 100644 Binary files a/vignettes/santbernabeu-1.png and b/vignettes/santbernabeu-1.png differ