972a848094
Currently route results are annotated with additional path information, such as geometries, turn-by-turn steps and other metadata. These annotations are generated if they are not requested or returned in the response. Datasets needed to generate these annotations are loaded and available to the OSRM process even when unused. This commit is a first step towards making the loading of these datasets optional. We refactor the code so that route annotations are only generated if explicitly requested and needed in the response. Specifically, we change the following annotations to be lazily generated: - Turn-by-turn steps - Route Overview geometry - Route segment metadata For example. a /route/v1 request with steps=false&overview=false&annotations=false would no longer call the following data facade methods: - GetOSMNodeIDOfNode - GetTurnInstructionForEdgeID - GetNameIndex - GetNameForID - GetRefForID - GetTurnInstructionForEdgeID - GetClassData - IsLeftHandDriving - GetTravelMode - IsSegregated - PreTurnBearing - PostTurnBearing - HasLaneData - GetLaneData - GetEntryClass Requests that include segment metadata and/or overview geometry but not turn-by-turn instructions will also benefit from this, although there is some interdependency with the step instructions - a call to GetTurnInstructionForEdgeID is still required. Requests for OSM annotations will understandably still need to call GetOSMNodeIDOfNode. Making these changes unlocks the optional loading of data contained in the following OSRM files: - osrm.names - osrm.icd - osrm.nbg_nodes (partial) - osrm.ebg_nodes (partial) - osrm.edges
72 lines
1.7 KiB
C++
72 lines
1.7 KiB
C++
#ifndef ENGINE_GUIDANCE_LEG_GEOMETRY_HPP
|
|
#define ENGINE_GUIDANCE_LEG_GEOMETRY_HPP
|
|
|
|
#include "util/coordinate.hpp"
|
|
#include "util/integer_range.hpp"
|
|
#include "util/typedefs.hpp"
|
|
|
|
#include <boost/assert.hpp>
|
|
|
|
#include <cstddef>
|
|
|
|
#include <cstdlib>
|
|
#include <vector>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace engine
|
|
{
|
|
namespace guidance
|
|
{
|
|
|
|
// locations 0---1---2-...-n-1---n
|
|
// turns s x y t
|
|
// segment | 0 | 1 | 2 | sentinel
|
|
// offsets 0 2 n-1 n
|
|
struct LegGeometry
|
|
{
|
|
std::vector<util::Coordinate> locations;
|
|
// segment_offset[i] .. segment_offset[i+1] (inclusive)
|
|
// contains the geometry of segment i
|
|
std::vector<std::size_t> segment_offsets;
|
|
// length of the segment in meters
|
|
std::vector<double> segment_distances;
|
|
// original OSM node IDs for each coordinate
|
|
std::vector<NodeID> node_ids;
|
|
|
|
// Per-coordinate metadata
|
|
struct Annotation
|
|
{
|
|
double distance; // distance in meters
|
|
|
|
// Total duration of a segment, in seconds, NOT including
|
|
// the turn penalty if the segment preceeds a turn
|
|
double duration;
|
|
double weight; // weight value, NOT including the turn weight
|
|
|
|
DatasourceID datasource;
|
|
};
|
|
std::vector<Annotation> annotations;
|
|
|
|
std::size_t FrontIndex(std::size_t segment_index) const
|
|
{
|
|
return segment_offsets[segment_index];
|
|
}
|
|
|
|
std::size_t BackIndex(std::size_t segment_index) const
|
|
{
|
|
return segment_offsets[segment_index + 1];
|
|
}
|
|
|
|
std::size_t GetNumberOfSegments() const
|
|
{
|
|
BOOST_ASSERT(segment_offsets.size() > 0);
|
|
return segment_offsets.size() - 1;
|
|
}
|
|
};
|
|
} // namespace guidance
|
|
} // namespace engine
|
|
} // namespace osrm
|
|
|
|
#endif
|