use quoted default values to fix memoise

jessecambon · Oct 28, 2021 · 4a37cf0 · 4a37cf0
1 parent 4fbfbc4
commit 4a37cf0
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/R/geo.R b/R/geo.R
@@ -147,7 +147,7 @@ progress_geo <- function(pb = NULL, ...) {
 #' @export
 geo <- function(address = NULL, 
     street = NULL, city = NULL, county = NULL, state = NULL, postalcode = NULL, country = NULL,
-    method = 'osm', cascade_order = c('census', 'osm'), lat = lat, long = long, limit = 1, 
+    method = 'osm', cascade_order = c('census', 'osm'), lat = 'lat', long = 'long', limit = 1, 
     full_results = FALSE, mode = '', unique_only = FALSE, return_addresses = TRUE,
     min_time = NULL, progress_bar = show_progress_bar(), quiet = getOption("tidygeocoder.quiet", FALSE), 
     api_url = NULL, timeout = 20, flatten = TRUE, batch_limit = NULL, batch_limit_error = TRUE, 

diff --git a/R/geocode.R b/R/geocode.R
@@ -59,7 +59,7 @@
 #' @export
 geocode <- function(.tbl, address = NULL, street = NULL, city = NULL, county = NULL, 
                     state = NULL, postalcode = NULL, country = NULL,
-                    lat = lat, long = long, return_input = TRUE, limit = 1, return_addresses = NULL, unique_only = FALSE, ...) {
+                    lat = 'lat', long = 'long', return_input = TRUE, limit = 1, return_addresses = NULL, unique_only = FALSE, ...) {
 
   # Non-standard evaluation --------------------------------------------------------------
   # Quote unquoted vars without double quoting quoted vars

diff --git a/R/geocode_combine.R b/R/geocode_combine.R
@@ -168,7 +168,7 @@ geo_combine <- function(queries, global_params = list(), address = NULL,
 #' @export
 geocode_combine <- function(.tbl, queries, global_params = list(),  
                           return_list = FALSE, cascade = TRUE, query_names = NULL,
-                          lat = lat, long = long) {
+                          lat = 'lat', long = 'long') {
 
   # NSE - converts lat and long parameters to character values
   lat <- rm_quote(deparse(substitute(lat)))

diff --git a/R/reverse_geo.R b/R/reverse_geo.R
@@ -98,7 +98,7 @@ get_coord_parameters <- function(custom_query, method, lat, long) {
 #' }
 #' @seealso [reverse_geocode] [api_parameter_reference] [min_time_reference] [batch_limit_reference]
 #' @export
-reverse_geo <- function(lat, long, method = 'osm', address = address, limit = 1, 
+reverse_geo <- function(lat, long, method = 'osm', address = 'address', limit = 1, 
     full_results = FALSE, mode = '', unique_only = FALSE, return_coords = TRUE,
     min_time = NULL, progress_bar = show_progress_bar(), quiet = getOption("tidygeocoder.quiet", FALSE), 
     api_url = NULL, timeout = 20, flatten = TRUE, 

diff --git a/R/reverse_geocode.R b/R/reverse_geocode.R
@@ -48,7 +48,7 @@
 #' }
 #' @seealso [reverse_geo]
 #' @export
-reverse_geocode <- function(.tbl, lat, long, address = address, return_input = TRUE, limit = 1, return_coords = NULL, unique_only = FALSE, ...) {
+reverse_geocode <- function(.tbl, lat, long, address = 'address', return_input = TRUE, limit = 1, return_coords = NULL, unique_only = FALSE, ...) {
 
   # Non-standard evaluation --------------------------------------------------------------
   # Quote unquoted vars without double quoting quoted vars

diff --git a/man/geo.Rd b/man/geo.Rd
diff --git a/man/geocode.Rd b/man/geocode.Rd
diff --git a/man/geocode_combine.Rd b/man/geocode_combine.Rd
diff --git a/man/reverse_geo.Rd b/man/reverse_geo.Rd
diff --git a/man/reverse_geocode.Rd b/man/reverse_geocode.Rd