diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index cebd555c..2ef25a67 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -51,3 +51,4 @@ jobs: with: name: coverage-test-failures path: ${{ runner.temp }}/package + diff --git a/CITATION.cff b/CITATION.cff index fec63359..8aca5db8 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -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.3.1 +version: 0.3.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: '2024' - version: 0.3.1 + version: 0.3.1.9000 url: https://ropenspain.github.io/CatastRo/ doi: 10.5281/zenodo.6044091 abstract: Access public spatial data available under the INSPIRE directive. Tools diff --git a/DESCRIPTION b/DESCRIPTION index ee384eb9..cd4c7ec5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: CatastRo Title: Interface to the API 'Sede Electronica Del Catastro' -Version: 0.3.1 +Version: 0.3.1.9000 Authors@R: c( person("Ángel", "Delgado Panadero", , "delgadopanadero@gmail.com", role = c("aut", "cph"), comment = c(ORCID = "0000-0002-8189-9251")), diff --git a/NEWS.md b/NEWS.md index 15b6183f..c522dea3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# CatastRo (development version) + +- Update entry points (#53). + # CatastRo 0.3.1 - Migrate from **httr** to **httr2** (#44), no visible change for users. diff --git a/R/atom_ad_db.R b/R/atom_ad_db.R index abcadadf..1710e12d 100644 --- a/R/atom_ad_db.R +++ b/R/atom_ad_db.R @@ -15,7 +15,7 @@ #' #' #' @source -#' +#' #' #' #' @family INSPIRE @@ -58,7 +58,7 @@ catr_atom_get_address_db_all <- function(cache = TRUE, cache_dir = NULL, verbose = FALSE) { api_entry <- paste0( - "https://www.catastro.minhafp.es/INSPIRE/", + "https://www.catastro.hacienda.gob.es/INSPIRE/", "Addresses/ES.SDGC.AD.atom.xml" ) diff --git a/R/atom_bu_db.R b/R/atom_bu_db.R index 3d7f567d..6985566c 100644 --- a/R/atom_bu_db.R +++ b/R/atom_bu_db.R @@ -14,7 +14,7 @@ #' #' #' @source -#' +#' #' #' @family INSPIRE #' @family ATOM @@ -52,7 +52,7 @@ catr_atom_get_buildings_db_all <- function(cache = TRUE, cache_dir = NULL, verbose = FALSE) { api_entry <- paste0( - "https://www.catastro.minhafp.es/INSPIRE/", + "https://www.catastro.hacienda.gob.es/INSPIRE/", "buildings/ES.SDGC.BU.atom.xml" ) diff --git a/R/atom_cp_db.R b/R/atom_cp_db.R index 8cdb6ffb..c6c1949a 100644 --- a/R/atom_cp_db.R +++ b/R/atom_cp_db.R @@ -15,7 +15,7 @@ #' #' #' @source -#' +#' #' #' @family INSPIRE #' @family ATOM @@ -52,7 +52,7 @@ catr_atom_get_parcels_db_all <- function(cache = TRUE, cache_dir = NULL, verbose = FALSE) { api_entry <- paste0( - "https://www.catastro.minhafp.es/INSPIRE/", + "https://www.catastro.hacienda.gob.es/INSPIRE/", "CadastralParcels/ES.SDGC.CP.atom.xml" ) diff --git a/README.md b/README.md index c6ab4354..f202e787 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,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 = {2024}, - version = {0.3.1}, + version = {0.3.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 0a237e8e..2f7d6426 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.3.1", + "version": "0.3.1.9000", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.3.3 (2024-02-29 ucrt)", + "runtimePlatform": "R version 4.4.0 (2024-04-24 ucrt)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -271,7 +271,7 @@ }, "SystemRequirements": null }, - "fileSize": "1838.245KB", + "fileSize": "1838.373KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/data/catr_srs_values.rda b/data/catr_srs_values.rda index a171ffdb..d679e0e1 100644 Binary files a/data/catr_srs_values.rda and b/data/catr_srs_values.rda differ diff --git a/inst/schemaorg.json b/inst/schemaorg.json index 9b90bd21..1d2257b8 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -43,8 +43,8 @@ "name": "Comprehensive R Archive Network (CRAN)", "url": "https://cran.r-project.org" }, - "runtimePlatform": "R version 4.3.3 (2024-02-29 ucrt)", - "version": "0.3.1" + "runtimePlatform": "R version 4.4.0 (2024-04-24 ucrt)", + "version": "0.3.1.9000" }, { "id": "https://doi.org/10.5281/zenodo.6044091", diff --git a/man/catr_atom_get_address_db.Rd b/man/catr_atom_get_address_db.Rd index 5b651498..4caa0140 100644 --- a/man/catr_atom_get_address_db.Rd +++ b/man/catr_atom_get_address_db.Rd @@ -6,7 +6,7 @@ \alias{catr_atom_get_address_db_to} \title{ATOM INSPIRE: Reference database for ATOM addresses} \source{ -\url{https://www.catastro.minhap.es/INSPIRE/CadastralParcels/ES.SDGC.CP.atom.xml} +\url{https://www.catastro.hacienda.gob.es/INSPIRE/Addresses/ES.SDGC.AD.atom.xml} } \usage{ catr_atom_get_address_db_all( diff --git a/man/catr_atom_get_buildings_db.Rd b/man/catr_atom_get_buildings_db.Rd index 4014f86a..202bda0b 100644 --- a/man/catr_atom_get_buildings_db.Rd +++ b/man/catr_atom_get_buildings_db.Rd @@ -6,7 +6,7 @@ \alias{catr_atom_get_buildings_db_to} \title{ATOM INSPIRE: Reference database for ATOM buildings} \source{ -\url{https://www.catastro.minhap.es/INSPIRE/CadastralParcels/ES.SDGC.CP.atom.xml} +\url{https://www.catastro.hacienda.gob.es/INSPIRE/buildings/ES.SDGC.BU.atom.xml} } \usage{ catr_atom_get_buildings_db_all( diff --git a/man/catr_atom_get_parcels_db.Rd b/man/catr_atom_get_parcels_db.Rd index 63fe6b39..cf0c4a23 100644 --- a/man/catr_atom_get_parcels_db.Rd +++ b/man/catr_atom_get_parcels_db.Rd @@ -6,7 +6,7 @@ \alias{catr_atom_get_parcels_db_to} \title{ATOM INSPIRE: Reference database for ATOM cadastral parcels} \source{ -\url{https://www.catastro.minhap.es/INSPIRE/CadastralParcels/ES.SDGC.CP.atom.xml} +\url{https://www.catastro.hacienda.gob.es/INSPIRE/CadastralParcels/ES.SDGC.CP.atom.xml} } \usage{ catr_atom_get_parcels_db_all( diff --git a/vignettes/CatastRo.Rmd b/vignettes/CatastRo.Rmd index 2c09d31b..f882021c 100644 --- a/vignettes/CatastRo.Rmd +++ b/vignettes/CatastRo.Rmd @@ -80,7 +80,7 @@ We would make use of the **WMS and WFS services** to get different layers in order to show some of the capabilities of the package: -```r +``` r # Extract building by bounding box # Check https://boundingbox.klokantech.com/ @@ -136,7 +136,7 @@ In first place, we extract the coordinates of the city center of Granada using **mapSpain**: -```r +``` r library(dplyr) library(sf) library(mapSpain) @@ -152,7 +152,7 @@ Granada in the Cadastre, and we would download the buildings with `catr_atom_get_buildings()`. -```r +``` r city_catr_code <- catr_get_code_from_coords(city) city_catr_code @@ -161,6 +161,9 @@ city_catr_code #> #> 1 GRANA… 18 900 18900 18 087 18087 GRAN… 18 900 18 #> # ℹ 1 more variable: cm +``` + +``` r city_bu <- catr_atom_get_buildings(city_catr_code$catrcode) ``` @@ -169,7 +172,7 @@ Next step for creating the visualization is to limit the analysis to a circle of radius 1.5 km around the city center: -```r +``` r buff <- city %>% # Adjust CRS to 25830: (Buildings) st_transform(st_crs(city_bu)) %>% @@ -193,7 +196,7 @@ ggplot(dataviz) + Let's extract now the construction year, available in the column `beginning`: -```r +``` r # Extract 4 initial positions year <- substr(dataviz$beginning, 1, 4) @@ -214,7 +217,7 @@ visualization. We use here the function `cut()` to create classes for every decade starting in year 1900: -```r +``` r dataviz <- dataviz %>% mutate(year_cat = cut(year, breaks = c(0, seq(1900, 2030, by = 10)), diff --git a/vignettes/ovcservice.Rmd b/vignettes/ovcservice.Rmd index a35130eb..454ab1b9 100644 --- a/vignettes/ovcservice.Rmd +++ b/vignettes/ovcservice.Rmd @@ -57,7 +57,7 @@ and the spatial reference system (`srs`) used to express them. The return is a including also other information as the address (town street and number). -```r +``` r result <- catr_ovc_get_rccoor( lat = 38.6196566583596, lon = -3.45624183836806, @@ -76,7 +76,7 @@ result <- catr_ovc_get_rccoor( The function accept as a `srs` argument the following values: -```r +``` r data(catr_srs_values) # OVC valid codes @@ -114,7 +114,7 @@ It is also possible to get all the cadastral references in a square of `catr_ovc_get_rccoor_distancia()`. -```r +``` r catr_ovc_get_rccoor_distancia( lat = 40.96002, lon = -5.663408, @@ -141,7 +141,7 @@ and the town (`municipality`), `catr_ovc_get_cpmrc()` returns its coordinates number). -```r +``` r catr_ovc_get_cpmrc( rc = "13077A01800039", srs = "4230", @@ -167,7 +167,7 @@ argument `province` is needed to be passed. If it is passed a value to the data. -```r +``` r catr_ovc_get_cpmrc( rc = "13077A01800039", municipality = "SANTA CRUZ DE MUDELA" @@ -187,7 +187,7 @@ catr_ovc_get_cpmrc( When using only `rc` the result is provided as expected: -```r +``` r # No warning, get the result catr_ovc_get_cpmrc(rc = "13077A01800039") %>% knitr::kable()