pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2015-12-30 16:48:12 +03:00 • committed by Sergey Yershov
parent b518d1b717
commit e1ff17c53b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
search/v2/features_layer_matcher.hpp
View file

@ -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<TFn>(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<TFn>(fn));
else
@ -87,7 +91,7 @@ private:
template <typename TFn>
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;