diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 7f350e2cb..32934ce18 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -125,17 +125,15 @@ jobs: # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details MEMORY_ARGS="--memory=1g --memory-swap=1g" docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf - docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm /data/berlin-latest.geojson + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson if [ ! -s "${PWD}/berlin-latest.geojson" ] then >&2 echo "No berlin-latest.geojson found" exit 1 fi - # here we check that `osrm-partition` accepts base file path with `.osrm` extension even if `.osrm` file doesn't exist - # this way we check backward compatibility with existing pipelines which may rely on it - rm -rf "${PWD}/berlin-latest.osrm" - docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm + # removing `.osrm.nbg` to check that whole pipeline works without it + rm -rf "${PWD}/berlin-latest.osrm.nbg" docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm diff --git a/include/extractor/extractor_config.hpp b/include/extractor/extractor_config.hpp index 81740297a..f25e3ebfc 100644 --- a/include/extractor/extractor_config.hpp +++ b/include/extractor/extractor_config.hpp @@ -48,7 +48,7 @@ struct ExtractorConfig final : storage::IOConfig "", }, {}, - {".osrm", + {".osrm.nbg", ".osrm.restrictions", ".osrm.names", ".osrm.tls", diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index 261f09981..687b35b53 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -639,7 +639,7 @@ Extractor::ParsedOSMData Extractor::ParseOSMData(ScriptingEnvironment &scripting if (config.dump_nbg_graph) { - storage::tar::FileWriter writer(config.GetPath(".osrm").string(), + storage::tar::FileWriter writer(config.GetPath(".osrm.nbg").string(), storage::tar::FileWriter::GenerateFingerprint); storage::serialization::write(writer, "/extractor/nodes", extraction_containers.used_nodes); storage::serialization::write(writer, "/extractor/edges", extraction_containers.used_edges);