changed directory structure, first move to Makefile

2025-01-27 13:20:09 -06:00 · 2025-01-27 13:20:09 -06:00 · bf056e6375
commit bf056e6375
parent 46d41b4ea1
21 changed files with 47 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,3 @@
-data/TOPS/*
-basemaps/*
-figures/school_maps/*
-figures/municipalities/*
-api_keys/*
-basemaps/*
 .Rproj.user
 .Rhistory
-other/districts_done.csv
+districts_done.csv
--- a/15
+++ b/15
@ -0,0 +1,15 @@
+osrm: osrm-data osrm-containers
+
+crashmaps_pdf: 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 = "./R/route_analysis.Rmd", output_file = "./html/route_analysis.html")'
+
+crashmaps_dynamic: cycle_brouter
+
+osrm-data:
+	cd ./docker/osrm/; wget https://download.geofabrik.de/north-america/us/wisconsin-latest.osm.pbf -O ./data-raw/wisconsin-latest.osm.pbf
+	cd ./docker/osrm/; docker run --rm -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 --rm -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 --rm -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
+
+osrm-containers: ./docker/osrm/docker-compose.yml
+	cd ./docker/osrm/; docker compose up -d
--- a/scripts/city_maps.R
+++ b/scripts/city_maps.R
--- a/scripts/crash_summaries.R
+++ b/scripts/crash_summaries.R
--- a/scripts/crash_summary_charts.R
+++ b/scripts/crash_summary_charts.R
--- a/scripts/dynamic_crash_map.R
+++ b/scripts/dynamic_crash_map.R
--- a/scripts/dynamic_crash_map_milwaukee.R
+++ b/scripts/dynamic_crash_map_milwaukee.R
--- a/scripts/municipality_maps.R
+++ b/scripts/municipality_maps.R
--- a/scripts/school_maps.R
+++ b/scripts/school_maps.R
--- a/scripts/school_maps_parallel.R
+++ b/scripts/school_maps_parallel.R
--- a/api_keys/.gitignore
+++ b/api_keys/.gitignore
@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/basemaps/.gitignore
+++ b/basemaps/.gitignore
@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/data/.gitignore
+++ b/data/.gitignore
@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/data/Schools/WI_schools.gpkg
+++ b/data/Schools/WI_schools.gpkg
--- a/data_summaries/.gitignore
+++ b/data_summaries/.gitignore
@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/docker/.gitignore
+++ b/docker/.gitignore
@ -0,0 +1,7 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+!docker-compose.yml
+!data-raw/
+!data-foot/
--- a/figures/.gitignore
+++ b/figures/.gitignore
@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/html/.gitignore
+++ b/html/.gitignore
@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/icons/BFW_Logo_180_x_200_transparent_background.png
+++ b/icons/BFW_Logo_180_x_200_transparent_background.png
--- a/icons/school_FILL0_wght400_GRAD0_opsz24.png
+++ b/icons/school_FILL0_wght400_GRAD0_opsz24.png
--- a/icons/school_FILL0_wght400_GRAD0_opsz24.svg
+++ b/icons/school_FILL0_wght400_GRAD0_opsz24.svg