Update code style for #486

NAMESPACE

@@ -148,7 +148,6 @@ export(rnet_get_nodes)
 export(rnet_group)
 export(route)
 export(route_average_gradient)
-export(route_bikecitizens)
 export(route_cyclestreets)
 export(route_dodgr)
 export(route_google)

R/google-functions.R

@@ -91,10 +91,10 @@ dist_google <- function(from, to, google_api = Sys.getenv("GOOGLEDIST"),
   mode <- match.arg(mode)
   base_url <- "https://maps.googleapis.com/maps/api/distancematrix/json?units="
   # Convert sp object to lat/lon vector
-  if (class(from) == "SpatialPoints" | class(from) == "SpatialPointsDataFrame") {
+  if (is(from, "SpatialPoints") | is(from, "SpatialPointsDataFrame")) {
     from <- coordinates(from)
   }
-  if (class(to) == "SpatialPoints" | class(to) == "SpatialPointsDataFrame") {
+  if (is(to, "SpatialPoints") | is(to, "SpatialPointsDataFrame")) {
     to <- coordinates(to)
   }
   if (google_api == "") {
@@ -120,7 +120,7 @@ dist_google <- function(from, to, google_api = Sys.getenv("GOOGLEDIST"),
     base_url, g_units, "&origins=", from,
     "&destinations=", to, "&mode=", mode
   )
-  if (class(arrival_time)[1] == "POSIXlt") {
+  if (is(arrival_time[1], "POSIXlt")) {
     arrival_time <- as.numeric(arrival_time)
     url_travel <- paste0(url_travel, "&arrival_time=", arrival_time)
   }

R/oneway.R

@@ -49,10 +49,10 @@ od_id_szudzik <- function(x, y, ordermatters = FALSE) {
     stop("x and y are not of equal length")
   }
 
-  if (class(x) == "factor") {
+  if (is(x, "factor")) {
     x <- as.character(x)
   }
-  if (class(y) == "factor") {
+  if (is(y, "factor")) {
     y <- as.character(y)
   }
   lvls <- unique(c(x, y))
@@ -88,8 +88,8 @@ od_id_character <- function(x, y) {
 
 convert_to_numeric <- function(x, y) {
   if (length(x) != length(y)) stop("x and y are not of equal length")
-  if (class(x) == "factor") x <- as.character(x)
-  if (class(y) == "factor") y <- as.character(y)
+  if (is(x, "factor")) x <- as.character(x)
+  if (is(y, "factor")) y <- as.character(y)
   lvls <- unique(c(x, y))
   x <- as.integer(factor(x, levels = lvls))
   y <- as.integer(factor(y, levels = lvls))

R/route-transport-api.R

@@ -52,10 +52,10 @@ route_transportapi_public <- function(from, to, silent = FALSE,
                                       region = "southeast", modes = NA, not_modes = NA) {
 
   # Convert sp object to lat/lon vector
-  if (class(from) == "SpatialPoints" | class(from) == "SpatialPointsDataFrame") {
+  if (is(from, "SpatialPoints") | is(from, "SpatialPointsDataFrame")) {
     from <- coordinates(from)
   }
-  if (class(to) == "SpatialPoints" | class(to) == "SpatialPointsDataFrame") {
+  if (is(to, "SpatialPoints") | is(to, "SpatialPointsDataFrame")) {
     to <- coordinates(to)
   }
 

R/route_cyclestreets.R

@@ -75,13 +75,14 @@ route_cyclestreets <- function(from, to, plan = "fastest", silent = TRUE, pat =
                                save_raw = "FALSE") {
 
   # Convert sp object to lat/lon vector
-  if (class(from) == "SpatialPoints" | class(from) == "SpatialPointsDataFrame") {
+  if (is(from, "SpatialPoints") | is(from, "SpatialPointsDataFrame")) {
     from <- coordinates(from)
   }
-  if (class(to) == "SpatialPoints" | class(to) == "SpatialPointsDataFrame") {
+  if (is(to, "SpatialPoints") | is(to, "SpatialPointsDataFrame")) {
     to <- coordinates(to)
   }
 
+
   # Convert character strings to lon/lat if needs be
   if (is.character(from)) {
     from <- geo_code(from)