pre-filter turn restrictions for validity

2017-07-19 14:21:11 +02:00
parent 2e9a7d9c1a
commit b1809d1667
4 changed files with 116 additions and 7 deletions
@@ -7,6 +7,7 @@
 #include "extractor/extractor_callbacks.hpp"
 #include "extractor/files.hpp"
 #include "extractor/raster_source.hpp"
+#include "extractor/restriction_filter.hpp"
 #include "extractor/restriction_parser.hpp"
 #include "extractor/scripting_environment.hpp"

@@ -465,6 +466,8 @@ Extractor::BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
                              *node_based_graph,
                              compressed_edge_container);

+    turn_restrictions = removeInvalidRestrictions(std::move(turn_restrictions), *node_based_graph);
+
    util::NameTable name_table(config.GetPath(".osrm.names").string());

    auto restriction_map = std::make_shared<RestrictionMap>(turn_restrictions);