Move guidance pre-processing code into GUIDANCE library

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"