diff --git a/dev/articles/accessibility.html b/dev/articles/accessibility.html index 7168de47..d306dd27 100644 --- a/dev/articles/accessibility.html +++ b/dev/articles/accessibility.html @@ -110,7 +110,7 @@

3.5 Detailed itineraries with time_window. diff --git a/dev/articles/time_window_files/figure-html/unnamed-chunk-4-1.png b/dev/articles/time_window_files/figure-html/unnamed-chunk-4-1.png index 6b09f3af..4916c0e5 100644 Binary files a/dev/articles/time_window_files/figure-html/unnamed-chunk-4-1.png and b/dev/articles/time_window_files/figure-html/unnamed-chunk-4-1.png differ diff --git a/dev/articles/travel_time_matrix.html b/dev/articles/travel_time_matrix.html index eacb55e0..179d9699 100644 --- a/dev/articles/travel_time_matrix.html +++ b/dev/articles/travel_time_matrix.html @@ -110,7 +110,7 @@ +# dev version with latest features +utils::remove.packages('r5r') +devtools::install_github("ipeaGIT/r5r", subdir = "r-package")

Please bear in mind that you need to have Java Development Kit (JDK) 21 installed on your computer to use r5r. No worries, you don’t have to pay for it. There are numerous open-source JDK implementations, any of which should work with r5r. If you don’t already have a preferred JDK, we recommend Adoptium/Eclipse Temurin. Other open-source JDK implementations include Amazon Corretto, and Oracle OpenJDK. You only need to install one JDK.

-

If you don’t know what version of Java you have installed on your computer, can check it by running this on R console.

+

The easiest way to install JDK is using the new {rJavaEnv} package in R:

-rJava::.jinit()
-rJava::.jcall("java.lang.System", "S", "getProperty", "java.version")
+# install.packages('rJavaEnv') + +# check version of Java currently installed (if any) +rJavaEnv::java_check_version_rjava() + +# install Java 21 +rJavaEnv::java_quick_install(version = 21)

Usage @@ -258,11 +261,12 @@

Demonstration on sample dataintro Vignette. To illustrate functionality, the package includes a small sample data set of the public transport and Open Street Map networks of Porto Alegre (Brazil). Three steps are required to use r5r, as follows.

-# allocate RAM memory to Java
+# allocate RAM memory to Java **before** loading the {r5r} library
 options(java.parameters = "-Xmx2G")
 
-# 1) build transport network, pointing to the path where OSM and GTFS data are stored
 library(r5r)
+
+# 1) build transport network, pointing to the path where OSM and GTFS data are stored
 path <- system.file("extdata/poa", package = "r5r")
 r5r_core <- setup_r5(data_path = path, verbose = FALSE)
 
diff --git a/dev/pkgdown.yml b/dev/pkgdown.yml
index 66ae2aea..c800b17f 100644
--- a/dev/pkgdown.yml
+++ b/dev/pkgdown.yml
@@ -11,4 +11,4 @@ articles:
   r5r: r5r.html
   time_window: time_window.html
   travel_time_matrix: travel_time_matrix.html
-last_built: 2024-07-19T04:28Z
+last_built: 2024-08-27T12:56Z
diff --git a/dev/reference/download_r5.html b/dev/reference/download_r5.html
index 2bdd6997..222a6181 100644
--- a/dev/reference/download_r5.html
+++ b/dev/reference/download_r5.html
@@ -134,8 +134,8 @@ 

Examples

library(r5r)
 
 download_r5(temp_dir = TRUE)
-#> Downloading R5 jar file to /tmp/Rtmpj4RU35/r5-v7.1-all.jar
-#> [1] "/tmp/Rtmpj4RU35/r5-v7.1-all.jar"
+#> Downloading R5 jar file to /tmp/Rtmpiwwlz6/r5-v7.1-all.jar
+#> [1] "/tmp/Rtmpiwwlz6/r5-v7.1-all.jar"
 

diff --git a/dev/reference/isochrone-1.png b/dev/reference/isochrone-1.png index dde40918..557072da 100644 Binary files a/dev/reference/isochrone-1.png and b/dev/reference/isochrone-1.png differ diff --git a/dev/reference/isochrone.html b/dev/reference/isochrone.html index cbefedd8..86504845 100644 --- a/dev/reference/isochrone.html +++ b/dev/reference/isochrone.html @@ -393,7 +393,7 @@

Examples

