[osrm] 06/22: Imported Upstream version 5.0.2+ds

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit 73910a9808d73a54c2d021a9d32ce3856389e550
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 23:13:37 2016 +0200

    Imported Upstream version 5.0.2+ds
---
 CHANGELOG.md                 | 4 ++++
 src/engine/plugins/match.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e498592..c6ea195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.0.2
+   - Fixes:
+     - Issue #2335, map matching was using shortest path with uturns disabled
+
 # 5.0.1
    - Fixes:
      - Issue #2309: Fixes local path looping, same coordinates crash
diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp
index bd3a970..ac53c07 100644
--- a/src/engine/plugins/match.cpp
+++ b/src/engine/plugins/match.cpp
@@ -185,7 +185,7 @@ Status MatchPlugin::HandleRequest(const api::MatchParameters &parameters,
         }
         // force uturns to be on, since we split the phantom nodes anyway and only have bi-directional
         // phantom nodes for possible uturns
-        shortest_path(sub_routes[index].segment_end_coordinates, {true}, sub_routes[index]);
+        shortest_path(sub_routes[index].segment_end_coordinates, {false}, sub_routes[index]);
         BOOST_ASSERT(sub_routes[index].shortest_path_length != INVALID_EDGE_WEIGHT);
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git