diff --git a/Makefile b/Makefile index 47117e1..7c3e269 100644 --- a/Makefile +++ b/Makefile @@ -46,13 +46,6 @@ brouter-data: osm_edit_import_pbf: cd ./docker/osm_edit/; wget https://download.geofabrik.de/north-america/us/wisconsin-latest.osm.pbf -O ./osm-data/wisconsin-latest.osm.pbf - cd ./docker/osm_edit/; rm ./osm-data/wisconsin-latest.osm; docker run -v ./osm-data:/osm-data ghcr.io/bvarick/osmosis:0.49.2 osmosis --read-pbf "/osm-data/wisconsin-latest.osm.pbf" --write-xml file="/osm-data/wisconsin-latest.osm" - -osm_edit_refresh_base: - cd ./data/osm; wget https://download.geofabrik.de/north-america/us/wisconsin-latest.osm.pbf -O ./wisconsin-latest.osm.pbf - cd ./data/osm/osm_edit/srtm/; wget -i srtm_tiles.csv -P ./ - -osm_edit_generate_pbf: - docker run -v ./data/osm:/osm ghcr.io/bvarick/osmium-tool:2.21.0 osmium apply-changes /osm/wisconsin-latest.osm.pbf /osm/osm_edit/map_edited.osm -o /osm/osm_edit/wisconsin-latest_edited.osm.pbf --overwrite - -osm_edit_generate_brouter: + cd ./docker/osm_edit/; rm -rf ./docker-osmosis; git clone https://github.com/bvarick/docker-osmosis.git + cd ./docker/osm_edit/; docker build -t osmosis ./docker-osmosis + cd ./docker/osm_edit/; docker run -v ./osm-data:/osm-data osmosis osmosis --read-pbf "/osm-data/wisconsin-latest.osm.pbf" --write-xml file="/osm-data/wisconsin-latest.osm" diff --git a/README.md b/README.md index d9d85e6..ae43ea3 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,6 @@ 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. -## What-if analysis -This allows you to make changes to the street network (add a bike path, reduce a lane on an arterial st) and see how it affects the routes that brouter chooses. -This is a multi-step process: -1. Make edits to OpenStreetMap in [JOSM](https://josm.openstreetmap.de/) -2. Save the edited map as `map_edited.osm` in `data/osm/osm_edit/` (File -> Save As) -3. `make osm_edit_generate_pbf` will take those edits and apply them to the `wisconsin-latest.osm.pbf` and generate `wisconsin-latest_edited.osm.pbf` - ## Misc. - [Bike Level of Traffic Stress (LTS)](https://www.dvrpc.org/webmaps/bike-lts/analysis/) diff --git a/docker/osm_edit/.gitignore b/docker/osm_edit/.gitignore new file mode 100644 index 0000000..e95cb01 --- /dev/null +++ b/docker/osm_edit/.gitignore @@ -0,0 +1,9 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore + +# Except Dockerfile +!Dockerfile + +!osm-data/ diff --git a/docker/osm_edit/osm-data/.gitignore b/docker/osm_edit/osm-data/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/docker/osm_edit/osm-data/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore