cran

Author: dcooley

.Rbuildignore

@@ -13,3 +13,4 @@ README.md
 ^_pkgdown\.yml$
 ^docs$
 ^pkgdown$
+^CRAN-SUBMISSION$

DESCRIPTION

@@ -2,7 +2,7 @@ Package: googleway
 Type: Package
 Title: Accesses Google Maps APIs to Retrieve Data and Plot Maps
 Version: 2.7.7
-Date: 2023-04-11
+Date: 2023-04-15
 Authors@R: c(
     person("David", "Cooley", ,"dcooley@symbolix.com.au", role = c("aut", "cre")),
     person("Paulo", "Barcelos", role = "ctb", comment = "Author of c++ decode_pl"),

R/parameter_checks.R

@@ -261,7 +261,7 @@ validateAvoid <- function(avoid){
 validateBounds <- function(bounds){
   if(is.null(bounds)) return(NULL)
 
-  if(!is(bounds, "list") | !all(sapply(bounds, inherits, "numeric")) | length(bounds) != 2)
+  if(!inherits(bounds, "list") | !all(sapply(bounds, inherits, "numeric")) | length(bounds) != 2)
     stop("bounds must be a list of length 2, each item being a vector of lat/lon coordinate pairs")
 
   if(!all(sapply(bounds, length) == 2))
@@ -381,7 +381,7 @@ validateLocationBias <- function( point, circle, rectangle ) {
 validateLanguage <- function(language){
   if(is.null(language)) return(NULL)
 
-  if(!is(language, "character") | length(language) > 1){
+  if(!inherits(language, "character") | length(language) > 1){
     stop("language must be a single string")
   }
   return(tolower(language))
@@ -614,7 +614,7 @@ validateRankBy <- function(rankby, location, search_string){
 validateRegion <- function(region){
   if(is.null(region)) return(NULL)
 
-  if(!is(region, "character") | length(region) > 1)
+  if(!inherits(region, "character") | length(region) > 1)
     stop("region must be a two-character string")
 
   return(tolower(region))
@@ -623,7 +623,7 @@ validateRegion <- function(region){
 validateResultType <- function(result_type){
   if(is.null(result_type)) return(NULL)
 
-  if(!is(result_type, "character") )
+  if(!inherits(result_type, "character") )
     stop("result_type must be a vector of strings")
 
   if(length(result_type) > 1){
@@ -687,7 +687,7 @@ validateWaypoints <- function(waypoints, optimise_waypoints, mode){
   if(!mode %in% c("driving", "walking","bicycling"))
     stop("waypoints are only valid for driving, walking or bicycling modes")
 
-  if(!is(waypoints, "list"))
+  if(!inherits(waypoints, "list"))
     stop("waypoints must be a list")
 
   if(!all(names(waypoints) %in% c("stop", "via")))