Skip to content

Commit

Permalink
cran
Browse files Browse the repository at this point in the history
  • Loading branch information
dcooley committed Apr 14, 2023
1 parent b137413 commit ea21fca
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ README.md
^_pkgdown\.yml$
^docs$
^pkgdown$
^CRAN-SUBMISSION$
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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", ,"[email protected]", role = c("aut", "cre")),
person("Paulo", "Barcelos", role = "ctb", comment = "Author of c++ decode_pl"),
Expand Down
10 changes: 5 additions & 5 deletions R/parameter_checks.R
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand All @@ -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){
Expand Down Expand Up @@ -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")))
Expand Down
5 changes: 0 additions & 5 deletions cran-comments.md

This file was deleted.

2 changes: 2 additions & 0 deletions man/google_map_view.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ea21fca

Please sign in to comment.