streamline api_options parameter checking

Author: Jesse Cambon

R/geo.R

@@ -267,7 +267,7 @@ geo <-
 
     # Check parameter arguments --------------------------------------------------------
 
-    check_api_options(method, api_options, reverse = FALSE)
+    check_api_options(method, api_options, FALSE, return_addresses)
 
     # Check argument inputs
     if (is.null(address) && is.null(street) && is.null(city) && is.null(county) && is.null(state) && is.null(postalcode) && is.null(country)) {
@@ -293,11 +293,7 @@ geo <-
       is.logical(full_results), is.logical(unique_only), is.logical(return_addresses),
       is.null(batch_limit_error) || is.logical(batch_limit_error), is.logical(progress_bar), is.logical(quiet),
       is.numeric(timeout), timeout >= 0,
-      is.list(custom_query),
-      is.null(api_options[["mapbox_permanent"]]) || is.logical(api_options[["mapbox_permanent"]]),
-      is.null(api_options[["here_request_id"]]) || is.character(api_options[["here_request_id"]]),
-      is.null(api_options[["mapquest_open"]]) || is.logical(api_options[["mapquest_open"]]),
-      is.null(api_options[["geocodio_hipaa"]]) || is.logical(api_options[["geocodio_hipaa"]])
+      is.list(custom_query)
     )
 
     check_verbose_quiet(verbose, quiet, reverse = FALSE)

R/input_handling.R

@@ -6,6 +6,7 @@
 # utility function for packaging either lat longs or address data
 # takes a dataframe input
 # cords = TRUE if processing coordinates
+# note that reverse_geo() converts lat and long into numeric before passing to this function
 package_inputs <- function(input_orig, coords = FALSE) {
   input_colnames <- names(input_orig) # store column names
 

R/reverse_geo.R

@@ -185,17 +185,13 @@ reverse_geo <-
       is.logical(verbose), is.logical(no_query), is.logical(flatten),
       is.logical(full_results), is.logical(unique_only), is.logical(progress_bar),
       is.logical(quiet),
-      is.list(custom_query),
-      is.null(api_options[["mapbox_permanent"]]) || is.logical(api_options[["mapbox_permanent"]]),
-      is.null(api_options[["here_request_id"]]) || is.character(api_options[["here_request_id"]]),
-      is.null(api_options[["mapquest_open"]]) || is.logical(api_options[["mapquest_open"]]), 
-      is.null(api_options[["geocodio_hipaa"]]) || is.logical(api_options[["geocodio_hipaa"]])
+      is.list(custom_query)
     )
 
     check_verbose_quiet(verbose, quiet, reverse = FALSE)
 
     # Check method argument
-    check_api_options(method, api_options, reverse = TRUE)
+    check_api_options(method, api_options, TRUE, return_coords)
     check_method(method, reverse = TRUE, mode, reverse_batch_func_map)
 
     if (length(lat) != length(long)) stop("Lengths of lat and long must be equal.", call. = FALSE)
@@ -288,8 +284,6 @@ reverse_geo <-
         ))
       }
 
-      if (method == "here") check_here_return_input(api_options[["here_request_id"]], return_coords, reverse = TRUE)
-
       # Enforce batch limit if needed
       if (num_unique_coords > batch_limit) {
         stop(paste0(

R/utils.R

@@ -382,7 +382,19 @@ apply_api_options_defaults <- function(method, api_options) {
 
 # throw error if method and a specified api_option is mismatched 
 # ie. method='census' and api_options(list(geocodio_hipaa=TRUE))
-check_api_options <- function(method, api_options, reverse=FALSE) {
+# return_inputs : return_addresses for geo() or return_inputs for reverse_geo()
+check_api_options <- function(method, api_options, reverse, return_inputs) {
+  
+  stopifnot(
+    is.null(api_options[["mapbox_permanent"]]) || is.logical(api_options[["mapbox_permanent"]]),
+    is.null(api_options[["here_request_id"]]) || is.character(api_options[["here_request_id"]]),
+    is.null(api_options[["mapquest_open"]]) || is.logical(api_options[["mapquest_open"]]),
+    is.null(api_options[["geocodio_hipaa"]]) || is.logical(api_options[["geocodio_hipaa"]])
+  )
+  
+  if (method == "here") check_here_return_input(api_options[["here_request_id"]], return_inputs, reverse = reverse)
+  
+  
   # cycle through the api options specified (except for init)
   if (api_options$init == TRUE) {
     api_method_mismatch_args <- c() # store mismatch api_options here
@@ -404,7 +416,6 @@ check_api_options <- function(method, api_options, reverse=FALSE) {
       }
     } # end loop
 
-    
     # error message for bad api arguments
     if (length(api_bad_args) != 0) {
       error_message <- c(error_message,