Edited .gitignore, edited README, edited Makefile
to include new brouter make commands
This commit is contained in:
parent
24dacb5e6b
commit
104f215a0e
5
Makefile
5
Makefile
@ -1,9 +1,12 @@
|
|||||||
walk: route_analysis.Rmd
|
walk: route_analysis.Rmd
|
||||||
R -e 'library("rmarkdown"); old_path <- Sys.getenv("PATH"); Sys.setenv(PATH = paste(old_path, "/usr/local/bin", sep = ":")); rmarkdown::render(knit_root_dir = "./", output_dir = "./html", input = "./route_analysis.Rmd", output_file = "./html/route_analysis.html")'
|
R -e 'library("rmarkdown"); old_path <- Sys.getenv("PATH"); Sys.setenv(PATH = paste(old_path, "/usr/local/bin", sep = ":")); rmarkdown::render(knit_root_dir = "./", output_dir = "./html", input = "./route_analysis.Rmd", output_file = "./html/route_analysis.html")'
|
||||||
|
|
||||||
cycle: cycling_route_analysis.Rmd
|
cycle_osrm: cycling_route_analysis.Rmd
|
||||||
R -e 'library("rmarkdown"); old_path <- Sys.getenv("PATH"); Sys.setenv(PATH = paste(old_path, "/usr/local/bin", sep = ":")); rmarkdown::render(knit_root_dir = "./", output_dir = "./html", input = "./cycling_route_analysis.Rmd", output_file = "./html/cycling_route_analysis.html")'
|
R -e 'library("rmarkdown"); old_path <- Sys.getenv("PATH"); Sys.setenv(PATH = paste(old_path, "/usr/local/bin", sep = ":")); rmarkdown::render(knit_root_dir = "./", output_dir = "./html", input = "./cycling_route_analysis.Rmd", output_file = "./html/cycling_route_analysis.html")'
|
||||||
|
|
||||||
|
cycle_brouter: cycling_route_analysis_brouter.Rmd
|
||||||
|
R -e 'library("rmarkdown"); old_path <- Sys.getenv("PATH"); Sys.setenv(PATH = paste(old_path, "/usr/local/bin", sep = ":")); rmarkdown::render(knit_root_dir = "./", output_dir = "./html", input = "./cycling_route_analysis_brouter.Rmd", output_file = "./html/cycling_route_analysis.html")'
|
||||||
|
|
||||||
osrm-container: ./docker/osrm/docker-compose.yml
|
osrm-container: ./docker/osrm/docker-compose.yml
|
||||||
cd ./docker/osrm/; docker compose up -d
|
cd ./docker/osrm/; docker compose up -d
|
||||||
|
|
||||||
|
10
README.md
10
README.md
@ -22,8 +22,14 @@ This script will generate a few figures:
|
|||||||

|

|
||||||
|
|
||||||
## Using make
|
## Using make
|
||||||
The command `make route_analysis` will run *route_analysis.Rmd* which
|
- `make osrm-data`: downloads the OpenStreetMap data for Wisconsin, and preproccesses it for use with OSRM.
|
||||||
is an R markdown file containing the original R script *route_analysis.R*
|
- `make osrm-container`: starts the OSRM containers (backends and frontends) for walking and biking.
|
||||||
|
- `make brouter-data`: clones the repositories for brouter and brouter-web and downloads the segment data. It also builds the docker images for brouter and brouter-web.
|
||||||
|
- `make brouter-container`: starts the brouter containers (backend and frontend).
|
||||||
|
- `make walk` will run *route_analysis.Rmd* which
|
||||||
|
calculates the walking routes using OSRM.
|
||||||
|
- `make cycle-osrm` will run *cycling_route_analysis.Rmd* which calculates the biking routes using OSRM.
|
||||||
|
- `make cycle_brouter` will run *cycling_route_analysis_brouter.Rmd* which calculates the biking routes using brouter.
|
||||||
|
|
||||||
## Misc.
|
## Misc.
|
||||||
- [Bike Level of Traffic Stress (LTS)](https://www.dvrpc.org/webmaps/bike-lts/analysis/)
|
- [Bike Level of Traffic Stress (LTS)](https://www.dvrpc.org/webmaps/bike-lts/analysis/)
|
||||||
|
3
docker/brouter/.gitignore
vendored
3
docker/brouter/.gitignore
vendored
@ -5,3 +5,6 @@
|
|||||||
|
|
||||||
# Except the list of relevant segments
|
# Except the list of relevant segments
|
||||||
!segments.csv
|
!segments.csv
|
||||||
|
|
||||||
|
# Except docker-compose.yml
|
||||||
|
!docker-compose.yml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user