From c11fe501509419e63627da9921b9586812c92680 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Thu, 6 Oct 2016 13:53:18 +0300 Subject: Review fixes. --- search/locality_finder.cpp | 2 +- search/search_tests/locality_selector_test.cpp | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'search') diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp index 0d57b99e8f..c890636617 100644 --- a/search/locality_finder.cpp +++ b/search/locality_finder.cpp @@ -5,8 +5,8 @@ #include "search/dummy_rank_table.hpp" #include "search/mwm_context.hpp" -#include "indexer/ftypes_matcher.hpp" #include "indexer/feature_algo.hpp" +#include "indexer/ftypes_matcher.hpp" #include "indexer/index.hpp" #include "base/assert.hpp" diff --git a/search/search_tests/locality_selector_test.cpp b/search/search_tests/locality_selector_test.cpp index 99b6165341..29cf8d6270 100644 --- a/search/search_tests/locality_selector_test.cpp +++ b/search/search_tests/locality_selector_test.cpp @@ -21,31 +21,31 @@ string GetMatchedCity(m2::PointD const & point, vector const & ite // UNIT_TEST(LocalitySelector_Test1) // { // auto const name = GetMatchedCity( -// m2::PointD(-97.563458662952925238, 26.796728721236661386), -// {{"Matamoros", m2::PointD(-97.506656349498797454, 26.797180986068354969), 10000}, +// m2::PointD(-97.56345, 26.79672), +// {{"Matamoros", m2::PointD(-97.50665, 26.79718), 10000}, -// {"Brownsville", m2::PointD(-97.489103971612919963, 26.845589500139880101), 180663}}); +// {"Brownsville", m2::PointD(-97.48910, 26.84558), 180663}}); // TEST_EQUAL(name, "Matamoros", ()); // } UNIT_TEST(LocalitySelector_Test2) { vector const localities = { - {"Moscow", m2::PointD(37.617513849438893203, 67.45398133444564337), 11971516}, - {"Krasnogorsk", m2::PointD(37.340409438658895169, 67.58036703829372982), 135735}, - {"Khimki", m2::PointD(37.444994145035053634, 67.700701677882875629), 240463}, - {"Mytishchi", m2::PointD(37.733943192236807818, 67.736750571340394345), 180663}, - {"Dolgoprudny", m2::PointD(37.514259518892714595, 67.780738804428438016), 101979}}; + {"Moscow", m2::PointD(37.61751, 67.45398), 11971516}, + {"Krasnogorsk", m2::PointD(37.34040, 67.58036), 135735}, + {"Khimki", m2::PointD(37.44499, 67.70070), 240463}, + {"Mytishchi", m2::PointD(37.73394, 67.73675), 180663}, + {"Dolgoprudny", m2::PointD(37.51425, 67.78073), 101979}}; { auto const name = - GetMatchedCity(m2::PointD(37.538269143836714647, 67.535546478148901883), localities); + GetMatchedCity(m2::PointD(37.53826, 67.53554), localities); TEST_EQUAL(name, "Moscow", ()); } { auto const name = - GetMatchedCity(m2::PointD(37.469807099326018829, 67.666502652067720192), localities); + GetMatchedCity(m2::PointD(37.46980, 67.66650), localities); TEST_EQUAL(name, "Khimki", ()); } } -- cgit v1.2.3