From 7993621f9fc3e57ec735b87a211ba3b0bc2935aa Mon Sep 17 00:00:00 2001 From: Ben Varick Date: Tue, 5 Nov 2024 07:29:34 -0600 Subject: [PATCH] changed docker directory structure, added brouter --- Makefile | 28 +++++++++++++++-------- docker/brouter/.gitignore | 7 ++++++ docker/brouter/segments.csv | 4 ++++ docker/{ => osrm}/.gitignore | 0 docker/{ => osrm}/data-bicycle/.gitignore | 0 docker/{ => osrm}/data-foot/.gitignore | 0 docker/{ => osrm}/data-raw/.gitignore | 0 docker/{ => osrm}/docker-compose.yml | 0 8 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 docker/brouter/.gitignore create mode 100644 docker/brouter/segments.csv rename docker/{ => osrm}/.gitignore (100%) rename docker/{ => osrm}/data-bicycle/.gitignore (100%) rename docker/{ => osrm}/data-foot/.gitignore (100%) rename docker/{ => osrm}/data-raw/.gitignore (100%) rename docker/{ => osrm}/docker-compose.yml (100%) diff --git a/Makefile b/Makefile index 83efc12..512ad73 100644 --- a/Makefile +++ b/Makefile @@ -4,17 +4,27 @@ walk: route_analysis.Rmd cycle: 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")' -container: ./docker/docker-compose.yml - cd ./docker/; docker compose up -d +osrm-container: ./docker/osrm/docker-compose.yml + cd ./docker/osrm/; docker compose up -d -data: - cd ./docker/; docker run -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-extract -p /opt/foot.lua /data/wisconsin-latest.osm.pbf - cd ./docker/; docker run -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-partition /data/wisconsin-latest.osrm - cd ./docker/; docker run -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-customize /data/wisconsin-latest.osrm - cd ./docker/; docker run -t -v "./data-bicycle:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-extract -p /opt/bicycle.lua /data/wisconsin-latest.osm.pbf - cd ./docker/; docker run -t -v "./data-bicycle:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-partition /data/wisconsin-latest.osrm - cd ./docker/; docker run -t -v "./data-bicycle:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-customize /data/wisconsin-latest.osrm +osrm-data: + cd ./docker/osrm/; docker run -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-extract -p /opt/foot.lua /data/wisconsin-latest.osm.pbf + cd ./docker/osrm/; docker run -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-partition /data/wisconsin-latest.osrm + cd ./docker/osrm/; docker run -t -v "./data-foot:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-customize /data/wisconsin-latest.osrm + cd ./docker/osrm/; docker run -t -v "./data-bicycle:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-extract -p /opt/bicycle.lua /data/wisconsin-latest.osm.pbf + cd ./docker/osrm/; docker run -t -v "./data-bicycle:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-partition /data/wisconsin-latest.osrm + cd ./docker/osrm/; docker run -t -v "./data-bicycle:/data" -v "./data-raw/wisconsin-latest.osm.pbf:/data/wisconsin-latest.osm.pbf" osrm/osrm-backend osrm-customize /data/wisconsin-latest.osrm +brouter-container: ./docker/brouter/docker-compose.yml + cd ./docker/brouter; docker compose up -d + +brouter-data: + cd ./docker/brouter/; git clone https://github.com/abrensch/brouter.git + cd ./docker/brouter/; wget -i segments.csv -P ./brouter/misc/segments4/ + cd ./docker/brouter/; git clone https://github.com/nrenner/brouter-web.git + cd ./docker/brouter/brouter-web; cp keys.template.js keys.js; + cd ./docker/brouter/brouter-web; cp config.template.js config.js + cd ./docker/brouter; docker compose build clean: clean-data clean-figure clean-script diff --git a/docker/brouter/.gitignore b/docker/brouter/.gitignore new file mode 100644 index 0000000..ed90703 --- /dev/null +++ b/docker/brouter/.gitignore @@ -0,0 +1,7 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore + +# Except the list of relevant segments +!segments.csv diff --git a/docker/brouter/segments.csv b/docker/brouter/segments.csv new file mode 100644 index 0000000..8bdf00c --- /dev/null +++ b/docker/brouter/segments.csv @@ -0,0 +1,4 @@ +https://brouter.de/brouter/segments4/W90_N40.rd5 +https://brouter.de/brouter/segments4/W90_N45.rd5 +https://brouter.de/brouter/segments4/W95_N40.rd5 +https://brouter.de/brouter/segments4/W95_N45.rd5 diff --git a/docker/.gitignore b/docker/osrm/.gitignore similarity index 100% rename from docker/.gitignore rename to docker/osrm/.gitignore diff --git a/docker/data-bicycle/.gitignore b/docker/osrm/data-bicycle/.gitignore similarity index 100% rename from docker/data-bicycle/.gitignore rename to docker/osrm/data-bicycle/.gitignore diff --git a/docker/data-foot/.gitignore b/docker/osrm/data-foot/.gitignore similarity index 100% rename from docker/data-foot/.gitignore rename to docker/osrm/data-foot/.gitignore diff --git a/docker/data-raw/.gitignore b/docker/osrm/data-raw/.gitignore similarity index 100% rename from docker/data-raw/.gitignore rename to docker/osrm/data-raw/.gitignore diff --git a/docker/docker-compose.yml b/docker/osrm/docker-compose.yml similarity index 100% rename from docker/docker-compose.yml rename to docker/osrm/docker-compose.yml