Merge pull request #81 from kosukeimai/issue_80

Bug fixes October
kosukeimai · Oct 18, 2022 · 7d15f2c · 7d15f2c
2 parents 409e25d + c7734b8
commit 7d15f2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -14,3 +14,4 @@ Date        Version  Comment
 2020-04-22  0.1-11   Minor fix requested by CRAN
 2020-05-17  0.1-12   Some Census API improvements (thanks to Silvia Kim)
 2022-06-17  1.0.0    Updates to BISG, inclusion of fBISG and other package improvements
+2022-10-04  1.0.1    Bug fixes for census url and census year
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: wru
-Version: 1.0.0010
+Version: 1.0.1
 Date: 2022-07-26
 Title: Who are You? Bayesian Prediction of Racial Category Using Surname, First Name, Middle Name, and
     Geolocation

diff --git a/R/census_geo_api.R b/R/census_geo_api.R
@@ -69,7 +69,7 @@ census_geo_api <- function(key = NULL, state, geo = "tract", age = FALSE, sex =
   # }
 
   # assign variable values based on the year of the census data
-  if (year != "2020"){
+  if (as.character(year) != "2020"){
     vars_ <- c(
       pop_white = 'P005003', pop_black = 'P005004',
       pop_aian = 'P005005', pop_asian = 'P005006',
@@ -110,7 +110,7 @@ census_geo_api <- function(key = NULL, state, geo = "tract", age = FALSE, sex =
   }
 
   # set the census data url links
-  if (year != "2020") {
+  if (as.character(year) != "2020") {
     census_data_url = "https://api.census.gov/data/2010/dec/sf1?"
   }
   else {
@@ -199,7 +199,7 @@ census_geo_api <- function(key = NULL, state, geo = "tract", age = FALSE, sex =
           blockgroup <- paste("for=block+group:*&in=state:", state.fips, "+county:", county_list[county], sep = "")
 
           # message(region_tract)
-          blockgroup_df <- get_census_api("https://api.census.gov/data/2010/dec/sf1?", key = key, var.names = vars_, region = blockgroup, retry)
+          blockgroup_df <- get_census_api(census_data_url, key = key, var.names = vars_, region = blockgroup, retry)
           names(blockgroup_df)[4] <- "block_group" # Fix name, it comes in with a space from api. 
           blockgroup_df
         }
@@ -243,14 +243,14 @@ census_geo_api <- function(key = NULL, state, geo = "tract", age = FALSE, sex =
 
           region_tract <- paste("for=tract:*&in=state:", state.fips, "+county:", county_list[county], sep = "")
           # message(region_tract)
-          tract_df <- get_census_api("https://api.census.gov/data/2010/dec/sf1?", key = key, var.names = vars_, region = region_tract, retry)
+          tract_df <- get_census_api(census_data_url, key = key, var.names = vars_, region = region_tract, retry)
           tract_list <- tract_df$tract
 
           furrr::future_map_dfr(1:length(tract_list), function(tract) {
             message(paste("Tract ", tract, " of ", length(tract_list), ": ", tract_list[tract], sep = ""))
 
             region_block <- paste("for=block:*&in=state:", state.fips, "+county:", county_list[county], "+tract:", tract_list[tract], sep = "")
-            get_census_api("https://api.census.gov/data/2010/dec/sf1?", key = key, var.names = vars_, region = region_block, retry)
+            get_census_api(census_data_url, key = key, var.names = vars_, region = region_block, retry)
           })
         }
       )