fixes #1107, turn restriction combination including overlaps and one-ways

DennisOSRM · DennisOSRM · commit 6fb7c8687ede · 2014-08-07T18:34:56.000+02:00
diff --git a/DataStructures/RestrictionMap.cpp b/DataStructures/RestrictionMap.cpp
@@ -96,9 +96,8 @@ void RestrictionMap::FixupArrivingTurnRestriction(const NodeID node_u,
     std::vector<NodeID> predecessors;
     for (const EdgeID current_edge_id : m_graph->GetAdjacentEdgeRange(node_u))
     {
-        const EdgeData &edge_data = m_graph->GetEdgeData(current_edge_id);
         const NodeID target = m_graph->GetTarget(current_edge_id);
-        if (edge_data.backward && (node_v != target))
+        if (node_v != target)
         {
             predecessors.push_back(target);
         }
@@ -163,11 +162,11 @@ NodeID RestrictionMap::CheckForEmanatingIsOnlyTurn(const NodeID node_u, const No
         return SPECIAL_NODEID;
     }
 
-    auto restriction_iter = m_restriction_map.find({node_u, node_v});
+    const auto restriction_iter = m_restriction_map.find({node_u, node_v});
     if (restriction_iter != m_restriction_map.end())
     {
         const unsigned index = restriction_iter->second;
-        auto &bucket = m_restriction_bucket_list.at(index);
+        const auto &bucket = m_restriction_bucket_list.at(index);
         for (const RestrictionTarget &restriction_target : bucket)
         {
             if (restriction_target.is_only)
@@ -184,8 +183,6 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
                                              const NodeID node_v,
                                              const NodeID node_w) const
 {
-    // return false;
-
     BOOST_ASSERT(node_u != SPECIAL_NODEID);
     BOOST_ASSERT(node_v != SPECIAL_NODEID);
     BOOST_ASSERT(node_w != SPECIAL_NODEID);
@@ -195,7 +192,7 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
         return false;
     }
 
-    auto restriction_iter = m_restriction_map.find({node_u, node_v});
+    const auto restriction_iter = m_restriction_map.find({node_u, node_v});
     if (restriction_iter != m_restriction_map.end())
     {
         const unsigned index = restriction_iter->second;

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,8 @@ void RestrictionMap::FixupArrivingTurnRestriction(const NodeID node_u,`
`96`	`96`	`std::vector<NodeID> predecessors;`
`97`	`97`	`for (const EdgeID current_edge_id : m_graph->GetAdjacentEdgeRange(node_u))`
`98`	`98`	`{`
`99`		`- const EdgeData &edge_data = m_graph->GetEdgeData(current_edge_id);`
`100`	`99`	`const NodeID target = m_graph->GetTarget(current_edge_id);`
`101`		`- if (edge_data.backward && (node_v != target))`
	`100`	`+ if (node_v != target)`
`102`	`101`	`{`
`103`	`102`	`predecessors.push_back(target);`
`104`	`103`	`}`
`@@ -163,11 +162,11 @@ NodeID RestrictionMap::CheckForEmanatingIsOnlyTurn(const NodeID node_u, const No`
`163`	`162`	`return SPECIAL_NODEID;`
`164`	`163`	`}`
`165`	`164`
`166`		`- auto restriction_iter = m_restriction_map.find({node_u, node_v});`
	`165`	`+ const auto restriction_iter = m_restriction_map.find({node_u, node_v});`
`167`	`166`	`if (restriction_iter != m_restriction_map.end())`
`168`	`167`	`{`
`169`	`168`	`const unsigned index = restriction_iter->second;`
`170`		`- auto &bucket = m_restriction_bucket_list.at(index);`
	`169`	`+ const auto &bucket = m_restriction_bucket_list.at(index);`
`171`	`170`	`for (const RestrictionTarget &restriction_target : bucket)`
`172`	`171`	`{`
`173`	`172`	`if (restriction_target.is_only)`
`@@ -184,8 +183,6 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,`
`184`	`183`	`const NodeID node_v,`
`185`	`184`	`const NodeID node_w) const`
`186`	`185`	`{`
`187`		`- // return false;`
`188`		`-`
`189`	`186`	`BOOST_ASSERT(node_u != SPECIAL_NODEID);`
`190`	`187`	`BOOST_ASSERT(node_v != SPECIAL_NODEID);`
`191`	`188`	`BOOST_ASSERT(node_w != SPECIAL_NODEID);`
`@@ -195,7 +192,7 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,`
`195`	`192`	`return false;`
`196`	`193`	`}`
`197`	`194`
`198`		`- auto restriction_iter = m_restriction_map.find({node_u, node_v});`
	`195`	`+ const auto restriction_iter = m_restriction_map.find({node_u, node_v});`
`199`	`196`	`if (restriction_iter != m_restriction_map.end())`
`200`	`197`	`{`
`201`	`198`	`const unsigned index = restriction_iter->second;`