Merge branch 'main' into jd-otero-patch-1

.Rbuildignore

@@ -13,3 +13,4 @@
 ^docs$
 ^pkgdown$
 ^tools$
+^cran-comments\.md$

.lintr

@@ -1,20 +1,39 @@
-linters: linters_with_tags(
-    tags = NULL, # include all linters
+linters: all_linters(
+    packages = c("lintr", "etdev"),
+    pipe_consistency_linter(pipe = "%>%"),
     object_name_linter = NULL,
-    undesirable_function_linter = NULL,
     implicit_integer_linter = NULL,
     extraction_operator_linter = NULL,
     todo_comment_linter = NULL,
+    library_call_linter = NULL,
+    undesirable_function_linter(
+      modify_defaults(
+        default_undesirable_functions,
+        citEntry = "use the more modern bibentry() function",
+        library = NULL # too many false positive in too many files
+      )
+    ),
     function_argument_linter = NULL,
     indentation_linter = NULL, # unstable as of lintr 3.1.0
     # Use minimum R declared in DESCRIPTION or fall back to current R version.
     # Install etdev package from https://github.com/epiverse-trace/etdev
     backport_linter(if (length(x <- etdev::extract_min_r_version())) x else getRversion())
   )
 exclusions: list(
-    "tests/testthat.R" = list(unused_import_linter = Inf),
+    "tests/testthat.R" = list(
+      unused_import_linter = Inf
+    ),
+    "tests" = list(
+      undesirable_function_linter = Inf
+    ),
     "data-raw" = list(
       missing_package_linter = Inf,
       namespace_linter = Inf
-    )
+    ),
+    # RcppExports.R is auto-generated and will not pass many linters. In
+    # particular, it can create very long lines.
+    "R/RcppExports.R",
+    # R/stanmodels.R is auto-generated and will not pass many linters. In
+    # particular, it uses `sapply()`.
+    "R/stanmodels.R"
   )

CITATION.cff

@@ -7,35 +7,26 @@ cff-version: 1.2.0
 message: 'To cite package "ColOpenData" in publications use:'
 type: software
 license: MIT
-title: 'ColOpenData: Colombian Open Data Download and Wrangling'
-version: 0.1.0
-abstract: ColOpenData is a package that acquires and wrangles Colombian socioeconomic,
-  geospatial and climate data. It solves the problem of Colombian data being issued
-  in different web pages and sources by using functions that allow the user to select
-  the desired database and download it without having to do the exhausting acquisition
-  process.
+title: 'ColOpenData: Download Colombian Demographic, Climate and Geospatial Data'
+version: 0.3.0
+abstract: Downloads wrangled Colombian socioeconomic, geospatial, population and climate
+  data. It solves the problem of Colombian data being issued in different web pages
+  and sources by using functions that allow the user to select the desired database
+  and download it without having to do the exhausting acquisition process.
 authors:
 - family-names: Tavera-Cifuentes
-  given-names: M. Camila
+  given-names: Maria Camila
   email: [email protected]
   orcid: https://orcid.org/0009-0007-1610-4583
 - family-names: Otero
   given-names: Julian
   email: [email protected]
   orcid: https://orcid.org/0009-0006-0429-7747
-- family-names: Umana
-  given-names: Juan D.
-  email: [email protected]
-  orcid: https://orcid.org/0000-0003-0316-6164
-- family-names: Montenegro-Torres
-  given-names: Juan
-  email: [email protected]
-  orcid: https://orcid.org/0000-0003-2755-4743
 repository-code: https://github.com/epiverse-trace/ColOpenData
 url: https://epiverse-trace.github.io/ColOpenData/
 contact:
 - family-names: Tavera-Cifuentes
-  given-names: M. Camila
+  given-names: Maria Camila
   email: [email protected]
   orcid: https://orcid.org/0009-0007-1610-4583
 keywords:
@@ -70,6 +61,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0001-9754-0393
   year: '2024'
+  doi: 10.32614/CRAN.package.checkmate
 - type: software
   title: config
   abstract: 'config: Manage Environment Specific Configuration Values'
@@ -81,6 +73,7 @@ references:
     given-names: JJ
     email: [email protected]
   year: '2024'
+  doi: 10.32614/CRAN.package.config
 - type: software
   title: dplyr
   abstract: 'dplyr: A Grammar of Data Manipulation'
@@ -105,17 +98,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0003-4777-038X
   year: '2024'
