Merge pull request #77 from Metropolitan-Council/76-gis_connection-no…

…t-available FIx `gis_connection()` export
Metropolitan-Council · Mar 26, 2024 · 8c65f34 · 8c65f34
2 parents e620aeb + 76f5398
commit 8c65f34
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: councilR
 Title: Functions and Templates for the Metropolitan Council
-Version: 0.2.5
-Date: 2023-12-22
+Version: 0.2.6
+Date: 2024-03-26
 Authors@R: c(
     person("Metropolitan Council", role = "cph"),
     person("Liz", "Roten", , "liz.roten@metc.state.mn.us", role = c("cre", "aut"),
@@ -63,5 +63,5 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Website: https://github.com/Metropolitan-Council/councilR
diff --git a/NAMESPACE b/NAMESPACE
@@ -10,6 +10,7 @@ export(emissions_connection)
 export(fetch_county_geo)
 export(fetch_ctu_geo)
 export(fred_connection)
+export(gis_connection)
 export(import_from_FRED)
 export(import_from_emissions)
 export(import_from_fred)

diff --git a/R/db_gis.R b/R/db_gis.R
@@ -19,6 +19,7 @@
 #'
 #' @rdname gis
 #' @family database functions
+#' @export
 #'
 #' @param dbname character, database name. Default is `"GISLibrary"`.
 #' @param uid character, user ID. Default is `getOption("councilR.uid")`
@@ -164,7 +165,6 @@ import_from_gis <- function(query,
   # if there are any geometry columns,
   # pull as wkt
   if ("geometry" %in% column_names$DATA_TYPE) {
-
     # fetch column name with geometry
     geo_column <- column_names %>%
       dplyr::filter(DATA_TYPE == "geometry") %>%

diff --git a/README.Rmd b/README.Rmd
@@ -39,7 +39,7 @@ Please see our contribution guidelines [here](.github/CONTRIBUTING.md).
 Thanks to all the folks who have contributed to this project in one way or another
 
 [&#x0040;ashleyasmus](https://github.com/ashleyasmus), [&#x0040;ehesch](https://github.com/ehesch), [&#x0040;eroten](https://github.com/eroten),
-[&#x0040;velicknd](https://github.com/velicknd),  [&#x0040;Brandon-Whited](https://github.com/Brandon-Whited),  [&#x0040;LimerickSam](https://github.com/LimerickSam), and  [&#x0040;leonx075](https://github.com/leonx075).
+[&#x0040;velicknd](https://github.com/velicknd), [&#x0040;schroeder-matt](https://github.com/schroeder-matt), [&#x0040;Brandon-Whited](https://github.com/Brandon-Whited),  [&#x0040;LimerickSam](https://github.com/LimerickSam), and  [&#x0040;leonx075](https://github.com/leonx075).
 
 
 

diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ or another
 [@ehesch](https://github.com/ehesch),
 [@eroten](https://github.com/eroten),
 [@velicknd](https://github.com/velicknd),
+[@schroeder-matt](https://github.com/schroeder-matt),
 [@Brandon-Whited](https://github.com/Brandon-Whited),
 [@LimerickSam](https://github.com/LimerickSam), and
 [@leonx075](https://github.com/leonx075).
diff --git a/tests/testthat/test-db_FRED.R b/tests/testthat/test-db_FRED.R
@@ -16,7 +16,7 @@ testthat::test_that("upercase group quarters table", {
     table_name = "GQ_UNIT",
     prod = TRUE,
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     db = "CD_RESEARCH_WEB"
   )
 
@@ -33,7 +33,7 @@ testthat::test_that("lowercase group quarters table", {
     table_name = "GQ_UNIT",
     prod = TRUE,
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     db = "CD_RESEARCH_WEB"
   )
 
@@ -48,7 +48,7 @@ testthat::test_that("lowercase group quarters table", {
 testthat::test_that("lowercase park unit via SQL", {
   fred <- fred_connection(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     db = "CD_RESEARCH_WEB"
   )
 
@@ -68,7 +68,7 @@ testthat::test_that("lowercase park unit via SQL", {
 testthat::test_that("uppercase park unit via SQL", {
   fred <- FRED_connection(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     db = "CD_RESEARCH_WEB"
   )
 

diff --git a/tests/testthat/test-db_emissions.R b/tests/testthat/test-db_emissions.R
@@ -25,7 +25,7 @@ testthat::skip_if(httr2::secret_has_key("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins"))
 testthat::test_that("emissions connection returns connection object", {
   test_conn <- emissions_connection(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY")
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY")
   )
 
   testthat::expect_s4_class(test_conn, "Microsoft SQL Server")
@@ -43,7 +43,7 @@ testthat::test_that("emissions connection returns connection object", {
 testthat::test_that("Residential electricity data is returned", {
   electric_residential <- import_from_emissions(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     table_name = "metro_energy.vw_electricity_residential_ctu"
   )
 

diff --git a/tests/testthat/test-db_gis.R b/tests/testthat/test-db_gis.R
@@ -10,10 +10,15 @@ testthat::skip_if(
 
 testthat::skip_if(httr2::secret_has_key("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins"))
 
+testthat::test_that("gis_connection is exported", {
+  testthat::expect_true("gis_connection" %in% ls("package:councilR"))
+})
+
+
 testthat::test_that("GIS connection returns connection object", {
   test_conn <- gis_connection(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY")
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY")
   )
 
   testthat::expect_s4_class(test_conn, "Microsoft SQL Server")
@@ -32,7 +37,7 @@ testthat::test_that("GIS connection returns connection object", {
 testthat::test_that("airports spatial dataset", {
   airport <- import_from_gis(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     query = "GISLibrary.dbo.AIRPORTS",
     dbname = "GISLibrary",
     .quiet = TRUE
@@ -50,7 +55,7 @@ testthat::test_that("airports spatial dataset", {
 testthat::test_that("county ctu lookup table", {
   lookup_table <- import_from_gis(
     uid = httr2::secret_decrypt("QUHBRb_yoy2RRj59qno8NVXA7mW402xkins", "COUNCILR_KEY"),
-    pwd = httr2::secret_decrypt("rQHk4S39pjfJ6yoKWUUNpQUDk2i9XA3d", "COUNCILR_KEY"),
+    pwd = httr2::secret_decrypt("tsGlVlM0KBdLcUPNLX5f0Hll2_6HFF_rQx62cw", "COUNCILR_KEY"),
     query = "GISLibrary.dbo.CountyCTULookupTable",
     dbname = "GISLibrary",
     .quiet = TRUE