Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Deprecate .osrm file

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-09-01 18:01:15 +02:00
parent 09ca3259ff
commit 156e5a9eba
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/osrm-backend.yml vendored
View File

@ -95,10 +95,16 @@ jobs:
# when `--memory-swap` value equals `--memory` it means container won't use swap # 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 # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details
MEMORY_ARGS="--memory=1g --memory-swap=1g" 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-extract --dump-nbg-graph -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-components /data/berlin-latest.osrm /data/berlin-latest.geojson
docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm if [ ! -s "${PWD}/berlin-latest.geojson" ]
docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & 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" 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 docker stop osrm-container

8
README.md
View File

@ -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. 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-partition /data/berlin-latest
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-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 Make requests against the HTTP server

6
src/extractor/extraction_containers.cpp
View File

@ -5,8 +5,8 @@
#include "extractor/name_table.hpp" #include "extractor/name_table.hpp"
#include "extractor/restriction.hpp" #include "extractor/restriction.hpp"
#include "extractor/serialization.hpp" #include "extractor/serialization.hpp"
#include "util/coordinate_calculation.hpp" #include "util/coordinate_calculation.hpp"
#include "util/integer_range.hpp"
#include "util/exception.hpp" #include "util/exception.hpp"
#include "util/exception_utils.hpp" #include "util/exception_utils.hpp"
@ -16,6 +16,7 @@
#include "util/timing_util.hpp" #include "util/timing_util.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/core/ignore_unused.hpp>
#include <boost/numeric/conversion/cast.hpp> #include <boost/numeric/conversion/cast.hpp>
#include <tbb/parallel_sort.h> #include <tbb/parallel_sort.h>
@ -520,8 +521,9 @@ void ExtractionContainers::PrepareNodes()
auto node_id_iterator = used_node_id_list.begin(); auto node_id_iterator = used_node_id_list.begin();
const auto all_nodes_list_end = all_nodes_list.end(); 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<NodeID>(0, used_node_id_list.size()))
{ {
boost::ignore_unused(index);
BOOST_ASSERT(node_id_iterator != used_node_id_list.end()); BOOST_ASSERT(node_id_iterator != used_node_id_list.end());
BOOST_ASSERT(node_iterator != all_nodes_list_end); BOOST_ASSERT(node_iterator != all_nodes_list_end);
BOOST_ASSERT(*node_id_iterator >= node_iterator->node_id); BOOST_ASSERT(*node_id_iterator >= node_iterator->node_id);

2
src/extractor/extractor.cpp
View File

@ -356,7 +356,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
util::Log() << "Expansion: " << nodes_per_second << " nodes/sec and " << edges_per_second util::Log() << "Expansion: " << nodes_per_second << " nodes/sec and " << edges_per_second
<< " edges/sec"; << " edges/sec";
util::Log() << "To prepare the data for routing, run: " util::Log() << "To prepare the data for routing, run: "
<< "./osrm-contract " << config.GetPath(".osrm"); << "./osrm-contract " << config.base_path;
return 0; return 0;
} }