7f71f0ed12
https://github.com/Project-OSRM/osrm-backend/pull/2685/files fixes an issue where we did elongate(fstStep, sndStep); instead of newStep = elongate(fstStep, sndStep); we didn't get any warnings. The only way to trigger a warning here is to use ```cpp __attribute__((warn_unused_result)) ``` This changeset does exactly that: for the new guidance code prone to these kind of issue we add such an attribute to the declaration.
73 lines
2.6 KiB
C++
73 lines
2.6 KiB
C++
#ifndef OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_GENERATOR_HPP_
|
|
#define OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_GENERATOR_HPP_
|
|
|
|
#include "extractor/compressed_edge_container.hpp"
|
|
#include "extractor/guidance/intersection.hpp"
|
|
#include "extractor/query_node.hpp"
|
|
#include "extractor/restriction_map.hpp"
|
|
#include "util/attributes.hpp"
|
|
#include "util/name_table.hpp"
|
|
#include "util/node_based_graph.hpp"
|
|
#include "util/typedefs.hpp"
|
|
|
|
#include <unordered_set>
|
|
#include <vector>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
namespace guidance
|
|
{
|
|
// The Intersection Generator is given a turn location and generates an intersection representation
|
|
// from it. For this all turn possibilities are analysed.
|
|
// We consider turn restrictions to indicate possible turns. U-turns are generated based on profile
|
|
// decisions.
|
|
|
|
class IntersectionGenerator
|
|
{
|
|
public:
|
|
IntersectionGenerator(const util::NodeBasedDynamicGraph &node_based_graph,
|
|
const RestrictionMap &restriction_map,
|
|
const std::unordered_set<NodeID> &barrier_nodes,
|
|
const std::vector<QueryNode> &node_info_list,
|
|
const CompressedEdgeContainer &compressed_edge_container);
|
|
|
|
Intersection operator()(const NodeID nid, const EdgeID via_eid) const;
|
|
|
|
private:
|
|
const util::NodeBasedDynamicGraph &node_based_graph;
|
|
const RestrictionMap &restriction_map;
|
|
const std::unordered_set<NodeID> &barrier_nodes;
|
|
const std::vector<QueryNode> &node_info_list;
|
|
const CompressedEdgeContainer &compressed_edge_container;
|
|
|
|
// Check for restrictions/barriers and generate a list of valid and invalid turns present at
|
|
// the
|
|
// node reached
|
|
// from `from_node` via `via_eid`
|
|
// The resulting candidates have to be analysed for their actual instructions later on.
|
|
OSRM_ATTR_WARN_UNUSED
|
|
Intersection getConnectedRoads(const NodeID from_node, const EdgeID via_eid) const;
|
|
|
|
// Merge segregated roads to omit invalid turns in favor of treating segregated roads as
|
|
// one.
|
|
// This function combines roads the following way:
|
|
//
|
|
// * *
|
|
// * is converted to *
|
|
// v ^ +
|
|
// v ^ +
|
|
//
|
|
// The treatment results in a straight turn angle of 180º rather than a turn angle of approx
|
|
// 160
|
|
OSRM_ATTR_WARN_UNUSED
|
|
Intersection mergeSegregatedRoads(Intersection intersection) const;
|
|
};
|
|
|
|
} // namespace guidance
|
|
} // namespace extractor
|
|
} // namespace osrm
|
|
|
|
#endif /* OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_GENERATOR_HPP_ */
|