Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'generator/search_index_builder.cpp')
-rw-r--r--generator/search_index_builder.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index 5556d8d586..46c7c54dbb 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -318,7 +318,8 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer)
Index mwmIndex;
/// @ todo Make some better solution, or legalize MakeTemporary.
- mwmIndex.RegisterMap(platform::LocalCountryFile::MakeTemporary(container.GetFileName()));
+ auto const mwmId = mwmIndex.RegisterMap(platform::LocalCountryFile::MakeTemporary(container.GetFileName()));
+ ASSERT_EQUAL(mwmId.second, MwmSet::RegResult::Success, ());
search::ReverseGeocoder rgc(mwmIndex);
{
@@ -338,10 +339,11 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer)
{
FeatureType ft;
features.GetVector().GetByIndex(index, ft);
+ ft.SetID(FeatureID(mwmId.first, index));
using TStreet = search::ReverseGeocoder::Street;
vector<TStreet> streets;
- rgc.GetNearbyStreets(feature::GetCenter(ft), streets);
+ rgc.GetNearbyStreets(ft, streets);
streetIndex = rgc.GetMatchedStreetIndex(street, streets);
if (streetIndex < streets.size())