-- type: software
-  title: httr2
-  abstract: 'httr2: Perform HTTP Requests and Process the Responses'
-  notes: Imports
-  url: https://httr2.r-lib.org
-  repository: https://CRAN.R-project.org/package=httr2
-  authors:
-  - family-names: Wickham
-    given-names: Hadley
-    email: [email protected]
-  year: '2024'
+  doi: 10.32614/CRAN.package.dplyr
 - type: software
   title: magrittr
   abstract: 'magrittr: A Forward-Pipe Operator for R'
@@ -130,23 +113,7 @@ references:
     given-names: Hadley
     email: [email protected]
   year: '2024'
-- type: software
-  title: readr
-  abstract: 'readr: Read Rectangular Text Data'
-  notes: Imports
-  url: https://readr.tidyverse.org
-  repository: https://CRAN.R-project.org/package=readr
-  authors:
-  - family-names: Wickham
-    given-names: Hadley
-    email: [email protected]
-  - family-names: Hester
-    given-names: Jim
-  - family-names: Bryan
-    given-names: Jennifer
-    email: [email protected]
-    orcid: https://orcid.org/0000-0002-6983-2759
-  year: '2024'
+  doi: 10.32614/CRAN.package.magrittr
 - type: software
   title: rlang
   abstract: 'rlang: Functions for Base Types and Core R and ''Tidyverse'' Features'
@@ -161,6 +128,7 @@ references:
     given-names: Hadley
     email: [email protected]
   year: '2024'
+  doi: 10.32614/CRAN.package.rlang
 - type: software
   title: sf
   abstract: 'sf: Simple Features for R'
@@ -173,16 +141,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0001-8049-7069
   year: '2024'
-- type: software
-  title: utils
-  abstract: 'R: A Language and Environment for Statistical Computing'
-  notes: Imports
-  authors:
-  - name: R Core Team
-  institution:
-    name: R Foundation for Statistical Computing
-    address: Vienna, Austria
-  year: '2024'
+  doi: 10.32614/CRAN.package.sf
 - type: software
   title: stringdist
   abstract: 'stringdist: Approximate String Matching, Fuzzy Text Search, and String
@@ -197,6 +156,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0002-9807-4686
   year: '2024'
+  doi: 10.32614/CRAN.package.stringdist
 - type: software
   title: tidyr
   abstract: 'tidyr: Tidy Messy Data'
@@ -213,17 +173,18 @@ references:
   - family-names: Girlich
     given-names: Maximilian
   year: '2024'
+  doi: 10.32614/CRAN.package.tidyr
 - type: software
-  title: stringr
-  abstract: 'stringr: Simple, Consistent Wrappers for Common String Operations'
+  title: utils
+  abstract: 'R: A Language and Environment for Statistical Computing'
   notes: Imports
-  url: https://stringr.tidyverse.org
-  repository: https://CRAN.R-project.org/package=stringr
   authors:
-  - family-names: Wickham
-    given-names: Hadley
-    email: [email protected]
+  - name: R Core Team
+  institution:
+    name: R Foundation for Statistical Computing
+    address: Vienna, Austria
   year: '2024'
+  doi: 10.32614/CRAN.package.utils
 - type: software
   title: ggplot2
   abstract: 'ggplot2: Create Elegant Data Visualisations Using the Grammar of Graphics'
@@ -263,6 +224,7 @@ references:
     name-particle: van den
     orcid: https://orcid.org/0000-0002-9335-7468
   year: '2024'
+  doi: 10.32614/CRAN.package.ggplot2
 - type: software
   title: knitr
   abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
@@ -275,6 +237,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0003-0645-5666
   year: '2024'
+  doi: 10.32614/CRAN.package.knitr
 - type: software
   title: leaflet
   abstract: 'leaflet: Create Interactive Web Maps with the JavaScript ''Leaflet''
@@ -295,6 +258,7 @@ references:
   - family-names: Xie
     given-names: Yihui
   year: '2024'
+  doi: 10.32614/CRAN.package.leaflet
 - type: software
   title: rmarkdown
   abstract: 'rmarkdown: Dynamic Documents for R'
@@ -338,6 +302,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0003-3925-190X
   year: '2024'
+  doi: 10.32614/CRAN.package.rmarkdown
 - type: software
   title: spelling
   abstract: 'spelling: Tools for Spell Checking in R'
@@ -353,6 +318,7 @@ references:
     given-names: Jim
     email: [email protected]
   year: '2024'
+  doi: 10.32614/CRAN.package.spelling
 - type: software
   title: testthat
   abstract: 'testthat: Unit Testing for R'
@@ -364,5 +330,6 @@ references:
     given-names: Hadley
     email: [email protected]
   year: '2024'
+  doi: 10.32614/CRAN.package.testthat
   version: '>= 3.0.0'
 

DESCRIPTION

@@ -1,27 +1,29 @@
 Package: ColOpenData
