From 4950e044bac12529df858a96a1f73523f26390ad Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Wed, 9 Dec 2015 23:01:28 +0100 Subject: [PATCH] Remove warnings and fix tests --- .../data_structures/internal_datafacade.hpp | 2 +- server/data_structures/shared_datafacade.hpp | 2 +- unit_tests/data_structures/static_rtree.cpp | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/data_structures/internal_datafacade.hpp b/server/data_structures/internal_datafacade.hpp index f16c2585a..7bd614ff0 100644 --- a/server/data_structures/internal_datafacade.hpp +++ b/server/data_structures/internal_datafacade.hpp @@ -393,7 +393,7 @@ template class InternalDataFacade final : public BaseDataFacad std::pair NearestPhantomNodeWithAlternativeFromBigComponent(const FixedPointCoordinate &input_coordinate, const int bearing = 0, - const int bearing_range = 180) + const int bearing_range = 180) override final { if (!m_static_rtree.get()) { diff --git a/server/data_structures/shared_datafacade.hpp b/server/data_structures/shared_datafacade.hpp index 851ed249d..024a8948f 100644 --- a/server/data_structures/shared_datafacade.hpp +++ b/server/data_structures/shared_datafacade.hpp @@ -417,7 +417,7 @@ template class SharedDataFacade final : public BaseDataFacade< std::pair NearestPhantomNodeWithAlternativeFromBigComponent(const FixedPointCoordinate &input_coordinate, const int bearing = 0, - const int bearing_range = 180) + const int bearing_range = 180) override final { if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first) { diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/data_structures/static_rtree.cpp index 373824a5f..2539d5ffb 100644 --- a/unit_tests/data_structures/static_rtree.cpp +++ b/unit_tests/data_structures/static_rtree.cpp @@ -439,8 +439,8 @@ BOOST_AUTO_TEST_CASE(bearing_tests) { auto results = query.NearestPhantomNodes(input, 5); BOOST_CHECK_EQUAL(results.size(), 2); - BOOST_CHECK_EQUAL(results.back().second.forward_node_id, 0); - BOOST_CHECK_EQUAL(results.back().second.reverse_node_id, 1); + BOOST_CHECK_EQUAL(results.back().phantom_node.forward_node_id, 0); + BOOST_CHECK_EQUAL(results.back().phantom_node.reverse_node_id, 1); } { @@ -451,10 +451,10 @@ BOOST_AUTO_TEST_CASE(bearing_tests) { auto results = query.NearestPhantomNodes(input, 5, 45, 10); BOOST_CHECK_EQUAL(results.size(), 2); - BOOST_CHECK_EQUAL(results[0].second.forward_node_id, 1); - BOOST_CHECK_EQUAL(results[0].second.reverse_node_id, SPECIAL_NODEID); - BOOST_CHECK_EQUAL(results[1].second.forward_node_id, SPECIAL_NODEID); - BOOST_CHECK_EQUAL(results[1].second.reverse_node_id, 1); + BOOST_CHECK_EQUAL(results[0].phantom_node.forward_node_id, 1); + BOOST_CHECK_EQUAL(results[0].phantom_node.reverse_node_id, SPECIAL_NODEID); + BOOST_CHECK_EQUAL(results[1].phantom_node.forward_node_id, SPECIAL_NODEID); + BOOST_CHECK_EQUAL(results[1].phantom_node.reverse_node_id, 1); } { @@ -470,10 +470,10 @@ BOOST_AUTO_TEST_CASE(bearing_tests) { auto results = query.NearestPhantomNodesInRange(input, 11000, 45, 10); BOOST_CHECK_EQUAL(results.size(), 2); - BOOST_CHECK_EQUAL(results[0].second.forward_node_id, 1); - BOOST_CHECK_EQUAL(results[0].second.reverse_node_id, SPECIAL_NODEID); - BOOST_CHECK_EQUAL(results[1].second.forward_node_id, SPECIAL_NODEID); - BOOST_CHECK_EQUAL(results[1].second.reverse_node_id, 1); + BOOST_CHECK_EQUAL(results[0].phantom_node.forward_node_id, 1); + BOOST_CHECK_EQUAL(results[0].phantom_node.reverse_node_id, SPECIAL_NODEID); + BOOST_CHECK_EQUAL(results[1].phantom_node.forward_node_id, SPECIAL_NODEID); + BOOST_CHECK_EQUAL(results[1].phantom_node.reverse_node_id, 1); } }