#> Geodetic CRS: WGS 84 #> id isochrone polygons #> 1 89a90128107ffff 100 POLYGON ((-51.2486 -30.0908... -#> 2 89a90128107ffff 90 POLYGON ((-51.2474 -30.0861... +#> 2 89a90128107ffff 90 POLYGON ((-51.2476 -30.086,... #> 3 89a90128107ffff 80 POLYGON ((-51.2464 -30.081,... #> 4 89a90128107ffff 70 POLYGON ((-51.242 -30.0785,... #> 5 89a90128107ffff 60 POLYGON ((-51.2414 -30.0741... diff --git a/dev/reference/r5r_sitrep.html b/dev/reference/r5r_sitrep.html index 8e649a42..2beb4479 100644 --- a/dev/reference/r5r_sitrep.html +++ b/dev/reference/r5r_sitrep.html @@ -128,7 +128,8 @@

Examples

#> Running under: Ubuntu 20.04.6 LTS #> #> Matrix products: default -#> BLAS/LAPACK: /usr/lib/x86_64-linux-gnu/openblas-pthread/libopenblasp-r0.3.8.so; LAPACK version 3.9.0 +#> BLAS: /usr/lib/x86_64-linux-gnu/openblas-pthread/libblas.so.3 +#> LAPACK: /usr/lib/x86_64-linux-gnu/openblas-pthread/liblapack.so.3; LAPACK version 3.9.0 #> #> locale: #> [1] LC_CTYPE=C.UTF-8 LC_NUMERIC=C @@ -148,25 +149,25 @@

Examples

#> [1] ggplot2_3.5.1 r5r_2.0.09999 #> #> loaded via a namespace (and not attached): -#> [1] gtable_0.3.5 xfun_0.46 httr2_1.0.2 htmlwidgets_1.6.4 +#> [1] gtable_0.3.5 xfun_0.47 httr2_1.0.3 htmlwidgets_1.6.4 #> [5] processx_3.8.4 rJava_1.0-11 callr_3.7.6 vctrs_0.6.5 -#> [9] tools_4.4.1 ps_1.7.7 generics_0.1.3 curl_5.2.1 +#> [9] tools_4.4.1 ps_1.7.7 generics_0.1.3 curl_5.2.2 #> [13] tibble_3.2.1 proxy_0.4-27 fansi_1.0.6 pkgconfig_2.0.3 -#> [17] sfheaders_0.4.4 KernSmooth_2.23-24 data.table_1.15.4 checkmate_2.3.1 +#> [17] sfheaders_0.4.4 KernSmooth_2.23-24 data.table_1.16.0 checkmate_2.3.2 #> [21] desc_1.4.3 lifecycle_1.0.4 farver_2.1.2 compiler_4.4.1 #> [25] brio_1.1.5 textshaping_0.4.0 munsell_0.5.1 htmltools_0.5.8.1 -#> [29] class_7.3-22 yaml_2.3.9 pillar_1.9.0 pkgdown_2.1.0 +#> [29] class_7.3-22 yaml_2.3.10 pillar_1.9.0 pkgdown_2.1.0 #> [33] whisker_0.4.1 classInt_0.4-10 cachem_1.1.0 wk_0.9.2 -#> [37] zip_2.3.1 tidyselect_1.2.1 digest_0.6.36 sf_1.0-16 +#> [37] zip_2.3.1 tidyselect_1.2.1 digest_0.6.37 sf_1.0-16 #> [41] dplyr_1.1.4 purrr_1.0.2 fastmap_1.2.0 grid_4.4.1 -#> [45] colorspace_2.1-0 cli_3.6.3 concaveman_1.1.0 magrittr_2.0.3 -#> [49] utf8_1.2.4 e1071_1.7-14 withr_3.0.0 scales_1.3.0 -#> [53] backports_1.5.0 rappdirs_0.3.3 rmarkdown_2.27 ragg_1.3.2 +#> [45] colorspace_2.1-1 cli_3.6.3 concaveman_1.1.0 magrittr_2.0.3 +#> [49] utf8_1.2.4 e1071_1.7-14 withr_3.0.1 scales_1.3.0 +#> [53] backports_1.5.0 rappdirs_0.3.3 rmarkdown_2.28 ragg_1.3.2 #> [57] memoise_2.0.1 evaluate_0.24.0 knitr_1.48 testthat_3.2.1.1 -#> [61] V8_4.4.2 s2_1.1.7 rlang_1.1.4 downlit_0.4.4 +#> [61] V8_5.0.0 s2_1.1.7 rlang_1.1.4 downlit_0.4.4 #> [65] Rcpp_1.0.13 glue_1.7.0 DBI_1.2.3 xml2_1.3.6 -#> [69] rstudioapi_0.16.0 jsonlite_1.8.8 R6_2.5.1 systemfonts_1.1.0 -#> [73] fs_1.6.4 units_0.8-5 +#> [69] rstudioapi_0.16.0 jsonlite_1.8.8 R6_2.5.1 rJavaEnv_0.1.2 +#> [73] systemfonts_1.1.0 fs_1.6.4 units_0.8-5 #>