5e167b8745
This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
72 lines
2.2 KiB
C++
72 lines
2.2 KiB
C++
#ifndef OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HPP_
|
|
#define OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HPP_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "extractor/guidance/turn_instruction.hpp"
|
|
#include "util/typedefs.hpp" // EdgeID
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
namespace guidance
|
|
{
|
|
|
|
// Every Turn Operation describes a way of switching onto a segment, indicated by an EdgeID. The
|
|
// associated turn is described by an angle and an instruction that is used to announce it.
|
|
// The Turn Operation indicates what is exposed to the outside of the turn analysis.
|
|
struct TurnOperation final
|
|
{
|
|
EdgeID eid;
|
|
double angle;
|
|
double bearing;
|
|
TurnInstruction instruction;
|
|
LaneDataID lane_data_id;
|
|
};
|
|
|
|
// A Connected Road is the internal representation of a potential turn. Internally, we require
|
|
// full list of all connected roads to determine the outcome.
|
|
// The reasoning behind is that even invalid turns can influence the perceived angles, or even
|
|
// instructions themselves. An pososible example can be described like this:
|
|
//
|
|
// aaa(2)aa
|
|
// a - bbbbb
|
|
// aaa(1)aa
|
|
//
|
|
// will not be perceived as a turn from (1) -> b, and as a U-turn from (1) -> (2).
|
|
// In addition, they can influence whether a turn is obvious or not. b->(2) would also be no
|
|
// turn-operation,
|
|
// but rather a name change.
|
|
//
|
|
// If this were a normal intersection with
|
|
//
|
|
// cccccccc
|
|
// o bbbbb
|
|
// aaaaaaaa
|
|
//
|
|
// We would perceive a->c as a sharp turn, a->b as a slight turn, and b->c as a slight turn.
|
|
struct ConnectedRoad final
|
|
{
|
|
ConnectedRoad(const TurnOperation turn, const bool entry_allowed = false);
|
|
|
|
// a turn may be relevant to good instructions, even if we cannot enter the road
|
|
bool entry_allowed;
|
|
TurnOperation turn;
|
|
};
|
|
|
|
// small helper function to print the content of a connected road
|
|
std::string toString(const ConnectedRoad &road);
|
|
|
|
typedef std::vector<ConnectedRoad> Intersection;
|
|
|
|
Intersection::const_iterator findClosestTurn(const Intersection &intersection, const double angle);
|
|
Intersection::iterator findClosestTurn(Intersection &intersection, const double angle);
|
|
|
|
} // namespace guidance
|
|
} // namespace extractor
|
|
} // namespace osrm
|
|
|
|
#endif /*OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HPP_*/
|