Move guidance pre-processing code into GUIDANCE library

CMakeLists.txt

@@ -126,6 +126,7 @@ configure_file(
 )
 file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp)
 file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp)
+file(GLOB GuidanceGlob src/guidance/*.cpp)
 file(GLOB PartitionerGlob src/partitioner/*.cpp)
 file(GLOB CustomizerGlob src/customize/*.cpp)
 file(GLOB ContractorGlob src/contractor/*.cpp)
@@ -137,6 +138,7 @@ file(GLOB ErrorcodesGlob src/osrm/errorcodes.cpp)
 
 add_library(UTIL OBJECT ${UtilGlob})
 add_library(EXTRACTOR OBJECT ${ExtractorGlob})
+add_library(GUIDANCE OBJECT ${GuidanceGlob})
 add_library(PARTITIONER OBJECT ${PartitionerGlob})
 add_library(CUSTOMIZER OBJECT ${CustomizerGlob})
 add_library(CONTRACTOR OBJECT ${ContractorGlob})
@@ -155,7 +157,7 @@ add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGE
 add_executable(osrm-datastore src/tools/store.cpp $<TARGET_OBJECTS:UTIL>)
 add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:STORAGE>)
 add_library(osrm_contract src/osrm/contractor.cpp $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
-add_library(osrm_extract src/osrm/extractor.cpp $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
+add_library(osrm_extract src/osrm/extractor.cpp $<TARGET_OBJECTS:GUIDANCE> $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_partition src/osrm/partitioner.cpp $<TARGET_OBJECTS:PARTITIONER> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_customize src/osrm/customizer.cpp $<TARGET_OBJECTS:CUSTOMIZER> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_update $<TARGET_OBJECTS:UPDATER> $<TARGET_OBJECTS:UTIL>)

include/engine/api/json_factory.hpp

@@ -1,8 +1,8 @@
 #ifndef ENGINE_RESPONSE_OBJECTS_HPP_
 #define ENGINE_RESPONSE_OBJECTS_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route.hpp"
 #include "engine/guidance/route_leg.hpp"

include/engine/datafacade/contiguous_internalmem_datafacade.hpp

@@ -13,14 +13,14 @@
 
 #include "extractor/datasources.hpp"
 #include "extractor/edge_based_node.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/intersection_bearings_container.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/segment_data_container.hpp"
 #include "extractor/turn_data_container.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "contractor/query_graph.hpp"
 

include/engine/datafacade/datafacade_base.hpp

@@ -10,11 +10,11 @@
 
 #include "extractor/class_data.hpp"
 #include "extractor/edge_based_node_segment.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/exception.hpp"
 #include "util/guidance/bearing_class.hpp"

include/engine/guidance/assemble_geometry.hpp

@@ -1,8 +1,8 @@
 #ifndef ENGINE_GUIDANCE_ASSEMBLE_GEOMETRY_HPP
 #define ENGINE_GUIDANCE_ASSEMBLE_GEOMETRY_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"

include/engine/guidance/assemble_steps.hpp

@@ -1,9 +1,9 @@
 #ifndef ENGINE_GUIDANCE_ASSEMBLE_STEPS_HPP_
 #define ENGINE_GUIDANCE_ASSEMBLE_STEPS_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"

include/engine/guidance/collapsing_utility.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_ENGINE_GUIDANCE_COLLAPSING_UTILITY_HPP_
 #define OSRM_ENGINE_GUIDANCE_COLLAPSING_UTILITY_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "util/attributes.hpp"
 #include "util/bearing.hpp"

include/engine/guidance/postprocessing_toolkit.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_ENGINE_GUIDANCE_POSTPROCESSING_TOOLKIT_HPP_
 #define OSRM_ENGINE_GUIDANCE_POSTPROCESSING_TOOLKIT_HPP_
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/route_step.hpp"
 
 #include <iterator>

include/engine/guidance/route_step.hpp

@@ -7,7 +7,7 @@
 #include "util/guidance/bearing_class.hpp"
 #include "util/guidance/entry_class.hpp"
 
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/guidance/turn_lanes.hpp"
 
 #include <cstddef>

include/engine/guidance/step_maneuver.hpp

@@ -1,7 +1,7 @@
 #ifndef ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 #define ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "util/coordinate.hpp"
 
 #include <cstdint>

include/engine/internal_route_result.hpp

@@ -2,8 +2,8 @@
 #define RAW_ROUTE_DATA_H
 
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/phantom_node.hpp"
 

include/engine/routing_algorithms/routing_base.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_ENGINE_ROUTING_BASE_HPP
 #define OSRM_ENGINE_ROUTING_BASE_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/algorithm.hpp"
 #include "engine/datafacade.hpp"

include/extractor/edge_based_graph_factory.hpp

@@ -8,15 +8,15 @@
 #include "extractor/edge_based_edge.hpp"
 #include "extractor/edge_based_node_segment.hpp"
 #include "extractor/extraction_turn.hpp"
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/nbg_to_ebg.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction_index.hpp"
 #include "extractor/way_restriction_map.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/concurrent_id_map.hpp"
 #include "util/deallocating_vector.hpp"

include/extractor/extraction_helper_functions.hpp

@@ -12,7 +12,7 @@
 #include <limits>
 #include <string>
 
-#include "extractor/guidance/parsing_toolkit.hpp"
+#include "guidance/parsing_toolkit.hpp"
 
 namespace osrm
 {

include/extractor/extraction_turn.hpp

@@ -3,7 +3,7 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <extractor/guidance/intersection.hpp>
+#include <guidance/intersection.hpp>
 
 #include <cstdint>
 

include/extractor/extraction_way.hpp

@@ -1,8 +1,8 @@
 #ifndef EXTRACTION_WAY_HPP
 #define EXTRACTION_WAY_HPP
 
-#include "extractor/guidance/road_classification.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/road_classification.hpp"
 #include "util/guidance/turn_lanes.hpp"
 #include "util/typedefs.hpp"
 

include/extractor/extractor_callbacks.hpp

@@ -2,7 +2,7 @@
 #define EXTRACTOR_CALLBACKS_HPP
 
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/typedefs.hpp"
 
 #include <boost/functional/hash.hpp>

include/extractor/files.hpp

@@ -2,11 +2,11 @@
 #define OSRM_EXTRACTOR_FILES_HPP
 
 #include "extractor/edge_based_edge.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/serialization.hpp"
 #include "extractor/turn_data_container.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/guidance/bearing_class.hpp"

include/extractor/geojson_debug_policies.hpp

@@ -10,8 +10,8 @@
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
 
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/intersection.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/intersection.hpp"
 #include "util/coordinate.hpp"
 #include "util/geojson_debug_policy_toolkit.hpp"
 

include/extractor/internal_extractor_edge.hpp

@@ -1,10 +1,10 @@
 #ifndef INTERNAL_EXTRACTOR_EDGE_HPP
 #define INTERNAL_EXTRACTOR_EDGE_HPP
 
-#include "extractor/guidance/road_classification.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/node_based_edge.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/road_classification.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "osrm/coordinate.hpp"
 #include "util/typedefs.hpp"
 

include/extractor/intersection/intersection_analysis.hpp

@@ -2,10 +2,10 @@
 #define OSRM_EXTRACTOR_INTERSECTION_INTERSECTION_ANALYSIS_HPP
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/mergable_road_detector.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/intersection/intersection_edge.hpp"
 #include "extractor/restriction_index.hpp"
+#include "guidance/mergable_road_detector.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"

include/extractor/node_based_edge.hpp

@@ -8,7 +8,7 @@
 #include "extractor/travel_mode.hpp"
 #include "util/typedefs.hpp"
 
-#include "extractor/guidance/road_classification.hpp"
+#include "guidance/road_classification.hpp"
 
 namespace osrm
 {

include/extractor/original_edge_data.hpp

@@ -1,8 +1,8 @@
 #ifndef ORIGINAL_EDGE_DATA_HPP
 #define ORIGINAL_EDGE_DATA_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "util/guidance/turn_bearing.hpp"
 #include "util/typedefs.hpp"
 

include/extractor/scripting_environment.hpp

@@ -1,10 +1,10 @@
 #ifndef SCRIPTING_ENVIRONMENT_HPP
 #define SCRIPTING_ENVIRONMENT_HPP
 
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/internal_extractor_edge.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/restriction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include <osmium/memory/buffer.hpp>
 

include/extractor/turn_data_container.hpp

@@ -1,8 +1,8 @@
 #ifndef OSRM_EXTRACTOR_TURN_DATA_CONTAINER_HPP
 #define OSRM_EXTRACTOR_TURN_DATA_CONTAINER_HPP
 
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"

include/guidance/driveway_handler.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_DRIVEWAY_HANDLER_HPP
 #define OSRM_EXTRACTOR_GUIDANCE_DRIVEWAY_HANDLER_HPP
 
-#include "extractor/guidance/intersection_handler.hpp"
+#include "guidance/intersection_handler.hpp"
 
 namespace osrm
 {

include/guidance/have_identical_names.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_HAVE_IDENTICAL_NAMES_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_HAVE_IDENTICAL_NAMES_HPP_
 
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 #include "extractor/suffix_table.hpp"
 #include "util/name_table.hpp"
 

include/guidance/intersection.hpp

@@ -13,7 +13,7 @@
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp" // EdgeID
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include <boost/range/algorithm/count_if.hpp>
 #include <boost/range/algorithm/find_if.hpp>

include/guidance/intersection_handler.hpp

@@ -1,11 +1,11 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/node_based_graph_walker.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/node_based_graph_walker.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/guidance/name_announcements.hpp"

include/guidance/is_through_street.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_
 
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 #include "extractor/suffix_table.hpp"
 #include "util/guidance/name_announcements.hpp"
 
@@ -60,4 +60,4 @@ inline bool isThroughStreet(const std::size_t index,
 } // namespace extractor
 } // namespace osrm
 
-#endif /*OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_*/
+#endif /*OSRM_EXTRACTOR_GUIDANCE_IS_THROUGH_STREET_HPP_*/

include/guidance/mergable_road_detector.hpp

@@ -2,11 +2,11 @@
 #define OSRM_EXTRACTOR_GUIDANCE_MERGEABLE_ROADS
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/have_identical_names.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/restriction_index.hpp"
+#include "guidance/have_identical_names.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"

include/guidance/motorway_handler.hpp

@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/attributes.hpp"
 #include "util/name_table.hpp"

include/guidance/node_based_graph_walker.hpp

@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_NODE_BASED_GRAPH_WALKER
 #define OSRM_EXTRACTOR_GUIDANCE_NODE_BASED_GRAPH_WALKER
 
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/coordinate.hpp"
 #include "util/coordinate_calculation.hpp"
 #include "util/node_based_graph.hpp"

include/guidance/road_classification.hpp

@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <string>
 
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 
 namespace osrm
 {

include/guidance/roundabout_handler.hpp

@@ -2,12 +2,12 @@
 #define OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
-#include "extractor/guidance/roundabout_type.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/roundabout_type.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"

include/guidance/sliproad_handler.hpp

@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_SLIPROAD_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_SLIPROAD_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"

include/guidance/statistics_handler.hpp

@@ -1,9 +1,9 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_STATISTICS_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_STATISTICS_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "util/log.hpp"
 

include/guidance/suppress_mode_handler.hpp

@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_SUPPRESS_MODE_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_SUPPRESS_MODE_HANDLER_HPP_
 
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
 #include "util/node_based_graph.hpp"
 
 namespace osrm

include/guidance/turn_analysis.hpp

@@ -2,18 +2,18 @@
 #define OSRM_EXTRACTOR_TURN_ANALYSIS
 
 #include "extractor/compressed_edge_container.hpp"
-#include "extractor/guidance/driveway_handler.hpp"
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/motorway_handler.hpp"
-#include "extractor/guidance/roundabout_handler.hpp"
-#include "extractor/guidance/sliproad_handler.hpp"
-#include "extractor/guidance/statistics_handler.hpp"
-#include "extractor/guidance/suppress_mode_handler.hpp"
-#include "extractor/guidance/turn_classification.hpp"
-#include "extractor/guidance/turn_handler.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction_index.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/driveway_handler.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/motorway_handler.hpp"
+#include "guidance/roundabout_handler.hpp"
+#include "guidance/sliproad_handler.hpp"
+#include "guidance/statistics_handler.hpp"
+#include "guidance/suppress_mode_handler.hpp"
+#include "guidance/turn_classification.hpp"
+#include "guidance/turn_handler.hpp"
 
 #include "util/attributes.hpp"
 #include "util/name_table.hpp"

include/guidance/turn_classification.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_GUIDANCE_TURN_CLASSIFICATION_HPP_
 #define OSRM_GUIDANCE_TURN_CLASSIFICATION_HPP_
 
-#include "extractor/guidance/intersection.hpp"
+#include "guidance/intersection.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/guidance/bearing_class.hpp"

include/guidance/turn_discovery.hpp

@@ -1,9 +1,9 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_DISCOVERY_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_DISCOVERY_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
 #include "extractor/restriction_index.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/typedefs.hpp"
 
 #include <unordered_set>

include/guidance/turn_handler.hpp

@@ -1,10 +1,10 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/is_through_street.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/intersection_handler.hpp"
+#include "guidance/is_through_street.hpp"
 
 #include "util/attributes.hpp"
 #include "util/name_table.hpp"

include/guidance/turn_instruction.hpp

@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <cstdint>
 
-#include "extractor/guidance/roundabout_type.hpp"
+#include "guidance/roundabout_type.hpp"
 #include "util/attributes.hpp"
 #include "util/typedefs.hpp"
 

include/guidance/turn_lane_augmentation.hpp

@@ -1,8 +1,8 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_AUGMENTATION_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_AUGMENTATION_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/attributes.hpp"
 
 namespace osrm

include/guidance/turn_lane_data.hpp

@@ -1,7 +1,7 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_DATA_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_DATA_HPP_
 
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/attributes.hpp"
 #include "util/typedefs.hpp"
 #include <vector>

include/guidance/turn_lane_handler.hpp

@@ -1,11 +1,11 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_HANDLER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/turn_lane_data.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "util/attributes.hpp"
 #include "util/guidance/turn_lanes.hpp"

include/guidance/turn_lane_matcher.hpp

@@ -1,9 +1,9 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_MATCHER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_LANE_MATCHER_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_data.hpp"
 
 #include "util/attributes.hpp"
 #include "util/guidance/turn_lanes.hpp"

include/util/debug.hpp

@@ -1,10 +1,10 @@
 #ifndef OSRM_ENGINE_GUIDANCE_DEBUG_HPP_
 #define OSRM_ENGINE_GUIDANCE_DEBUG_HPP_
 
-#include "extractor/guidance/intersection.hpp"
-#include "extractor/guidance/turn_lane_data.hpp"
 #include "extractor/node_data_container.hpp"
 #include "extractor/query_node.hpp"
+#include "guidance/intersection.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"

include/util/node_based_graph.hpp

@@ -2,9 +2,9 @@
 #define NODE_BASED_GRAPH_HPP
 
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/road_classification.hpp"
 #include "extractor/node_based_edge.hpp"
 #include "extractor/node_data_container.hpp"
+#include "guidance/road_classification.hpp"
 #include "util/dynamic_graph.hpp"
 #include "util/graph_utils.hpp"
 

src/engine/api/json_factory.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/api/json_factory.hpp"
 #include "engine/hint.hpp"

src/engine/guidance/collapse_scenario_detection.cpp

@@ -1,5 +1,5 @@
 #include "engine/guidance/collapse_scenario_detection.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/constants.hpp"
 #include "util/bearing.hpp"
 
 #include <numeric>

src/engine/guidance/collapse_turns.cpp

@@ -1,6 +1,6 @@
 #include "engine/guidance/collapse_turns.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/collapse_scenario_detection.hpp"
 #include "engine/guidance/collapsing_utility.hpp"
 #include "util/bearing.hpp"

src/engine/guidance/lane_processing.cpp

@@ -1,7 +1,7 @@
 #include "util/for_each_pair.hpp"
 #include "util/group_by.hpp"
 
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 #include "engine/guidance/collapsing_utility.hpp"
 
 #include <algorithm>

src/engine/guidance/post_processing.cpp

@@ -1,6 +1,6 @@
 #include "engine/guidance/post_processing.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/guidance/assemble_steps.hpp"
 #include "engine/guidance/lane_processing.hpp"

src/engine/plugins/tile.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "engine/plugins/plugin_base.hpp"
 #include "engine/plugins/tile.hpp"

src/extractor/edge_based_graph_factory.cpp

@@ -2,10 +2,10 @@
 #include "extractor/conditional_turn_penalty.hpp"
 #include "extractor/edge_based_edge.hpp"
 #include "extractor/files.hpp"
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/turn_lane_handler.hpp"
 #include "extractor/scripting_environment.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/turn_lane_handler.hpp"
 
 #include "extractor/intersection/intersection_analysis.hpp"
 

src/extractor/extractor.cpp

@@ -13,7 +13,7 @@
 #include "extractor/restriction_parser.hpp"
 #include "extractor/scripting_environment.hpp"
 
-#include "extractor/guidance/segregated_intersection_classification.hpp"
+#include "guidance/segregated_intersection_classification.hpp"
 
 #include "storage/io.hpp"
 

src/extractor/extractor_callbacks.cpp

@@ -2,10 +2,10 @@
 #include "extractor/extraction_containers.hpp"
 #include "extractor/extraction_node.hpp"
 #include "extractor/extraction_way.hpp"
-#include "extractor/guidance/road_classification.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction.hpp"
+#include "guidance/road_classification.hpp"
 
 #include "util/for_each_pair.hpp"
 #include "util/guidance/turn_lanes.hpp"

src/extractor/graph_compressor.cpp

@@ -2,9 +2,9 @@
 
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/extraction_turn.hpp"
-#include "extractor/guidance/intersection.hpp"
 #include "extractor/restriction.hpp"
 #include "extractor/restriction_compressor.hpp"
+#include "guidance/intersection.hpp"
 
 #include "util/dynamic_graph.hpp"
 #include "util/node_based_graph.hpp"

src/extractor/intersection/intersection_analysis.cpp

@@ -4,7 +4,7 @@
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
 
-#include "extractor/guidance/coordinate_extractor.hpp"
+#include "guidance/coordinate_extractor.hpp"
 
 #include <boost/optional/optional_io.hpp>
 

src/guidance/coordinate_extractor.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/coordinate_extractor.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/coordinate_extractor.hpp"
+#include "guidance/constants.hpp"
 
 #include <algorithm>
 #include <cstddef>

src/guidance/driveway_handler.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/driveway_handler.hpp"
+#include "guidance/driveway_handler.hpp"
 
 #include "util/assert.hpp"
 

src/guidance/intersection.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/intersection.hpp"
+#include "guidance/intersection.hpp"
 
 #include <limits>
 #include <string>

src/guidance/intersection_handler.cpp

@@ -1,6 +1,6 @@
-#include "extractor/guidance/intersection_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/intersection_handler.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/guidance/name_announcements.hpp"

src/guidance/mergable_road_detector.cpp

@@ -1,9 +1,9 @@
-#include "extractor/guidance/mergable_road_detector.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/node_based_graph_walker.hpp"
+#include "guidance/mergable_road_detector.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/suffix_table.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/node_based_graph_walker.hpp"
 
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"

src/guidance/motorway_handler.cpp

@@ -1,6 +1,6 @@
-#include "extractor/guidance/motorway_handler.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/road_classification.hpp"
+#include "guidance/motorway_handler.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/road_classification.hpp"
 
 #include "util/assert.hpp"
 #include "util/bearing.hpp"

src/guidance/node_based_graph_walker.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/node_based_graph_walker.hpp"
+#include "guidance/node_based_graph_walker.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"

src/guidance/roundabout_handler.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/roundabout_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/roundabout_handler.hpp"
+#include "guidance/constants.hpp"
 
 #include "util/assert.hpp"
 #include "util/bearing.hpp"

src/guidance/segregated_intersection_classification.cpp

@@ -1,6 +1,6 @@
-#include "extractor/guidance/segregated_intersection_classification.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
+#include "guidance/segregated_intersection_classification.hpp"
 #include "extractor/node_based_graph_factory.hpp"
+#include "guidance/coordinate_extractor.hpp"
 
 #include "util/coordinate_calculation.hpp"
 #include "util/name_table.hpp"

src/guidance/sliproad_handler.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/sliproad_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/sliproad_handler.hpp"
+#include "guidance/constants.hpp"
 #include "util/assert.hpp"
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"

src/guidance/suppress_mode_handler.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/suppress_mode_handler.hpp"
+#include "guidance/suppress_mode_handler.hpp"
 #include "extractor/travel_mode.hpp"
 
 #include <algorithm>

src/guidance/turn_analysis.cpp

@@ -1,6 +1,6 @@
-#include "extractor/guidance/turn_analysis.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/road_classification.hpp"
+#include "guidance/turn_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/road_classification.hpp"
 
 #include "util/coordinate.hpp"
 #include "util/coordinate_calculation.hpp"

src/guidance/turn_classification.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_classification.hpp"
+#include "guidance/turn_classification.hpp"
 
 #include <algorithm>
 #include <cstddef>

src/guidance/turn_discovery.cpp

@@ -1,7 +1,7 @@
-#include "extractor/guidance/turn_discovery.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/coordinate_extractor.hpp"
+#include "guidance/turn_discovery.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/coordinate_extractor.hpp"
 #include "util/bearing.hpp"
 #include "util/coordinate_calculation.hpp"
 

src/guidance/turn_handler.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/turn_handler.hpp"
-#include "extractor/guidance/constants.hpp"
+#include "guidance/turn_handler.hpp"
+#include "guidance/constants.hpp"
 
 #include "util/bearing.hpp"
 #include "util/guidance/name_announcements.hpp"

src/guidance/turn_lane_augmentation.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/turn_lane_augmentation.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
+#include "guidance/turn_lane_augmentation.hpp"
+#include "guidance/turn_lane_types.hpp"
 #include "util/log.hpp"
 
 #include <algorithm>

src/guidance/turn_lane_data.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_lane_data.hpp"
+#include "guidance/turn_lane_data.hpp"
 #include "util/guidance/turn_lanes.hpp"
 
 #include <boost/numeric/conversion/cast.hpp>

src/guidance/turn_lane_handler.cpp

@@ -1,9 +1,9 @@
-#include "extractor/guidance/turn_lane_handler.hpp"
-#include "extractor/guidance/constants.hpp"
-#include "extractor/guidance/turn_discovery.hpp"
-#include "extractor/guidance/turn_lane_augmentation.hpp"
-#include "extractor/guidance/turn_lane_matcher.hpp"
+#include "guidance/turn_lane_handler.hpp"
 #include "extractor/intersection/intersection_analysis.hpp"
+#include "guidance/constants.hpp"
+#include "guidance/turn_discovery.hpp"
+#include "guidance/turn_lane_augmentation.hpp"
+#include "guidance/turn_lane_matcher.hpp"
 #include "util/bearing.hpp"
 #include "util/log.hpp"
 #include "util/typedefs.hpp"

src/guidance/turn_lane_matcher.cpp

@@ -1,4 +1,4 @@
-#include "extractor/guidance/turn_lane_matcher.hpp"
+#include "guidance/turn_lane_matcher.hpp"
 #include "util/bearing.hpp"
 
 #include <boost/assert.hpp>

src/storage/storage.cpp

@@ -17,12 +17,12 @@
 #include "extractor/edge_based_edge.hpp"
 #include "extractor/edge_based_node.hpp"
 #include "extractor/files.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include "partitioner/cell_storage.hpp"
 #include "partitioner/edge_based_graph_reader.hpp"

unit_tests/CMakeLists.txt

@@ -68,7 +68,7 @@ add_executable(contractor-tests
 add_executable(extractor-tests
 	EXCLUDE_FROM_ALL
 	${ExtractorTestsSources}
-	$<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
+	$<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:GUIDANCE> $<TARGET_OBJECTS:UTIL>)
 
 add_executable(partitioner-tests
 	EXCLUDE_FROM_ALL

unit_tests/engine/json_factory.cpp

@@ -1,5 +1,5 @@
 #include "engine/api/json_factory.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
+#include "guidance/turn_instruction.hpp"
 
 #include <boost/test/test_case_template.hpp>
 #include <boost/test/unit_test.hpp>

unit_tests/mocks/mock_datafacade.hpp

@@ -5,9 +5,9 @@
 
 #include "contractor/query_edge.hpp"
 #include "extractor/class_data.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
-#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/travel_mode.hpp"
+#include "guidance/turn_instruction.hpp"
+#include "guidance/turn_lane_types.hpp"
 
 #include "engine/algorithm.hpp"
 #include "engine/datafacade/algorithm_datafacade.hpp"