diff --git a/NEWS.md b/NEWS.md index a068856..f4ac026 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,8 @@ * Fixed bug in `otp_isochrone` when using `fromID` * Slightly faster routing with large batches -* More mode choices in `otp_plan` +* More mode choices in `otp_plan` and `otp_isochrone` + # opentripplanner 0.5.1 diff --git a/R/otp-isochrone-batch.R b/R/otp-isochrone-batch.R index 863d8e5..69bf924 100644 --- a/R/otp-isochrone-batch.R +++ b/R/otp-isochrone-batch.R @@ -7,8 +7,9 @@ #' data frame of POINTS #' @param fromID character vector same length as fromPlace #' @param mode character vector of one or more modes of travel valid values -#' TRANSIT, WALK, BICYCLE, CAR, BUS, RAIL, SUBWAY, TRAM, FERRY, BICYCLE_RENT, -#' BICYCLE_PARK, CAR_PARK, CABLE_CAR, GONDOLA, FUNICULAR, AIRPLANE, default +#' "TRANSIT","BUS", "RAIL", "SUBWAY","TRAM", "FERRY", "GONDOLA", "FUNICULAR", +#' "AIRPLANE", "CABLE_CAR", "WALK", "BICYCLE", "BICYCLE_RENT", "BICYCLE_PARK", +#' "CAR", "CAR_PARK", "CAR_HAIL", "CARPOOL", "CAR_DROPOFF", "CAR_PICKUP", default #' CAR. Not all combinations are valid e.g. c("WALK","BUS") is valid but #' c("WALK","CAR") is not. #' @param date_time POSIXct, a date and time, defaults to current @@ -64,11 +65,12 @@ otp_isochrone <- function(otpcon = NA, mode <- toupper(mode) checkmate::assert_subset(mode, choices = c( - "TRANSIT", "WALK", "BICYCLE", - "CAR", "BUS", "RAIL", "SUBWAY", - "TRAM", "FERRY","BICYCLE_RENT", - "BICYCLE_PARK","CAR_PARK","CABLE_CAR", - "GONDOLA","FUNICULAR","AIRPLANE" + "TRANSIT","BUS", "RAIL", "SUBWAY","TRAM", "FERRY", + "GONDOLA","FUNICULAR","AIRPLANE","CABLE_CAR", + "WALK", + "BICYCLE","BICYCLE_RENT","BICYCLE_PARK", + "CAR","CAR_PARK", + "CAR_HAIL","CARPOOL","CAR_DROPOFF","CAR_PICKUP" ), empty.ok = FALSE ) diff --git a/man/otp_isochrone.Rd b/man/otp_isochrone.Rd index 4e60526..8a65cd9 100644 --- a/man/otp_isochrone.Rd +++ b/man/otp_isochrone.Rd @@ -29,8 +29,9 @@ or 2 column matrix of Longitude/Latitude pairs, or sf \item{fromID}{character vector same length as fromPlace} \item{mode}{character vector of one or more modes of travel valid values -TRANSIT, WALK, BICYCLE, CAR, BUS, RAIL, SUBWAY, TRAM, FERRY, BICYCLE_RENT, -BICYCLE_PARK, CAR_PARK, CABLE_CAR, GONDOLA, FUNICULAR, AIRPLANE, default +"TRANSIT","BUS", "RAIL", "SUBWAY","TRAM", "FERRY", "GONDOLA", "FUNICULAR", +"AIRPLANE", "CABLE_CAR", "WALK", "BICYCLE", "BICYCLE_RENT", "BICYCLE_PARK", +"CAR", "CAR_PARK", "CAR_HAIL", "CARPOOL", "CAR_DROPOFF", "CAR_PICKUP", default CAR. Not all combinations are valid e.g. c("WALK","BUS") is valid but c("WALK","CAR") is not.} diff --git a/man/otp_plan.Rd b/man/otp_plan.Rd index 5a64c9e..152b026 100644 --- a/man/otp_plan.Rd +++ b/man/otp_plan.Rd @@ -40,9 +40,10 @@ or sf data frame of POINTS with CRS 4326} \item{toID}{character vector same length as toPlace} \item{mode}{character vector of one or more modes of travel valid values -TRANSIT, WALK, BICYCLE, CAR, BUS, RAIL, SUBWAY, TRAM, FERRY, BICYCLE_RENT, -BICYCLE_PARK, CAR_PARK, CABLE_CAR, GONDOLA, FUNICULAR, AIRPLANE, default -CAR. Not all combinations are valid e.g. c("WALK","BUS") is valid but +"TRANSIT","BUS", "RAIL", "SUBWAY","TRAM", "FERRY", "GONDOLA", "FUNICULAR", +"AIRPLANE", "CABLE_CAR", "WALK", "BICYCLE", "BICYCLE_RENT", "BICYCLE_PARK", +"CAR", "CAR_PARK", "CAR_HAIL", "CARPOOL", "CAR_DROPOFF", "CAR_PICKUP", +default "CAR". Not all combinations are valid e.g. c("WALK","BUS") is valid but c("WALK","CAR") is not.} \item{date_time}{POSIXct, a date and time, defaults to current date and time} diff --git a/man/otp_surface_isochrone.Rd b/man/otp_surface_isochrone.Rd index 396ce47..6ad5b65 100644 --- a/man/otp_surface_isochrone.Rd +++ b/man/otp_surface_isochrone.Rd @@ -9,7 +9,7 @@ otp_surface_isochrone(otpcon = NULL, surface = NULL) \arguments{ \item{otpcon}{OTP connection object produced by otp_connect()} -\item{surface}{A suface list from otp_make_surface()} +\item{surface}{A surface list from otp_make_surface()} } \value{ Returns a data.frame of travel times