api options check function incomplete

Author: Jesse Cambon

R/input_handling.R

@@ -13,13 +13,13 @@ package_inputs <- function(input_orig, coords = FALSE) {
 
   # limit lat/longs in unique dataset to possible values
   if (coords == TRUE) {
-    input_unique$lat[(input_unique$lat > 90 | input_unique$lat < -90)] <- NA
-    input_unique$long[(input_unique$long > 180 | input_unique$long < -180)] <- NA
+    input_unique$lat[(input_unique$lat > 90 | input_unique$lat < -90)] <- as.numeric(NA)
+    input_unique$long[(input_unique$long > 180 | input_unique$long < -180)] <- as.numeric(NA)
 
     # If lat is NA then make long NA and vice versa (ie. don't pass coordinate if
     # only one value exists)
-    input_unique$lat <- ifelse(is.na(input_unique$long), NA, input_unique$lat)
-    input_unique$long <- ifelse(is.na(input_unique$lat), NA, input_unique$long)
+    input_unique$lat <- ifelse(is.na(input_unique$long), as.numeric(NA), input_unique$lat)
+    input_unique$long <- ifelse(is.na(input_unique$lat), as.numeric(NA), input_unique$long)
   }
 
   # remove rows that are entirely blank or NA

R/results_processing.R

@@ -108,7 +108,7 @@ extract_results <- function(method, response, full_results = TRUE, flatten = TRU
 
     # add prefix to variable names that likely could be in our input dataset
     # to avoid variable name overlap
-    for (var in c("address", "street", "city", "county", "state", "postalcode", "postcode", "country")) {
+    for (var in c(pkg.globals$address_arg_names, "postcode")) {
       if (var %in% names(results)) {
         names(results)[names(results) == var] <- paste0(method, "_", var)
       }
@@ -177,7 +177,7 @@ extract_reverse_results <- function(method, response, full_results = TRUE, flatt
     "geoapify" = response$features$properties["formatted"]
   )
 
-  # Return NA if data is not empty or not valid (cannot be turned into a dataframe)
+  # Return NA if data is empty or not valid (cannot be turned into a dataframe)
   if (is.null(names(address)) | all(sapply(address, is.null)) | length(address) == 0) {
     return(NA_result)
   }

R/reverse_geo.R

@@ -197,7 +197,6 @@ reverse_geo <-
     check_verbose_quiet(verbose, quiet, reverse = FALSE)
 
     # Check method argument
-
     check_api_options(api_options, "reverse_geo")
     check_method(method, reverse = TRUE, mode, reverse_batch_func_map)
 

R/utils.R

@@ -104,20 +104,6 @@ format_address <- function(df, fields) {
 # QA Checks --------------------------------------------------------------------
 # functions called by reverse_geo() and/or geo()
 
-check_api_options <- function(api_options, func_name) {
-  for (param in names(api_options)) {
-    if (!param %in% c("cascade_flag", "init", names(pkg.globals$default_api_options))) {
-      stop(
-        paste0(
-          "Invalid parameter ", '"', param, '"',
-          " used in the api_options argument. See ?", func_name
-        ),
-        call. = FALSE
-      )
-    }
-  }
-}
-
 # check the data type of an address argument - called by geo() function
 # should not be a matrix, class, or dataframe for instance
 # allow factor since it could be coerced to a datatype by address handler function
@@ -384,22 +370,46 @@ flatten_override_warning <- function(flatten, method, reverse, batch) {
   }
 }
 
+
+# TODO: combine these two functions
+
+check_api_options <- function(api_options, func_name) {
+  for (param in names(api_options)) {
+    if (!param %in% c("cascade_flag", "init", names(pkg.globals$default_api_options))) {
+      stop(
+        paste0(
+          "Invalid parameter ", '"', param, '"',
+          " used in the api_options argument. See ?", func_name
+        ),
+        call. = FALSE
+      )
+    }
+  }
+}
+
 # throw error if method and a specified api_option is mismatched 
 # ie. method='census' and api_options(list(geocodio_hipaa=TRUE))
 check_method_api_options_mismatch <- function(method, api_options, reverse=FALSE) {
   # cycle through the api options specified (except for init)
   if (api_options$init == TRUE) {
-    for (api_opt in names(api_options)[!names(api_options) %in% c('init')]) {
+    bad_api_args <- c()
+    for (api_opt in names(api_options)[!names(api_options) %in% c('cascade_flag', 'init')]) {
       # extract method name from api_option
       api_opt_method <- strsplit(api_opt, "_")[[1]][[1]]
 
+      # if mismatch then add offending arg to vector
       if (api_opt_method != method) {
-        stop(
-          'method="', method, '" is not meant for use with api_options=list(', api_opt, ')\n',
-          'See ?', if (reverse == TRUE) "reverse_geo" else "geo",
-          call. = FALSE
-        )
+        bad_api_args <- c(bad_api_args, api_opt)
       }
     }
+    
+    if (length(bad_api_args) != 0) {
+      stop(
+        'method="', method, '" is not compatible with the specified api_options parameter(s):\n\n',
+        paste0(bad_api_args, sep = "  "), "\n\n",
+        'See ?', if (reverse == TRUE) "reverse_geo" else "geo",
+        call. = FALSE
+      )
+    }
   }
 }