Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions r-package/R/accessibility.R
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ accessibility <- function(r5r_network,
opportunities_colnames = "opportunities",
mode = "WALK",
mode_egress = "WALK",
departure_datetime = Sys.time(),
departure_datetime = NULL,
time_window = 10L,
percentiles = 50L,
decay_function = "step",
Expand Down Expand Up @@ -179,7 +179,7 @@ accessibility <- function(r5r_network,
destinations <- assign_points_input(destinations, "destinations")
opportunities <- assign_opportunities(destinations, opportunities_colnames)
mode_list <- assign_mode(mode, mode_egress)
departure <- assign_departure(departure_datetime)
departure <- assign_departure(departure_datetime, mode_list)

# check availability of transit services on the selected date
if (mode_list$transit_mode %like% 'TRANSIT|TRAM|SUBWAY|RAIL|BUS|CABLE_CAR|GONDOLA|FUNICULAR') {
Expand Down
7 changes: 6 additions & 1 deletion r-package/R/arrival_travel_time_matrix.R
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ arrival_travel_time_matrix <- function(r5r_network,
destinations,
mode = "WALK",
mode_egress = "WALK",
arrival_datetime = Sys.time(),
arrival_datetime,
breakdown = FALSE,
max_walk_time = Inf,
max_bike_time = Inf,
Expand Down Expand Up @@ -133,6 +133,11 @@ arrival_travel_time_matrix <- function(r5r_network,
mode_list <- assign_mode(mode, mode_egress)

# calculate departure datetime
checkmate::assert(
!is.null(arrival_datetime),
.var.name = "arrival_datetime",
msg = "You must pass an arrival_datetime to use arrival_travel_time_matrix"
)
departure_datetime <- arrival_datetime - as.difftime(max_trip_duration, units = "mins")
departure <- assign_departure(departure_datetime)

Expand Down
11 changes: 10 additions & 1 deletion r-package/R/assign.R
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,16 @@ assign_mode <- function(mode, mode_egress, style) {
#' @family assigning functions
#'
#' @keywords internal
assign_departure <- function(datetime) {
assign_departure <- function(datetime, mode_list) {
if (is.null(datetime)) {
if (mode_list$transit_mode == "") {
datetime <- Sys.time()
} else {
stop("When using a transit mode you must pass a departure_datetime", call. = FALSE)
}
}


checkmate::assert_posixct(
datetime,
len = 1,
Expand Down
4 changes: 2 additions & 2 deletions r-package/R/detailed_itineraries.R
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ detailed_itineraries <- function(r5r_network,
destinations,
mode = "WALK",
mode_egress = "WALK",
departure_datetime = Sys.time(),
departure_datetime = NULL,
time_window = 10L,
suboptimal_minutes = 0L,
max_walk_time = Inf,
Expand Down Expand Up @@ -157,7 +157,7 @@ detailed_itineraries <- function(r5r_network,
destinations <- od_list$destinations

mode_list <- assign_mode(mode, mode_egress)
departure <- assign_departure(departure_datetime)
departure <- assign_departure(departure_datetime, mode_list)

# check availability of transit services on the selected date
if (mode_list$transit_mode %like% 'TRANSIT|TRAM|SUBWAY|RAIL|BUS|CABLE_CAR|GONDOLA|FUNICULAR') {
Expand Down
4 changes: 2 additions & 2 deletions r-package/R/expanded_travel_time_matrix.R
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ expanded_travel_time_matrix <- function(r5r_network,
destinations,
mode = "WALK",
mode_egress = "WALK",
departure_datetime = Sys.time(),
departure_datetime = NULL,
time_window = 10L,
breakdown = FALSE,
max_walk_time = Inf,
Expand Down Expand Up @@ -140,7 +140,7 @@ expanded_travel_time_matrix <- function(r5r_network,
origins <- assign_points_input(origins, "origins")
destinations <- assign_points_input(destinations, "destinations")
mode_list <- assign_mode(mode, mode_egress)
departure <- assign_departure(departure_datetime)
departure <- assign_departure(departure_datetime, mode_list)

# check availability of transit services on the selected date
if (mode_list$transit_mode %like% 'TRANSIT|TRAM|SUBWAY|RAIL|BUS|CABLE_CAR|GONDOLA|FUNICULAR') {
Expand Down
2 changes: 1 addition & 1 deletion r-package/R/isochrone.R
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ isochrone <- function(r5r_network,
mode_egress = "walk",
cutoffs = c(0, 15, 30),
zoom = 10,
departure_datetime = Sys.time(),
departure_datetime = NULL,
polygon_output = TRUE,
time_window = 10L,
max_walk_time = Inf,
Expand Down
4 changes: 2 additions & 2 deletions r-package/R/pareto_frontier.R
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pareto_frontier <- function(r5r_network,
destinations,
mode = c("WALK", "TRANSIT"),
mode_egress = "WALK",
departure_datetime = Sys.time(),
departure_datetime = NULL,
time_window = 10L,
percentiles = 50L,
max_walk_time = Inf,
Expand Down Expand Up @@ -135,7 +135,7 @@ pareto_frontier <- function(r5r_network,
origins <- assign_points_input(origins, "origins")
destinations <- assign_points_input(destinations, "destinations")
mode_list <- assign_mode(mode, mode_egress)
departure <- assign_departure(departure_datetime)
departure <- assign_departure(departure_datetime, mode_list)

# check availability of transit services on the selected date
if (mode_list$transit_mode %like% 'TRANSIT|TRAM|SUBWAY|RAIL|BUS|CABLE_CAR|GONDOLA|FUNICULAR') {
Expand Down
4 changes: 2 additions & 2 deletions r-package/R/travel_time_matrix.R
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ travel_time_matrix <- function(r5r_network,
destinations,
mode = "WALK",
mode_egress = "WALK",
departure_datetime = Sys.time(),
departure_datetime = NULL,
time_window = 10L,
percentiles = 50L,
max_walk_time = Inf,
Expand Down Expand Up @@ -163,7 +163,7 @@ travel_time_matrix <- function(r5r_network,
origins <- assign_points_input(origins, "origins")
destinations <- assign_points_input(destinations, "destinations")
mode_list <- assign_mode(mode, mode_egress)
departure <- assign_departure(departure_datetime)
departure <- assign_departure(departure_datetime, mode_list)

# check availability of transit services on the selected date
if (mode_list$transit_mode %like% 'TRANSIT|TRAM|SUBWAY|RAIL|BUS|CABLE_CAR|GONDOLA|FUNICULAR') {
Expand Down
2 changes: 1 addition & 1 deletion r-package/man/accessibility.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/arrival_travel_time_matrix.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/assign_departure.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/detailed_itineraries.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/expanded_travel_time_matrix.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/isochrone.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/pareto_frontier.Rd

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

2 changes: 1 addition & 1 deletion r-package/man/travel_time_matrix.Rd

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

Loading