Adjust to review findings

2017-12-05 14:54:20 +01:00
parent 60ef179d18
commit 0568dca4a3
5 changed files with 47 additions and 45 deletions
@@ -2,6 +2,7 @@
 #define OSRM_EXTRACTOR_GUIDANCE_MERGEABLE_ROADS

 #include "extractor/compressed_edge_container.hpp"
+#include "extractor/guidance/coordinate_extractor.hpp"
 #include "extractor/guidance/intersection.hpp"
 #include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/restriction_index.hpp"
@@ -47,7 +48,6 @@ class MergableRoadDetector
                         const RestrictionMap &node_restriction_map,
                         const std::unordered_set<NodeID> &barrier_nodes,
                         const guidance::TurnLanesIndexedArray &turn_lanes_data,
-                         const CoordinateExtractor &coordinate_extractor,
                         const util::NameTable &name_table,
                         const SuffixTable &street_name_suffix_table);

@@ -170,12 +170,13 @@ class MergableRoadDetector
    const RestrictionMap &node_restriction_map;
    const std::unordered_set<NodeID> &barrier_nodes;
    const guidance::TurnLanesIndexedArray &turn_lanes_data;
-    const CoordinateExtractor &coordinate_extractor;

    // name detection
    const util::NameTable &name_table;
    const SuffixTable &street_name_suffix_table;

+    const CoordinateExtractor coordinate_extractor;
+
    // limit for detecting circles / parallel roads
    const static double constexpr distance_to_extract = 150;
 };