Merge pull request #2707 from oxidase/left_side_driving

Left side driving
This commit is contained in:
Patrick Niklaus
2016-08-05 18:09:10 +02:00
committed by GitHub
14 changed files with 203 additions and 21 deletions
@@ -5,6 +5,7 @@
#include "extractor/guidance/intersection.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"
@@ -42,7 +43,8 @@ class RoundaboutHandler : public IntersectionHandler
const std::vector<QueryNode> &node_info_list,
const CompressedEdgeContainer &compressed_edge_container,
const util::NameTable &name_table,
const SuffixTable &street_name_suffix_table);
const SuffixTable &street_name_suffix_table,
const ProfileProperties &profile_properties);
~RoundaboutHandler() override final = default;
@@ -81,6 +83,7 @@ class RoundaboutHandler : public IntersectionHandler
bool qualifiesAsRoundaboutIntersection(const std::set<NodeID> &roundabout_nodes) const;
const CompressedEdgeContainer &compressed_edge_container;
const ProfileProperties &profile_properties;
};
} // namespace guidance
+2 -1
View File
@@ -42,7 +42,8 @@ class TurnAnalysis
const std::unordered_set<NodeID> &barrier_nodes,
const CompressedEdgeContainer &compressed_edge_container,
const util::NameTable &name_table,
const SuffixTable &street_name_suffix_table);
const SuffixTable &street_name_suffix_table,
const ProfileProperties &profile_properties);
// the entry into the turn analysis
Intersection getIntersection(const NodeID from_node, const EdgeID via_eid) const;
+2 -1
View File
@@ -12,7 +12,7 @@ struct ProfileProperties
{
ProfileProperties()
: traffic_signal_penalty(0), u_turn_penalty(0), continue_straight_at_waypoint(true),
use_turn_restrictions(false)
use_turn_restrictions(false), left_hand_driving(false)
{
}
@@ -36,6 +36,7 @@ struct ProfileProperties
int u_turn_penalty;
bool continue_straight_at_waypoint;
bool use_turn_restrictions;
bool left_hand_driving;
};
}
}