From 47a4e865d6d1f74c4641581e7f5cae1245fbb838 Mon Sep 17 00:00:00 2001
From: Ben Varick <ben@dendroalsia.net>
Date: Fri, 31 Jan 2025 12:05:33 -0600
Subject: [PATCH] attempt at generating Brouter segment files

---
 Makefile                                            |  2 ++
 README.md                                           |  5 +++--
 docker/brouter/osm_edit/brouter_segments/.gitignore |  5 -----
 docker/brouter/osm_edit/process_pbf.sh              | 12 +++++-------
 4 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 docker/brouter/osm_edit/brouter_segments/.gitignore
 mode change 100644 => 100755 docker/brouter/osm_edit/process_pbf.sh

diff --git a/Makefile b/Makefile
index 47e427d..7eb92c3 100644
--- a/Makefile
+++ b/Makefile
@@ -56,3 +56,5 @@ osm_edit_generate_pbf:
 	cd ./docker/brouter/; docker run -v ./osm_edit:/osm_edit ghcr.io/bvarick/osmium-tool:2.21.0 osmium apply-changes /osm_edit/pbf_files/wisconsin-latest.osm.pbf /osm_edit/map_edited.osm -o /osm_edit/pbf_files/wisconsin-latest_edited.osm.pbf --overwrite
 
 osm_edit_generate_brouter:
+	docker run --rm -v ./docker/brouter/osm_edit:/osm_edit brouter /osm_edit/process_pbf.sh
+
diff --git a/README.md b/README.md
index 754d0ad..bd14945 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,9 @@ This allows you to make changes to the street network (add a bike path, reduce a
 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 `docker/brouter/osm_edit/` (File -> Save As)
-3. `make osm_edit_refresh_base` will download a fresh copy of `wisconsin-latest.osm.pbf` and the srtm tiles for Wisconsin. You don't need to run this frequently.
-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`
+3. `make osm_edit_refresh_base` will download a fresh copy of `wisconsin-latest.osm.pbf` and the elevation tiles for Wisconsin. You don't need to run this frequently.
+4. `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`
+5. `make osm_edit_generate_brouter` will generate new brouter segment files from the edited pbf file.
 
 ## Misc.
 - [Bike Level of Traffic Stress (LTS)](https://www.dvrpc.org/webmaps/bike-lts/analysis/)
diff --git a/docker/brouter/osm_edit/brouter_segments/.gitignore b/docker/brouter/osm_edit/brouter_segments/.gitignore
deleted file mode 100644
index 64f5877..0000000
--- a/docker/brouter/osm_edit/brouter_segments/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ignore everything in this directory
-*
-
-# Except this file
-!.gitignore
diff --git a/docker/brouter/osm_edit/process_pbf.sh b/docker/brouter/osm_edit/process_pbf.sh
old mode 100644
new mode 100755
index 8a857a5..3070090
--- a/docker/brouter/osm_edit/process_pbf.sh
+++ b/docker/brouter/osm_edit/process_pbf.sh
@@ -11,7 +11,7 @@ BROUTER_PROFILES="/profiles2"
 
 BROUTER_JAR="/brouter.jar"
 
-PLANET_FILE="/osm_edit/wisconsin-latest_edited.osm.pbf"
+PLANET_FILE="/osm_edit/pbf_files/wisconsin-latest_edited.osm.pbf"
 
 SRTM_PATH="/osm_edit/srtm"
 
@@ -41,9 +41,7 @@ ${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapc
 mkdir segments
 ${JAVA} -cp ${BROUTER_JAR} -DuseDenseMaps=true btools.mapcreator.WayLinker unodes55 waytiles55 bordernodes.dat restrictions.dat ${BROUTER_PROFILES}/lookups.dat ${BROUTER_PROFILES}/all.brf segments rd5
 
-#cd ..
-#rm -rf segments
-#mv tmp/segments segments
-#mv /osm_edit/segments4 /osm_edit/segments4_lastrun
-#mv segments /osm_edit/segments4
-#rm -rf tmp
+rm -rf /osm_edit/segments4_lastrun
+cp -R /osm_edit/segments4 /osm_edit/segments4_lastrun
+mv /osm_edit/tmp/segments/ /osm_edit/segments4/
+rm -rf /osm_edit/tmp