From 1baaca834ae198bb686b1b445a73fe6312b1d5fb Mon Sep 17 00:00:00 2001 From: Ben Varick Date: Fri, 31 Jan 2025 13:32:31 -0600 Subject: [PATCH] changed container called by osm_edit_generate_brouter, works now --- Makefile | 4 +- README.md | 2 +- docker/brouter/.gitignore | 3 +- docker/brouter/osm_edit/process_pbf.sh | 47 --------------------- docker/brouter/osm_edit/srtm/.gitignore | 8 ---- docker/brouter/osm_edit/srtm/srtm_tiles.csv | 4 -- 6 files changed, 5 insertions(+), 63 deletions(-) delete mode 100755 docker/brouter/osm_edit/process_pbf.sh delete mode 100644 docker/brouter/osm_edit/srtm/.gitignore delete mode 100644 docker/brouter/osm_edit/srtm/srtm_tiles.csv diff --git a/Makefile b/Makefile index 7eb92c3..3511063 100644 --- a/Makefile +++ b/Makefile @@ -50,11 +50,11 @@ osm_edit_import_pbf: osm_edit_refresh_base: cd ./docker/brouter/osm_edit; wget https://download.geofabrik.de/north-america/us/wisconsin-latest.osm.pbf -O ./pbf_files/wisconsin-latest.osm.pbf - cd ./docker/brouter/osm_edit/srtm/; wget -i srtm_tiles.csv -P ./ + cd ./docker/brouter/osm_edit/srtm3/; wget -i srtm_tiles.csv -P ./ 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 + docker run --rm --user "$(id -u):$(id -g)" --env PLANET=wisconsin-latest_edited.osm.pbf --env JAVA_OPTS="-Xmx2048M -Xms2048M -Xmn256M" --env PLANET_UPDATE=0 --volume ./docker/brouter/osm_edit/brouter-tmp:/brouter-tmp --volume ./docker/brouter/osm_edit/pbf_files:/planet --volume ./docker/brouter/osm_edit/srtm3:/srtm3:ro --volume ./docker/brouter/osm_edit/segments:/segments ghcr.io/mjaschen/brouter-routingdata-builder diff --git a/README.md b/README.md index bd14945..d2113a8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ calculates the walking routes using OSRM. 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 `docker/brouter/osm_edit/` (File -> Save As) +2. Save the edited map as `docker/brouter/osm_edit/map_edited.osm` (File -> Save As) 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. diff --git a/docker/brouter/.gitignore b/docker/brouter/.gitignore index 97f24f0..0dc77db 100644 --- a/docker/brouter/.gitignore +++ b/docker/brouter/.gitignore @@ -10,4 +10,5 @@ !docker-compose.yml # Except osm_edit -!osm_edit/ \ No newline at end of file +!osm_edit/ +!mapcreation/* \ No newline at end of file diff --git a/docker/brouter/osm_edit/process_pbf.sh b/docker/brouter/osm_edit/process_pbf.sh deleted file mode 100755 index 3070090..0000000 --- a/docker/brouter/osm_edit/process_pbf.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -set -e - -cd /osm_edit - -touch lastmaprun.date - -JAVA='java -Xmx2600m -Xms2600m -Xmn32m' - -BROUTER_PROFILES="/profiles2" - -BROUTER_JAR="/brouter.jar" - -PLANET_FILE="/osm_edit/pbf_files/wisconsin-latest_edited.osm.pbf" - -SRTM_PATH="/osm_edit/srtm" - -rm -rf tmp -mkdir tmp -cd tmp -mkdir nodetiles -${JAVA} -cp ${BROUTER_JAR} -DavoidMapPolling=true btools.mapcreator.OsmCutter ${BROUTER_PROFILES}/lookups.dat nodetiles ways.dat relations.dat restrictions.dat ${BROUTER_PROFILES}/all.brf ${PLANET_FILE} - -mkdir ftiles -${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.NodeFilter nodetiles ways.dat ftiles - -${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.RelationMerger ways.dat ways2.dat relations.dat ${BROUTER_PROFILES}/lookups.dat ${BROUTER_PROFILES}/trekking.brf ${BROUTER_PROFILES}/softaccess.brf - -mkdir waytiles -${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.WayCutter ftiles ways2.dat waytiles - -mkdir waytiles55 -${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.WayCutter5 ftiles waytiles waytiles55 bordernids.dat - -mkdir nodes55 -${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.NodeCutter ftiles nodes55 - -mkdir unodes55 -${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.PosUnifier nodes55 unodes55 bordernids.dat bordernodes.dat ${SRTM_PATH} - -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 - -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 diff --git a/docker/brouter/osm_edit/srtm/.gitignore b/docker/brouter/osm_edit/srtm/.gitignore deleted file mode 100644 index c8b8738..0000000 --- a/docker/brouter/osm_edit/srtm/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Ignore everything in this directory -* - -# Except this file -!.gitignore - -# Except srtm_tiles.csv -!srtm_tiles.csv diff --git a/docker/brouter/osm_edit/srtm/srtm_tiles.csv b/docker/brouter/osm_edit/srtm/srtm_tiles.csv deleted file mode 100644 index 29c621e..0000000 --- a/docker/brouter/osm_edit/srtm/srtm_tiles.csv +++ /dev/null @@ -1,4 +0,0 @@ -https://srtm.csi.cgiar.org/wp-content/uploads/files/srtm_5x5/ASCII/srtm_18_03.zip -https://srtm.csi.cgiar.org/wp-content/uploads/files/srtm_5x5/ASCII/srtm_18_04.zip -https://srtm.csi.cgiar.org/wp-content/uploads/files/srtm_5x5/ASCII/srtm_19_03.zip -https://srtm.csi.cgiar.org/wp-content/uploads/files/srtm_5x5/ASCII/srtm_19_04.zip