latest, tests are a wip

valhalla · ktatterso · Nov 10, 2021 · Oct 7, 2021 · Oct 14, 2021 · Oct 14, 2021
commit bc7748085774c84575f03ea436990d86f28afa1e
diff --git a/src/odin/maneuversbuilder.cc b/src/odin/maneuversbuilder.cc
@@ -2258,6 +2258,11 @@ float get_deceleration_lane_length(float speed_kph) {
   return 0.122;
 }
 
+// This is a new idea... see usage.
+bool is_nearly_straight(uint32_t turn_degree) {
+  return ((turn_degree > 357) || (turn_degree < 3));
+}
+
 bool ManeuversBuilder::IsFork(int node_index,
                               EnhancedTripLeg_Edge* prev_edge,
                               EnhancedTripLeg_Edge* curr_edge) const {
@@ -2384,7 +2389,9 @@ bool ManeuversBuilder::IsFork(int node_index,
         // an exit than a highway bifurcation.
         int delta = 1;
         auto prev_at_delta = trip_path->GetPrevEdge(node_index, delta);
-        float deceleration_lane_length_km = get_deceleration_lane_length(prev_at_delta->default_speed());
+        float kt = prev_at_delta->speed();
+        float deceleration_lane_length_km =
+            get_deceleration_lane_length(prev_at_delta->default_speed());
         float agg_lane_length_km = prev_at_delta->length_km();
         while (agg_lane_length_km < deceleration_lane_length_km) {
           delta++;
@@ -2412,12 +2419,19 @@ bool ManeuversBuilder::IsFork(int node_index,
 
     if (prev_edge->IsHighway() &&
         ((curr_edge->IsHighway() && (xedge->use() == TripLeg_Use_kRampUse)) ||
-         (xedge->IsHighway() && curr_edge->IsRampUse())) &&
-        has_lane_bifurcation(trip_path_, node_index, prev_edge, curr_edge, xedge) &&
-        prev_edge->IsForkForward(
-            GetTurnDegree(prev_edge->end_heading(), curr_edge->begin_heading())) &&
-        prev_edge->IsForkForward(GetTurnDegree(prev_edge->end_heading(), xedge->begin_heading()))) {
-      return true;
+         (xedge->IsHighway() && curr_edge->IsRampUse()))) {
+
+      // If the ramp is actually a straight, announce the turn
+      if (is_nearly_straight(GetTurnDegree(prev_edge->end_heading(), xedge->begin_heading()))) {
+        return true;
+      }
+
+      if (has_lane_bifurcation(trip_path_, node_index, prev_edge, curr_edge, xedge) &&
+          prev_edge->IsForkForward(
+              GetTurnDegree(prev_edge->end_heading(), curr_edge->begin_heading())) &&
+          prev_edge->IsForkForward(GetTurnDegree(prev_edge->end_heading(), xedge->begin_heading()))) {
+        return true;
+      }
     }
   }
 

diff --git a/test/gurka/test_forks.cc b/test/gurka/test_forks.cc
@@ -0,0 +1,136 @@
+#include "gurka.h"
+#include "test.h"
+#include <gtest/gtest.h>
+
+#if !defined(VALHALLA_SOURCE_DIR)
+#define VALHALLA_SOURCE_DIR
+#endif
+
+using namespace valhalla;
+
+//=======================================================================================
+class ForkTest : public ::testing::Test {
+protected:
+  static gurka::map map;
+  static std::shared_ptr<baldr::GraphReader> reader;
+
+  static void SetUpTestSuite() {
+    constexpr double gridsize = 10;
+
+    const std::string ascii_map = R"(
+      A-------B--------------------C----------------------------------------------------------D
+                                          E
+                                            F
+    )";
+    const gurka::ways ways =
+        {// we start out with two lanes
+         {"AB",
+          {{"highway", "motorway"},
+           {"oneway", "yes"},
+           {"lanes", "2"},
+           {"name", "A92"},
+           {"maxspeed", "120"}}},
+         // BC is three lanes because it "grew" a deceleration lane.  length = 200 m
+         {"BC",
+          {{"highway", "motorway"},
+           {"oneway", "yes"},
+           {"lanes", "3"},
+           {"name", "A92"},
+           {"maxspeed", "120"}}},
+         // now back to two lanes
+         {"CD",
+          {{"highway", "motorway"},
+           {"oneway", "yes"},
+           {"lanes", "2"},
+           {"name", "A92"},
+           {"maxspeed", "120"}}},
+         // this ramp forms a small angle ~15 deg
+         {"CE",
+          {{"highway", "motorway_link"}, {"oneway", "yes"}, {"lanes", "2"}, {"name", "A92 link"}}},
+         {"EF",
+          {{"highway", "motorway_link"}, {"oneway", "yes"}, {"lanes", "2"}, {"name", "A92 link"}}}};
+
+    const gurka::nodes nodes;
+    const auto layout = gurka::detail::map_to_coordinates(ascii_map, gridsize);
+    map = gurka::buildtiles(layout, ways, nodes, {}, "test/data/ForkTest", {});
+    reader = test::make_clean_graphreader(map.config.get_child("mjolnir"));
+  }
+};
+
+std::shared_ptr<baldr::GraphReader> ForkTest::reader;
+gurka::map ForkTest::map = {};
+
+//------------------------------------------------------------------
+TEST_F(ForkTest, test) {
+  auto result = gurka::do_action(valhalla::Options::route, map, {"A", "D"}, "auto");
+
+  // TODO: should not announce stay left since we detect a deceleration lane
+  for (const auto& leg : result.directions().routes(0).legs()) {
+    for (const auto& maneuver : leg.maneuver()) {
+      std::cout << maneuver.text_instruction() << "\n";
+    }
+  }
+}
+
+//=======================================================================================
+class ForkTest2 : public ::testing::Test {
+protected:
+  static gurka::map map;
+  static std::shared_ptr<baldr::GraphReader> reader;
+
+  static void SetUpTestSuite() {
+    constexpr double gridsize = 10;
+
+    const std::string ascii_map = R"(
+      A-------B--------------------C----------------------------------------------------------D
+                                          E
+                                            F
+    )";
+    const gurka::ways ways =
+        {// we start out with two lanes
+         {"AB",
+          {{"highway", "motorway"},
+           {"oneway", "yes"},
+           {"lanes", "2"},
+           {"name", "D4"},
+           {"maxspeed", "120"}}},
+         // BC is three lanes because it "grew" a deceleration lane.  length = 200 m
+         {"BC",
+          {{"highway", "motorway"},
+           {"oneway", "yes"},
+           {"lanes", "3"},
+           {"name", "D4"},
+           {"maxspeed", "120"}}},
+         // now back to two lanes - but wait this is a different highway. ramp forms a small angle ~15
+         // deg
+         {"CD",
+          {{"highway", "motorway_link"},
+           {"oneway", "yes"},
+           {"lanes", "2"},
+           {"name", "D2"},
+           {"maxspeed", "120"}}},
+         // this is the continuation of D4
+         {"CE", {{"highway", "motorway"}, {"oneway", "yes"}, {"lanes", "2"}, {"name", "D4"}}},
+         {"EF", {{"highway", "motorway"}, {"oneway", "yes"}, {"lanes", "2"}, {"name", "D4"}}}};
+
+    const gurka::nodes nodes;
+    const auto layout = gurka::detail::map_to_coordinates(ascii_map, gridsize);
+    map = gurka::buildtiles(layout, ways, nodes, {}, "test/data/ForkTest", {});
+    reader = test::make_clean_graphreader(map.config.get_child("mjolnir"));
+  }
+};
+
+std::shared_ptr<baldr::GraphReader> ForkTest2::reader;
+gurka::map ForkTest2::map = {};
+
+//------------------------------------------------------------------
+TEST_F(ForkTest2, test) {
+  auto result = gurka::do_action(valhalla::Options::route, map, {"A", "F"}, "auto");
+
+  // TODO: since the "ramp" goes straight, announce the "stay right"
+  for (const auto& leg : result.directions().routes(0).legs()) {
+    for (const auto& maneuver : leg.maneuver()) {
+      std::cout << maneuver.text_instruction() << "\n";
+    }
+  }
+}