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.
100 lines
3.6 KiB
C++
100 lines
3.6 KiB
C++
#ifndef OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_
|
|
#define OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_
|
|
|
|
#include "extractor/compressed_edge_container.hpp"
|
|
#include "extractor/guidance/coordinate_extractor.hpp"
|
|
#include "extractor/guidance/intersection.hpp"
|
|
#include "extractor/guidance/intersection_generator.hpp"
|
|
#include "extractor/guidance/intersection_handler.hpp"
|
|
#include "extractor/guidance/roundabout_type.hpp"
|
|
#include "extractor/profile_properties.hpp"
|
|
#include "extractor/query_node.hpp"
|
|
|
|
#include "util/name_table.hpp"
|
|
#include "util/node_based_graph.hpp"
|
|
#include "util/typedefs.hpp"
|
|
|
|
#include <unordered_set>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
namespace guidance
|
|
{
|
|
|
|
namespace detail
|
|
{
|
|
struct RoundaboutFlags
|
|
{
|
|
bool on_roundabout;
|
|
bool can_enter;
|
|
bool can_exit_separately;
|
|
};
|
|
} // namespace detail
|
|
|
|
// The roundabout handler processes all roundabout related instructions.
|
|
// It performs both the distinction between rotaries and roundabouts and
|
|
// assigns appropriate entry/exit instructions.
|
|
class RoundaboutHandler : public IntersectionHandler
|
|
{
|
|
public:
|
|
RoundaboutHandler(const util::NodeBasedDynamicGraph &node_based_graph,
|
|
const std::vector<QueryNode> &node_info_list,
|
|
const CompressedEdgeContainer &compressed_edge_container,
|
|
const util::NameTable &name_table,
|
|
const SuffixTable &street_name_suffix_table,
|
|
const ProfileProperties &profile_properties,
|
|
const IntersectionGenerator &intersection_generator);
|
|
|
|
~RoundaboutHandler() override final = default;
|
|
|
|
// check whether the handler can actually handle the intersection
|
|
bool canProcess(const NodeID from_nid,
|
|
const EdgeID via_eid,
|
|
const Intersection &intersection) const override final;
|
|
|
|
// process the intersection
|
|
Intersection operator()(const NodeID from_nid,
|
|
const EdgeID via_eid,
|
|
Intersection intersection) const override final;
|
|
|
|
private:
|
|
detail::RoundaboutFlags getRoundaboutFlags(const NodeID from_nid,
|
|
const EdgeID via_eid,
|
|
const Intersection &intersection) const;
|
|
|
|
void invalidateExitAgainstDirection(const NodeID from_nid,
|
|
const EdgeID via_eid,
|
|
Intersection &intersection) const;
|
|
|
|
// decide whether we lookk at a roundabout or a rotary
|
|
RoundaboutType getRoundaboutType(const NodeID nid) const;
|
|
|
|
// TODO handle bike/walk cases that allow crossing a roundabout!
|
|
// Processing of roundabouts
|
|
// Produces instructions to enter/exit a roundabout or to stay on it.
|
|
// Performs the distinction between roundabout and rotaries.
|
|
Intersection handleRoundabouts(const RoundaboutType roundabout_type,
|
|
const EdgeID via_edge,
|
|
const bool on_roundabout,
|
|
const bool can_exit_roundabout,
|
|
Intersection intersection) const;
|
|
|
|
bool
|
|
qualifiesAsRoundaboutIntersection(const std::unordered_set<NodeID> &roundabout_nodes) const;
|
|
|
|
const CompressedEdgeContainer &compressed_edge_container;
|
|
const ProfileProperties &profile_properties;
|
|
|
|
const CoordinateExtractor coordinate_extractor;
|
|
};
|
|
|
|
} // namespace guidance
|
|
} // namespace extractor
|
|
} // namespace osrm
|
|
|
|
#endif /*OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_*/
|