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

[search] Removed wrong and faulty cache.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-03-14 18:35:53 +03:00 • committed by Sergey Yershov
parent 61f4995deb
commit 2d12eafb5b
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
search/v2/features_layer_matcher.cpp
View file

@ -1,6 +1,7 @@
#include "search/v2/features_layer_matcher.hpp"
#include "search/reverse_geocoder.hpp"
#include "search/v2/house_to_street_table.hpp"
#include "indexer/scales.hpp"
@ -32,8 +33,6 @@ void FeaturesLayerMatcher::SetContext(MwmContext * context)
return;
m_context = context;
m_houseToStreetTable = HouseToStreetTable::Load(m_context->m_value);
ASSERT(m_houseToStreetTable, ());
m_loader.SetContext(context);
}
@ -121,10 +120,10 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreetImpl(uint32_t houseId, FeatureTy
if (ret != streets.end())
result = ret->m_id.m_index;
}
else
else if (m_context->m_houseToStreetTable)
{
uint32_t index;
if (m_houseToStreetTable->Get(houseId, index) && index < streets.size())
if (m_context->m_houseToStreetTable->Get(houseId, index) && index < streets.size())
result = streets[index].m_id.m_index;
}

3
search/v2/features_layer_matcher.hpp
View file

@ -4,7 +4,6 @@
#include "search/reverse_geocoder.hpp"
#include "search/v2/features_layer.hpp"
#include "search/v2/house_numbers_matcher.hpp"
#include "search/v2/house_to_street_table.hpp"
#include "search/v2/mwm_context.hpp"
#include "search/v2/search_model.hpp"
#include "search/v2/street_vicinity_loader.hpp"
@ -356,8 +355,6 @@ private:
// located on multiple streets.
Cache<uint32_t, uint32_t> m_matchingStreetsCache;
unique_ptr<HouseToStreetTable> m_houseToStreetTable;
StreetVicinityLoader m_loader;
my::Cancellable const & m_cancellable;
};

2
search/v2/mwm_context.cpp
View file

@ -18,7 +18,9 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle)
, m_value(*m_handle.GetValue<MwmValue>())
, m_vector(m_value.m_cont, m_value.GetHeader(), m_value.m_table)
, m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG), m_value.m_factory)
, m_houseToStreetTable(HouseToStreetTable::Load(m_value))
{
ASSERT(m_houseToStreetTable, ());
}
bool MwmContext::GetFeature(uint32_t index, FeatureType & ft) const

5
search/v2/mwm_context.hpp
View file

@ -1,11 +1,15 @@
#pragma once
#include "search/v2/house_to_street_table.hpp"
#include "indexer/features_vector.hpp"
#include "indexer/index.hpp"
#include "indexer/scale_index.hpp"
#include "base/macros.hpp"
#include "std/unique_ptr.hpp"
class MwmValue;
namespace search
@ -25,6 +29,7 @@ struct MwmContext
MwmValue & m_value;
FeaturesVector m_vector;
ScaleIndex<ModelReaderPtr> m_index;
unique_ptr<HouseToStreetTable> m_houseToStreetTable;
inline MwmSet::MwmId const & GetId() const { return m_handle.GetId(); }
inline string const & GetName() const { return GetInfo()->GetCountryName(); }