-Title: Colombian Open Data Download and Wrangling
-Version: 0.1.0
+Title: Download Colombian Demographic, Climate and Geospatial Data
+Version: 0.3.0
 Authors@R: c(
-    person("M. Camila", "Tavera-Cifuentes", , "[email protected]", role = c("aut", "cre"),
+    person("Maria Camila", "Tavera-Cifuentes", , "[email protected]", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0009-0007-1610-4583")),
-    person("Julian", "Otero", , "[email protected]", role = "aut",
+    person("Julian", "Otero", , "[email protected]", role = c("aut", "cph"),
            comment = c(ORCID = "0009-0006-0429-7747")),
-    person("Juan D.", "Umana", , "[email protected]", role = "aut",
-           comment = c(ORCID = "0000-0003-0316-6164")),
-    person("Juan", "Montenegro-Torres", , "[email protected]", role = "aut",
-           comment = c(ORCID = "0000-0003-2755-4743")),
-    person("Juan Manuel", "Cordovez", , "[email protected]", role = "ctb",
-           comment = c(ORCID = "0000-0002-4005-3567")),
+    person("Natalia", "Nino-Machado", , "[email protected]", role = "ctb",
+           comment = c(ORCID = "0000-0001-7887-9439")),
     person("Catalina", "Gonzalez-Uribe", , "[email protected]", role = "ctb",
            comment = c(ORCID = "0000-0002-3322-5017")),
-    person("Mauricio", "Santos-Vega", , "[email protected]", role = "ctb",
-           comment = c(ORCID = "0000-0002-8130-6014")),
+    person("Juan Manuel", "Cordovez", , "[email protected]", role = "ctb",
+           comment = c(ORCID = "0000-0002-4005-3567")),
+    person("Hugo", "Gruson", , "[email protected]", role = "rev",
+           comment = c(ORCID = "0000-0002-4094-1476")),
     person("Chris", "Hartgerink", , "[email protected]", role = "rev",
-           comment = c(ORCID = "0000-0003-1050-6809"))
+           comment = c(ORCID = "0000-0003-1050-6809")),
+    person("Karim", "Mane", , "[email protected]", role = "rev",
+           comment = c(ORCID = "0000-0002-9892-2999")),
+    person("Joshua W.", "Lambert", , "[email protected]", role = "rev",
+           comment = c(ORCID = "0000-0001-5218-3046"))
   )
-Description: ColOpenData is a package that acquires and wrangles Colombian
-    socioeconomic, geospatial, population and climate data. It solves the 
-    problem of Colombian data being issued in different web pages and sources by
+Description: Downloads wrangled Colombian socioeconomic,
+    geospatial, population and climate data. It solves the problem of
+    Colombian data being issued in different web pages and sources by
     using functions that allow the user to select the desired database and
     download it without having to do the exhausting acquisition process.
 License: MIT + file LICENSE
@@ -34,14 +36,12 @@ Imports:
     checkmate,
     config,
     dplyr,
-    httr2,
     magrittr,
-    readr,
     rlang,
     sf,
-    utils,
     stringdist,
-    tidyr
+    tidyr,
+    utils
 Suggests: 
     ggplot2,
     knitr,
@@ -57,4 +57,4 @@ Encoding: UTF-8
 Language: en-US
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2023
+YEAR: 2024
 COPYRIGHT HOLDER: ColOpenData authors

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2023 ColOpenData authors
+Copyright (c) 2024 ColOpenData authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NAMESPACE

@@ -3,14 +3,15 @@
 export(aggregate_climate)
 export(code_to_name_dep)
 export(code_to_name_mun)
-export(dictionary)
 export(divipola_table)
 export(download_climate)
 export(download_climate_geom)
 export(download_climate_stations)
 export(download_demographic)
 export(download_geospatial)
 export(download_pop_projections)
+export(geospatial_dictionary)
+export(get_climate_tags)
 export(list_datasets)
 export(look_up)
 export(merge_geo_demographic)

NEWS.md

@@ -1,5 +1,11 @@
-# 0.1.0
+# 0.2.0
 
-* This project now includes a
-   [`NEWS.md`](https://r-pkgs.org/other-markdown.html#sec-news) file to inform
-   users about changes and new features.
+This project now includes a [`NEWS.md`](https://r-pkgs.org/other-markdown.html#sec-news) file to inform users about changes and new features.
+
+## New Features
+
+-   **Data Categories:** ColOpenData now includes four data categories: demographic, geospatial, climate, and population projections.
+
+-   **Data Merging:** Users can now merge information from demographic and geospatial data.
+
+-   **Auxiliary Functions:** Added auxiliary functions to retrieve information using DIVIPOLA codification.