basic turn lane handling

src/engine/api/json_factory.cpp

@@ -7,6 +7,7 @@
 #include "util/guidance/bearing_class.hpp"
 #include "util/guidance/entry_class.hpp"
 #include "util/guidance/toolkit.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/optional.hpp>
@@ -47,7 +48,7 @@ const constexpr char *turn_type_names[] = {
     "invalid",         "new name",   "continue", "turn",        "merge",
     "on ramp",         "off ramp",   "fork",     "end of road", "notification",
     "roundabout",      "roundabout", "rotary",   "rotary",      "roundabout turn",
-    "roundabout turn", "invalid",    "invalid",  "invalid",     "invalid",
+    "roundabout turn", "use lane",   "invalid",  "invalid",     "invalid",
     "invalid",         "invalid",    "invalid",  "invalid",     "invalid",
     "invalid"};
 
@@ -56,10 +57,13 @@ const constexpr char *waypoint_type_names[] = {"invalid", "arrive", "depart"};
 // Check whether to include a modifier in the result of the API
 inline bool isValidModifier(const guidance::StepManeuver maneuver)
 {
-    if (maneuver.waypoint_type != guidance::WaypointType::None &&
-        maneuver.instruction.direction_modifier == DirectionModifier::UTurn)
-        return false;
-    return true;
+    return (maneuver.waypoint_type == guidance::WaypointType::None ||
+            maneuver.instruction.direction_modifier != DirectionModifier::UTurn);
+}
+
+inline bool hasValidLanes(const guidance::StepManeuver maneuver)
+{
+    return maneuver.instruction.lane_tupel.lanes_in_turn > 0;
 }
 
 std::string instructionTypeToString(const TurnType::Enum type)
@@ -67,6 +71,15 @@ std::string instructionTypeToString(const TurnType::Enum type)
     return turn_type_names[static_cast<std::size_t>(type)];
 }
 
+util::json::Array laneArrayFromLaneTupe(const util::guidance::LaneTupel lane_tupel)
+{
+    BOOST_ASSERT(lane_tupel.lanes_in_turn >= 1);
+    util::json::Array result;
+    for (LaneID i = 0; i < lane_tupel.lanes_in_turn; ++i)
+        result.values.push_back(lane_tupel.first_lane_from_the_right + i);
+    return result;
+}
+
 std::string instructionModifierToString(const DirectionModifier::Enum modifier)
 {
     return modifier_names[static_cast<std::size_t>(modifier)];
@@ -148,6 +161,10 @@ util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver)
         step_maneuver.values["modifier"] =
             detail::instructionModifierToString(maneuver.instruction.direction_modifier);
 
+    if (detail::hasValidLanes(maneuver))
+        step_maneuver.values["lanes"] =
+            detail::laneArrayFromLaneTupe(maneuver.instruction.lane_tupel);
+
     step_maneuver.values["location"] = detail::coordinateToLonLat(maneuver.location);
     step_maneuver.values["bearing_before"] = std::round(maneuver.bearing_before);
     step_maneuver.values["bearing_after"] = std::round(maneuver.bearing_after);