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

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-01-19 14:38:43 +03:00 • committed by Sergey Yershov
parent d9da3fe518
commit cb1101c118
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generator/search_index_builder.cpp
View file

@ -349,17 +349,16 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer)
++bounds[streetIndex];
streetMatched = true;
}
else
{
++missing;
}
++address;
}
if (streetMatched)
{
building2Street.PushBack(streetIndex);
}
else
{
building2Street.PushBackUndefined();
++missing;
}
}
LOG(LINFO, ("Address: Building -> Street (opt, all)", building2Street.GetCount()));

5
search/reverse_geocoder.cpp
View file

@ -115,8 +115,9 @@ void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, Address & addr
uint32_t ind;
// False result of table->Get(...) means that there're no street
// for a building. Somehow it should be used in a Features Editor.
// TODO (AlexZ): False result of table->Get(...) means that
// there're no street for a building. Somehow it should be used
// in a Features Editor.
if (table->Get(b.m_id.m_index, ind) && ind < streets.size())
{
addr.m_building = b;

2
search/v2/features_layer_matcher.cpp
View file

@ -75,7 +75,7 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreetImpl(uint32_t houseId, FeatureTy
uint32_t streetId = kInvalidId;
uint32_t streetIndex;
if (!m_houseToStreetTable->Get(houseId, streetIndex))
streetIndex = streets.size();;
streetIndex = streets.size();
if (streetIndex < streets.size() && streets[streetIndex].m_id.m_mwmId == m_context.m_id)
streetId = streets[streetIndex].m_id.m_index;

6
search/v2/house_to_street_table.hpp
View file

@ -18,9 +18,9 @@ public:
/// It's better to construct a table from MwmHandle.
static unique_ptr<HouseToStreetTable> Load(MwmValue & value);
// Returns true and stores to |streetIndex| an index number of a
// correct street corresponding to a house in a list of streets
// generated by ReverseGeocoder. Returns false if there're no such
// Returns true and stores to |streetIndex| the index number of the
// correct street corresponding to the house in the list of streets
// generated by ReverseGeocoder. Returns false if there is no such
// street.
virtual bool Get(uint32_t houseId, uint32_t & streetIndex) const = 0;
};