basic turn lane handling

2016-05-13 19:18:00 +02:00
parent 2a05b70dfc
commit efa29edf09
68 changed files with 3010 additions and 207 deletions
@@ -1,4 +1,5 @@
 #include "extractor/guidance/intersection.hpp"
+#include "extractor/guidance/toolkit.hpp"

 namespace osrm
 {
@@ -21,11 +22,34 @@ std::string toString(const ConnectedRoad &road)
    result += " angle: ";
    result += std::to_string(road.turn.angle);
    result += " instruction: ";
-    result += std::to_string(static_cast<std::int32_t>(road.turn.instruction.type)) + " " +
-              std::to_string(static_cast<std::int32_t>(road.turn.instruction.direction_modifier));
+    result +=
+        std::to_string(static_cast<std::int32_t>(road.turn.instruction.type)) + " " +
+        std::to_string(static_cast<std::int32_t>(road.turn.instruction.direction_modifier)) + " " +
+        std::to_string(static_cast<std::int32_t>(road.turn.instruction.lane_tupel.lanes_in_turn)) +
+        " " + std::to_string(static_cast<std::int32_t>(
+                  road.turn.instruction.lane_tupel.first_lane_from_the_right));
    return result;
 }

+Intersection::iterator findClosestTurn(Intersection &intersection, const double angle)
+{
+    return std::min_element(intersection.begin(),
+                            intersection.end(),
+                            [angle](const ConnectedRoad &lhs, const ConnectedRoad &rhs) {
+                                return angularDeviation(lhs.turn.angle, angle) <
+                                       angularDeviation(rhs.turn.angle, angle);
+                            });
+}
+Intersection::const_iterator findClosestTurn(const Intersection &intersection, const double angle)
+{
+    return std::min_element(intersection.cbegin(),
+                            intersection.cend(),
+                            [angle](const ConnectedRoad &lhs, const ConnectedRoad &rhs) {
+                                return angularDeviation(lhs.turn.angle, angle) <
+                                       angularDeviation(rhs.turn.angle, angle);
+                            });
+}
+
 } // namespace guidance
 } // namespace extractor
 } // namespace osrm