From 156e5a9ebad247a8812f3a0f710d3852e2cf9b9f Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Thu, 1 Sep 2022 18:01:15 +0200 Subject: [PATCH] Deprecate .osrm file --- .github/workflows/osrm-backend.yml | 14 ++++++++++---- README.md | 8 ++++---- src/extractor/extraction_containers.cpp | 6 ++++-- src/extractor/extractor.cpp | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index d4b001450..ee7ad00f7 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -95,10 +95,16 @@ jobs: # when `--memory-swap` value equals `--memory` it means container won't use swap # 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 -p /opt/car.lua /data/berlin-latest.osm.pbf - 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 - docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & + 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 + if [ ! -s "${PWD}/berlin-latest.geojson" ] + then + >&2 echo "No berlin-latest.geojson found" + exit 1 + fi + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest + docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest & curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true" docker stop osrm-container diff --git a/README.md b/README.md index 1f6b096cb..13366dd13 100644 --- a/README.md +++ b/README.md @@ -62,12 +62,12 @@ Pre-process the extract with the car profile and start a routing engine HTTP ser The flag `-v "${PWD}:/data"` creates the directory `/data` inside the docker container and makes the current working directory `"${PWD}"` available there. The file `/data/berlin-latest.osm.pbf` inside the container is referring to `"${PWD}/berlin-latest.osm.pbf"` on the host. - docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-partition /data/berlin-latest.osrm - docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-customize /data/berlin-latest.osrm + docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-partition /data/berlin-latest + docker run -t -v "${PWD}:/data" osrm/osrm-backend osrm-customize /data/berlin-latest -Note that `berlin-latest.osrm` has a different file extension. +Note that `berlin-latest` has no file extension. - docker run -t -i -p 5000:5000 -v "${PWD}:/data" osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm + docker run -t -i -p 5000:5000 -v "${PWD}:/data" osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest Make requests against the HTTP server diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index d8b51f16e..2e76a64d4 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -5,8 +5,8 @@ #include "extractor/name_table.hpp" #include "extractor/restriction.hpp" #include "extractor/serialization.hpp" - #include "util/coordinate_calculation.hpp" +#include "util/integer_range.hpp" #include "util/exception.hpp" #include "util/exception_utils.hpp" @@ -16,6 +16,7 @@ #include "util/timing_util.hpp" #include +#include #include #include @@ -520,8 +521,9 @@ void ExtractionContainers::PrepareNodes() auto node_id_iterator = used_node_id_list.begin(); const auto all_nodes_list_end = all_nodes_list.end(); - for (size_t index = 0; index < used_node_id_list.size(); ++index) + for (const auto index : util::irange(0, used_node_id_list.size())) { + boost::ignore_unused(index); BOOST_ASSERT(node_id_iterator != used_node_id_list.end()); BOOST_ASSERT(node_iterator != all_nodes_list_end); BOOST_ASSERT(*node_id_iterator >= node_iterator->node_id); diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index a4d1a959f..fd1a472b5 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -356,7 +356,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment) util::Log() << "Expansion: " << nodes_per_second << " nodes/sec and " << edges_per_second << " edges/sec"; util::Log() << "To prepare the data for routing, run: " - << "./osrm-contract " << config.GetPath(".osrm"); + << "./osrm-contract " << config.base_path; return 0; }