From a32f8a6a59b4655299cd13c025e80e5b1c0e3c1c Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 2 Mar 2017 14:45:42 +0000 Subject: [PATCH] Fix two typos in tile code --- src/engine/plugins/tile.cpp | 4 ++-- unit_tests/library/tile.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/engine/plugins/tile.cpp b/src/engine/plugins/tile.cpp index f99281ef3..b1a4cc0f7 100644 --- a/src/engine/plugins/tile.cpp +++ b/src/engine/plugins/tile.cpp @@ -748,7 +748,7 @@ Status TilePlugin::HandleRequest(const datafacade::ContiguousInternalMemoryDataF { BOOST_ASSERT(parameters.IsValid()); - auto edges = getEdges(facade, parameters.x, parameters.y, parameters.y); + auto edges = getEdges(facade, parameters.x, parameters.y, parameters.z); auto edge_index = getEdgeIndex(edges); @@ -762,7 +762,7 @@ Status TilePlugin::HandleRequest(const datafacade::ContiguousInternalMemoryDataF } encodeVectorTile( - facade, parameters.x, parameters.y, parameters.y, edges, edge_index, turns, pbf_buffer); + facade, parameters.x, parameters.y, parameters.z, edges, edge_index, turns, pbf_buffer); return Status::Ok; } diff --git a/unit_tests/library/tile.cpp b/unit_tests/library/tile.cpp index 91e8c8fa0..e58452f2f 100644 --- a/unit_tests/library/tile.cpp +++ b/unit_tests/library/tile.cpp @@ -16,6 +16,9 @@ #include +#define CHECK_EQUAL_RANGE(R1, R2) \ + BOOST_CHECK_EQUAL_COLLECTIONS(R1.begin(), R1.end(), R2.begin(), R2.end()); + BOOST_AUTO_TEST_SUITE(tile) BOOST_AUTO_TEST_CASE(test_tile) @@ -331,7 +334,7 @@ BOOST_AUTO_TEST_CASE(test_tile_turns) std::sort(actual_turn_penalties.begin(), actual_turn_penalties.end()); const std::vector expected_turn_penalties = { 0, 0, 0, 0, 0, 0, .1f, .1f, .3f, .4f, 1.2f, 1.9f, 5.3f, 5.5f, 5.8f, 7.1f, 7.2f, 7.2f}; - BOOST_CHECK(actual_turn_penalties == expected_turn_penalties); + CHECK_EQUAL_RANGE(actual_turn_penalties, expected_turn_penalties); // Verify the expected turn angles std::vector actual_turn_angles; @@ -343,7 +346,7 @@ BOOST_AUTO_TEST_CASE(test_tile_turns) std::sort(actual_turn_angles.begin(), actual_turn_angles.end()); const std::vector expected_turn_angles = { -122, -120, -117, -65, -57, -30, -28, -3, -2, 2, 3, 28, 30, 57, 65, 117, 120, 122}; - BOOST_CHECK(actual_turn_angles == expected_turn_angles); + CHECK_EQUAL_RANGE(actual_turn_angles, expected_turn_angles); // Verify the expected bearings std::vector actual_turn_bearings; @@ -355,7 +358,7 @@ BOOST_AUTO_TEST_CASE(test_tile_turns) std::sort(actual_turn_bearings.begin(), actual_turn_bearings.end()); const std::vector expected_turn_bearings = { 49, 49, 107, 107, 169, 169, 171, 171, 229, 229, 257, 257, 286, 286, 349, 349, 352, 352}; - BOOST_CHECK(actual_turn_bearings == expected_turn_bearings); + CHECK_EQUAL_RANGE(actual_turn_bearings, expected_turn_bearings); } BOOST_AUTO_TEST_CASE(test_tile_speeds)