From 910ee0829f1e95a78457529673ec52d32590e6fb Mon Sep 17 00:00:00 2001
From: Moritz Kobitzsch <moritz@mapbox.com>
Date: Mon, 23 Oct 2017 05:31:10 +0200
Subject: [PATCH] make circular detection covered again

---
 .../guidance/merge-segregated-roads.feature   | 33 +++++++++----------
 .../guidance/mergable_road_detector.cpp       |  9 ++---
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/features/guidance/merge-segregated-roads.feature b/features/guidance/merge-segregated-roads.feature
index 74c6818cd..a27862dc5 100644
--- a/features/guidance/merge-segregated-roads.feature
+++ b/features/guidance/merge-segregated-roads.feature
@@ -529,24 +529,21 @@ Feature: Merge Segregated Roads
         Given a grid size of 2 meters
         Given the node map
             """
-                                 i
-                                /
-                               /
-                              /
-                       b---- g .
-                            /     p .
-                  a        /          \           f
-                   \      /             o        /
-                     \   /               \     /
-                       c                  n   /
-                     /  \                  \/
-                    /    k                  e
-                   /     \               /
-                  h       l            /
+                           i
+                       b    `
+                         `   `    p .
+                  a        ` g` `     \         f
+                   \      /             o      /
+                     \   /               \    /
+                  h - - c                  n /
+                        \                  \/
+                         k                  e
+                         \               /
+                          l            /
                             \        /
                               m  . d
-                                 /
-                                j
+                                  /
+                                 j
             """
 
         And the ways
@@ -560,8 +557,8 @@ Feature: Merge Segregated Roads
             | jd          | Hubertusallee  | yes    |
 
         When I route I should get
-            | waypoints | route                                      | turns                       |
-            | i,h       | Kurfürstendamm,Hubertusallee,Hubertusallee | depart,turn straight,arrive |
+            | waypoints | route                                                    | turns                               |
+            | i,h       | Kurfürstendamm,Rathenauplatz,Hubertusallee,Hubertusallee | depart,turn right,turn right,arrive |
 
     # https://www.openstreetmap.org/#map=19/52.46339/13.40272
     Scenario: Do not merge links between segregated roads
diff --git a/src/extractor/guidance/mergable_road_detector.cpp b/src/extractor/guidance/mergable_road_detector.cpp
index dd8cca268..6d04b686f 100644
--- a/src/extractor/guidance/mergable_road_detector.cpp
+++ b/src/extractor/guidance/mergable_road_detector.cpp
@@ -109,13 +109,8 @@ bool MergableRoadDetector::CanMergeRoad(const NodeID intersection_node,
         return true;
 
     // finally check if two roads describe the direction
-    if (HaveSameDirection(intersection_node, lhs, rhs))
-    {
-        // do not merge traffic circles and similar
-        return !IsCircularShape(intersection_node, lhs, rhs);
-    }
-    else
-        return false;
+    return HaveSameDirection(intersection_node, lhs, rhs) &&
+           !IsCircularShape(intersection_node, lhs, rhs);
 }
 
 bool MergableRoadDetector::HaveIdenticalNames(const NameID lhs, const NameID rhs) const