From e1ff17c53b8af8bbb0a42ac3aaa1406225de7d5b Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Wed, 30 Dec 2015 16:48:12 +0300 Subject: [PATCH] Review fixes. --- search/v2/features_layer_matcher.hpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/search/v2/features_layer_matcher.hpp b/search/v2/features_layer_matcher.hpp index 62905c0e6d..19a8bdd2ee 100644 --- a/search/v2/features_layer_matcher.hpp +++ b/search/v2/features_layer_matcher.hpp @@ -72,9 +72,13 @@ public: ASSERT(false, ("Invalid parent layer type:", parent.m_type)); break; case SearchModel::SEARCH_TYPE_BUILDING: + ASSERT_EQUAL(child.m_type, SearchModel::SEARCH_TYPE_POI, ()); MatchPOIsWithBuildings(child, parent, forward(fn)); break; case SearchModel::SEARCH_TYPE_STREET: + ASSERT(child.m_type == SearchModel::SEARCH_TYPE_POI || + child.m_type == SearchModel::SEARCH_TYPE_BUILDING, + ("Invalid child layer type:", child.m_type)); if (child.m_type == SearchModel::SEARCH_TYPE_POI) MatchPOIsWithStreets(child, parent, forward(fn)); else @@ -87,7 +91,7 @@ private: template void MatchPOIsWithBuildings(FeaturesLayer const & child, FeaturesLayer const & parent, TFn && fn) { - static const double kBuildingRadiusMeters = 50; + static double const kBuildingRadiusMeters = 50; ASSERT_EQUAL(child.m_type, SearchModel::SEARCH_TYPE_POI, ()); ASSERT_EQUAL(parent.m_type, SearchModel::SEARCH_TYPE_BUILDING, ()); @@ -111,8 +115,8 @@ private: for (size_t j = 0; j < child.m_sortedFeatures->size(); ++j) { - double const distM = feature::GetMinDistanceMeters(buildingFt, poiCenters[j]); - if (distM <= kBuildingRadiusMeters) + double const distMeters = feature::GetMinDistanceMeters(buildingFt, poiCenters[j]); + if (distMeters <= kBuildingRadiusMeters) { fn((*child.m_sortedFeatures)[j], (*parent.m_sortedFeatures)[i]); break;