Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix heading on small edge #3114

Merged
merged 5 commits into from
May 28, 2021
Merged

Fix heading on small edge #3114

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4350115
Updated logic to handle small edges with no heading set
dgearhart May 27, 2021
b07340a
Added new tests
dgearhart May 27, 2021
16414e5
Added gurka test
dgearhart May 28, 2021
a593f11
Merge branch 'master' of https://github.com/valhalla/valhalla into be…
dgearhart May 28, 2021
0048f3d
Updated changelog for 3114
dgearhart May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added gurka test
  • Loading branch information
@dgearhart
dgearhart committed May 28, 2021
commit 16414e547977cfcea1d5f1be0b781f97d7c529d3
64 changes: 64 additions & 0 deletions test/gurka/test_instructions_small_edge_heading.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#include "gurka.h"
#include <gtest/gtest.h>

#if !defined(VALHALLA_SOURCE_DIR)
#define VALHALLA_SOURCE_DIR
#endif

using namespace valhalla;

//#############################################################################
class InstructionsSmallEdgeHeading : public ::testing::Test {
protected:
static gurka::map map;

static void SetUpTestSuite() {
constexpr double gridsize_metres = 1;

const std::string ascii_map = R"(
C------------------------------B------------------------------A
F------------------------------E------------------------------D
/
|
|
|
|
G
)";

const gurka::ways ways =
{{"AB", {{"highway", "residential"}, {"name", "Perczel Miklós utca"}, {"oneway", "yes"}}},
{"BC", {{"highway", "residential"}, {"name", "Perczel Miklós utca"}, {"oneway", "yes"}}},
{"DE", {{"highway", "footway"}, {"name", ""}}},
{"EF", {{"highway", "footway"}, {"name", ""}}},
{"BE", {{"highway", "residential"}, {"name", "Boltív köz"}}},
{"EG", {{"highway", "residential"}, {"name", "Boltív köz"}}}};

const auto layout =
gurka::detail::map_to_coordinates(ascii_map, gridsize_metres, {5.1079374, 52.0887174});

map = gurka::buildtiles(layout, ways, {}, {}, "test/data/gurka_instructions_small_edge_heading",
{{"mjolnir.admin",
{VALHALLA_SOURCE_DIR "test/data/netherlands_admin.sqlite"}}});
}
};

gurka::map InstructionsSmallEdgeHeading::map = {};

///////////////////////////////////////////////////////////////////////////////
TEST_F(InstructionsSmallEdgeHeading, LeftTurn) {
auto result = gurka::do_action(valhalla::Options::route, map, {"A", "G"}, "auto");

// Verify maneuver types
gurka::assert::raw::expect_maneuvers(result, {DirectionsLeg_Maneuver_Type_kStart,
DirectionsLeg_Maneuver_Type_kLeft,
DirectionsLeg_Maneuver_Type_kDestination});
int maneuver_index = 1;

// Verify left turn
// NOTE: old code had "Keep straight to take Boltív köz."
gurka::assert::raw::expect_instructions_at_maneuver_index(
result, maneuver_index, "Turn left onto Boltív köz.", "Turn left onto Boltív köz.",
"Turn left onto Boltív köz. Then You will arrive at your destination.",
"Continue for less than 10 meters.");
}