Merge branch 'master' of https://github.com/ipeaGIT/r5r into master

# Conflicts:
#	r-package/R/download_r5.R

r-package/R/detailed_itineraries.R

@@ -89,7 +89,7 @@
 #'
 #' @family routing
 #'
-#' @examples \dontrun{ if (interactive()) {
+#' @examples if (interactive()) {
 #' library(r5r)
 #'
 #' # build transport network
@@ -111,7 +111,7 @@
 #'                             max_trip_duration = 120L)
 #'
 #' stop_r5(r5r_core)
-#' } }
+#' }
 #' @export
 
 detailed_itineraries <- function(r5r_core,

r-package/R/download_r5.R

@@ -16,12 +16,12 @@
 #' @return A jar file is saved locally in the r5r package directory
 #' @family setup
 #' @export
-#' @examples \dontrun{ if (interactive()) {
+#' @examples if (interactive()) {
 #'
 #' library(r5r)
 #'
 #' download_r5(version = "6.0.1", temp_dir = TRUE)
-#' } }
+#' }
 
 download_r5 <- function(version = "6.0.1",
                         quiet = FALSE,

r-package/R/setup_r5.R

@@ -18,7 +18,7 @@
 #'
 #' @return An rJava object to connect with R5 routing engine
 #' @family setup
-#' @examples \dontrun{ if (interactive()) {
+#' @examples if (interactive()) {
 #'
 #' library(r5r)
 #'
@@ -27,7 +27,7 @@
 #'
 #' r5r_core <- setup_r5(data_path = path, temp_dir = TRUE)
 #'
-#' } }
+#' }
 #' @export
 
 setup_r5 <- function(data_path,

r-package/R/stop_r5.R

@@ -5,15 +5,15 @@
 #' @param ... \code{r5r_core} objects currently running. By default, if no cores
 #'            are supplied all running cores are stopped.
 #'
-#' @examples \dontrun{ if (interactive()) {
+#' @examples if (interactive()) {
 #'   library(r5r)
 #'
 #'   path <- system.file("extdata/poa", package = "r5r")
 #'
 #'   r5r_core <- setup_r5(data_path = path)
 #'
 #'   stop_r5(r5r_core)
-#' } }
+#' }
 #'
 #' @return No return value, called for side effects.
 #' @family support functions

r-package/R/street_network_to_sf.R

@@ -8,19 +8,19 @@
 #'
 #' @family support functions
 #'
-#' @examples \dontrun{ if (interactive()) {
+#' @examples if (interactive()) {
 #'
 #' library(r5r)
 #'
 #' # build transport network
 #' path <- system.file("extdata/poa", package = "r5r")
 #' r5r_core <- setup_r5(data_path = path)
 #'
-#' # load origin/destination points
+#' # extract street network from r5r_core
 #' street_net <- street_network_to_sf(r5r_core)
 #'
 #' stop_r5(r5r_core)
-#' } }
+#' }
 #' @export
 
 street_network_to_sf <- function(r5r_core) {

r-package/R/travel_time_matrix.R

@@ -103,7 +103,7 @@
 #'  routing. Transportation Science, 49(3), 591-604.
 #'
 #' @family routing
-#' @examples \dontrun{ if (interactive()) {
+#' @examples if (interactive()) {
 #' library(r5r)
 #'
 #' # build transport network
@@ -126,7 +126,7 @@
 #'
 #' stop_r5(r5r_core)
 #'
-#' } }
+#' }
 #' @export
 
 travel_time_matrix <- function(r5r_core,