expose lanes as enums, adjusted for comments

include/engine/guidance/assemble_steps.hpp

@@ -3,6 +3,7 @@
 
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "extractor/guidance/turn_lane_types.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"
@@ -73,7 +74,7 @@ inline std::vector<RouteStep> assembleSteps(const datafacade::BaseDataFacade &fa
                           WaypointType::Depart,
                           0,
                           util::guidance::LaneTupel(),
-                          ""};
+                          {}};
     Intersection intersection{source_node.location,
                               std::vector<short>({bearings.second}),
                               std::vector<bool>({true}),
@@ -152,9 +153,9 @@ inline std::vector<RouteStep> assembleSteps(const datafacade::BaseDataFacade &fa
                             WaypointType::None,
                             0,
                             path_point.lane_data.first,
-                            (path_point.lane_data.second != INVALID_LANE_STRINGID
-                                 ? facade.GetTurnStringForID(path_point.lane_data.second)
-                                 : "")};
+                            (path_point.lane_data.second != INVALID_LANE_DESCRIPTIONID
+                                 ? facade.GetTurnDescription(path_point.lane_data.second)
+                                 : extractor::guidance::TurnLaneDescription())};
                 segment_index++;
                 segment_duration = 0;
             }
@@ -211,7 +212,7 @@ inline std::vector<RouteStep> assembleSteps(const datafacade::BaseDataFacade &fa
                 WaypointType::Arrive,
                 0,
                 util::guidance::LaneTupel(),
-                ""};
+                {}};
     intersection = {
         target_node.location,
         std::vector<short>({static_cast<short>(util::bearing::reverseBearing(bearings.first))}),
@@ -244,7 +245,7 @@ inline std::vector<RouteStep> assembleSteps(const datafacade::BaseDataFacade &fa
     BOOST_ASSERT(steps.back().maneuver.waypoint_type == WaypointType::Arrive);
     BOOST_ASSERT(steps.back().maneuver.lanes.lanes_in_turn == 0);
     BOOST_ASSERT(steps.back().maneuver.lanes.first_lane_from_the_right == INVALID_LANEID);
-    BOOST_ASSERT(steps.back().maneuver.turn_lane_string == "");
+    BOOST_ASSERT(steps.back().maneuver.lane_description.empty());
     return steps;
 }
 

include/engine/guidance/debug.hpp

@@ -1,52 +0,0 @@
-#ifndef OSRM_ENGINE_GUIDANCE_DEBUG_HPP_
-#define OSRM_ENGINE_GUIDANCE_DEBUG_HPP_
-
-#include "engine/guidance/route_step.hpp"
-
-#include <iostream>
-#include <vector>
-
-namespace osrm
-{
-namespace engine
-{
-namespace guidance
-{
-inline void print(const RouteStep &step)
-{
-    std::cout << static_cast<int>(step.maneuver.instruction.type) << " "
-              << static_cast<int>(step.maneuver.instruction.direction_modifier) << "  "
-              << static_cast<int>(step.maneuver.waypoint_type) << " Duration: " << step.duration
-              << " Distance: " << step.distance << " Geometry: " << step.geometry_begin << " "
-              << step.geometry_end << " exit: " << step.maneuver.exit
-              << " Intersections: " << step.intersections.size() << " [";
-
-    for (const auto &intersection : step.intersections)
-    {
-        std::cout << "(bearings:";
-        for (auto bearing : intersection.bearings)
-            std::cout << " " << bearing;
-        std::cout << ", entry: ";
-        for (auto entry : intersection.entry)
-            std::cout << " " << entry;
-        std::cout << ")";
-    }
-    std::cout << "] name[" << step.name_id << "]: " << step.name;
-}
-
-inline void print(const std::vector<RouteStep> &steps)
-{
-    std::cout << "Path\n";
-    int segment = 0;
-    for (const auto &step : steps)
-    {
-        std::cout << "\t[" << segment++ << "]: ";
-        print(step);
-        std::cout << std::endl;
-    }
-}
-} // namespace guidance
-} // namespace engine
-} // namespace osrm
-
-#endif /*OSRM_ENGINE_GUIDANCE_DEBUG_HPP_*/

include/engine/guidance/step_maneuver.hpp

@@ -2,6 +2,7 @@
 #define ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 
 #include "extractor/guidance/turn_instruction.hpp"
+#include "extractor/guidance/turn_lane_types.hpp"
 #include "util/coordinate.hpp"
 #include "util/guidance/turn_lanes.hpp"
 
@@ -34,7 +35,7 @@ struct StepManeuver
     unsigned exit;
 
     util::guidance::LaneTupel lanes;
-    std::string turn_lane_string;
+    extractor::guidance::TurnLaneDescription lane_description;
 };
 
 inline StepManeuver getInvalidStepManeuver()
@@ -46,7 +47,7 @@ inline StepManeuver getInvalidStepManeuver()
             WaypointType::None,
             0,
             util::guidance::LaneTupel(),
-            ""};
+            {}};
 }
 
 } // namespace guidance