expose data about turning onto restricted roads to turn function

This commit is contained in:
karenzshea
2017-02-14 12:59:16 +01:00
committed by Patrick Niklaus
parent a0e7bab598
commit c2727f2029
19 changed files with 210 additions and 103 deletions
+6 -2
View File
@@ -33,11 +33,12 @@ struct NodeBasedEdgeData
bool roundabout,
bool circular,
bool startpoint,
bool restricted,
extractor::TravelMode travel_mode,
const LaneDescriptionID lane_description_id)
: weight(weight), duration(duration), edge_id(edge_id), name_id(name_id),
reversed(reversed), roundabout(roundabout), circular(circular), startpoint(startpoint),
travel_mode(travel_mode), lane_description_id(lane_description_id)
restricted(restricted), travel_mode(travel_mode), lane_description_id(lane_description_id)
{
}
@@ -49,6 +50,7 @@ struct NodeBasedEdgeData
bool roundabout : 1;
bool circular : 1;
bool startpoint : 1;
bool restricted : 1;
extractor::TravelMode travel_mode : 4;
LaneDescriptionID lane_description_id;
extractor::guidance::RoadClassification road_classification;
@@ -58,7 +60,8 @@ struct NodeBasedEdgeData
return (reversed == other.reversed) && (roundabout == other.roundabout) &&
(circular == other.circular) && (startpoint == other.startpoint) &&
(travel_mode == other.travel_mode) &&
(road_classification == other.road_classification);
(road_classification == other.road_classification) &&
(restricted == other.restricted);
}
bool CanCombineWith(const NodeBasedEdgeData &other) const
@@ -87,6 +90,7 @@ NodeBasedDynamicGraphFromEdges(NodeID number_of_nodes,
output_edge.data.name_id = input_edge.name_id;
output_edge.data.travel_mode = input_edge.travel_mode;
output_edge.data.startpoint = input_edge.startpoint;
output_edge.data.restricted = input_edge.restricted;
output_edge.data.road_classification = input_edge.road_classification;
output_edge.data.lane_description_id = input_edge.lane_description_id;