mnalis/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-10 21:59:13 +03:00 • committed by Sergey Yershov
parent 96a30087d3
commit 4b893fbe6a
13 changed files with 54 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/mwm_traits.cpp
View file

@ -10,11 +10,7 @@ MwmTraits::SearchIndexFormat MwmTraits::GetSearchIndexFormat() const
{
if (m_versionFormat < version::v7)
return SearchIndexFormat::FeaturesWithRankAndCenter;
if (m_versionFormat == version::v7)
return SearchIndexFormat::CompressedBitVector;
LOG(LWARNING, ("Unknown search index format."));
return SearchIndexFormat::Unknown;
return SearchIndexFormat::CompressedBitVector;
}
MwmTraits::HouseToStreetTableFormat MwmTraits::GetHouseToStreetTableFormat() const
@ -32,8 +28,6 @@ string DebugPrint(MwmTraits::SearchIndexFormat format)
return "FeaturesWithRankAndCenter";
case MwmTraits::SearchIndexFormat::CompressedBitVector:
return "CompressedBitVector";
case MwmTraits::SearchIndexFormat::Unknown:
return "Unknown";
}
}

4
search/mwm_traits.hpp
View file

@ -22,10 +22,6 @@ public:
// stored behind every node of the search trie.
// This format corresponds to ValueList<FeatureIndexValue>.
CompressedBitVector,
// The format of the search index is unknown. Most
// likely, an error has occured.
Unknown
};
enum class HouseToStreetTableFormat

26
search/projection_on_street.cpp
View file

@ -21,18 +21,20 @@ ProjectionOnStreetCalculator::ProjectionOnStreetCalculator(vector<m2::PointD> co
double maxDistMeters)
: m_points(points), m_maxDistMeters(maxDistMeters)
{
if (m_points.empty())
return;
Init();
}
m_segProjs.resize(m_points.size() - 1);
for (size_t i = 0; i + 1 != m_points.size(); ++i)
m_segProjs[i].SetBounds(m_points[i], m_points[i + 1]);
ProjectionOnStreetCalculator::ProjectionOnStreetCalculator(vector<m2::PointD> && points,
double maxDistMeters)
: m_points(move(points)), m_maxDistMeters(maxDistMeters)
{
Init();
}
bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
ProjectionOnStreet & proj)
ProjectionOnStreet & proj) const
{
static size_t const kInvalidIndex = m_points.size();
size_t const kInvalidIndex = m_segProjs.size();
m2::PointD bestProj;
size_t bestIndex = kInvalidIndex;
@ -59,4 +61,14 @@ bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
proj.m_projSign = m2::GetOrientation(m_points[bestIndex], m_points[bestIndex + 1], point);
return true;
}
void ProjectionOnStreetCalculator::Init()
{
if (m_points.empty())
return;
m_segProjs.resize(m_points.size() - 1);
for (size_t i = 0; i + 1 != m_points.size(); ++i)
m_segProjs[i].SetBounds(m_points[i], m_points[i + 1]);
}
} // namespace search

7
search/projection_on_street.hpp
View file

@ -32,15 +32,18 @@ public:
static int constexpr kDefaultMaxDistMeters = 200;
ProjectionOnStreetCalculator(vector<m2::PointD> const & points, double maxDistMeters);
ProjectionOnStreetCalculator(vector<m2::PointD> && points, double maxDistMeters);
// Finds nearest point on the street to the |point|. If such point
// is located within |m_maxDistMeters|, stores projection in |proj|
// and returns true. Otherwise, returns false and does not modify
// |proj|.
bool GetProjection(m2::PointD const & point, ProjectionOnStreet & proj);
bool GetProjection(m2::PointD const & point, ProjectionOnStreet & proj) const;
private:
vector<m2::PointD> const & m_points;
void Init();
vector<m2::PointD> const m_points;
vector<m2::ProjectionToSection<m2::PointD>> m_segProjs;
double const m_maxDistMeters;
};

6
search/search_integration_tests/search_query_v2_test.cpp
View file

@ -82,7 +82,7 @@ UNIT_TEST(SearchQueryV2_Smoke)
"1 unit 1", *feynmanStreet, "en");
auto const bohrHouse =
make_shared<TestBuilding>(m2::PointD(10, 10), "Bohr house", "1 unit 1", *bohrStreet, "en");
auto const gilbertHouse = make_shared<TestBuilding>(m2::PointD(10.0005, 10.0005), "Gilbert house",
auto const hilbertHouse = make_shared<TestBuilding>(m2::PointD(10.0005, 10.0005), "Hilbert house",
"1 unit 2", *bohrStreet, "en");
{
@ -97,7 +97,7 @@ UNIT_TEST(SearchQueryV2_Smoke)
builder.Add(*bohrStreet);
builder.Add(*feynmanHouse);
builder.Add(*bohrHouse);
builder.Add(*gilbertHouse);
builder.Add(*hilbertHouse);
}
auto const regResult = engine.RegisterMap(map);
@ -158,7 +158,7 @@ UNIT_TEST(SearchQueryV2_Smoke)
request.Wait();
vector<shared_ptr<MatchingRule>> rules = {
make_shared<ExactMatch>(regResult.first, bohrHouse),
make_shared<ExactMatch>(regResult.first, gilbertHouse)};
make_shared<ExactMatch>(regResult.first, hilbertHouse)};
TEST(MatchResults(engine, rules, request.Results()), ());
}

4
search/search_tests_support/test_feature.cpp
View file

@ -88,7 +88,7 @@ void TestStreet::Serialize(FeatureBuilder1 & fb) const
{
CHECK(fb.AddName(m_lang, m_name), ("Can't set feature name:", m_name, "(", m_lang, ")"));
if (m_lang != "default")
CHECK(fb.AddName("default", m_name), ("Can't set feature name:", m_name, "( default "));
CHECK(fb.AddName("default", m_name), ("Can't set feature name:", m_name, "( default )"));
auto const & classificator = classif();
fb.SetType(classificator.GetTypeByPath({"highway", "living_street"}));
@ -136,7 +136,7 @@ void TestBuilding::Serialize(FeatureBuilder1 & fb) const
bool TestBuilding::Matches(FeatureType const & feature) const
{
static ftypes::IsBuildingChecker const & checker = ftypes::IsBuildingChecker::Instance();
auto const & checker = ftypes::IsBuildingChecker::Instance();
if (!checker(feature))
return false;
return TestFeature::Matches(feature) && m_houseNumber == feature.GetHouseNumber();

10
search/v2/features_layer_path_finder.cpp
View file

@ -8,12 +8,8 @@ namespace search
{
namespace v2
{
FeaturesLayerPathFinder::FeaturesLayerPathFinder(FeaturesLayerMatcher & matcher)
: m_matcher(matcher)
{
}
void FeaturesLayerPathFinder::BuildGraph(vector<FeaturesLayer *> const & layers)
void FeaturesLayerPathFinder::BuildGraph(FeaturesLayerMatcher & matcher,
vector<FeaturesLayer *> const & layers)
{
m_graph.clear();
@ -30,7 +26,7 @@ void FeaturesLayerPathFinder::BuildGraph(vector<FeaturesLayer *> const & layers)
{
m_graph[to].push_back(from);
};
m_matcher.Match(child, parent, addEdges);
matcher.Match(child, parent, addEdges);
}
}

10
search/v2/features_layer_path_finder.hpp
View file

@ -21,15 +21,14 @@ public:
using TAdjList = vector<uint32_t>;
using TLayerGraph = unordered_map<uint32_t, TAdjList>;
FeaturesLayerPathFinder(FeaturesLayerMatcher & matcher);
template <typename TFn>
void ForEachReachableVertex(vector<FeaturesLayer *> const & layers, TFn && fn)
void ForEachReachableVertex(FeaturesLayerMatcher & matcher,
vector<FeaturesLayer *> const & layers, TFn && fn)
{
if (layers.empty())
return;
BuildGraph(layers);
BuildGraph(matcher, layers);
m_visited.clear();
for (uint32_t featureId : (*layers.back()).m_sortedFeatures)
@ -43,11 +42,10 @@ public:
}
private:
void BuildGraph(vector<FeaturesLayer *> const & layers);
void BuildGraph(FeaturesLayerMatcher & matcher, vector<FeaturesLayer *> const & layers);
void Dfs(uint32_t u);
FeaturesLayerMatcher & m_matcher;
TLayerGraph m_graph;
unordered_set<uint32_t> m_visited;
};

5
search/v2/geocoder.cpp
View file

@ -2,7 +2,6 @@
#include "search/retrieval.hpp"
#include "search/v2/features_layer_matcher.hpp"
#include "search/v2/features_layer_path_finder.hpp"
#include "search/search_delimiters.hpp"
#include "search/search_string_utils.hpp"
@ -99,7 +98,6 @@ void Geocoder::Go(vector<FeatureID> & results)
MY_SCOPE_GUARD(cleanup, [&]()
{
m_finder.reset();
m_matcher.reset();
m_loader.reset();
m_cache.clear();
@ -109,7 +107,6 @@ void Geocoder::Go(vector<FeatureID> & results)
m_loader.reset(new Index::FeaturesLoaderGuard(m_index, m_mwmId));
m_matcher.reset(
new FeaturesLayerMatcher(m_index, m_mwmId, *m_value, m_loader->GetFeaturesVector()));
m_finder.reset(new FeaturesLayerPathFinder(*m_matcher));
DoGeocoding(0 /* curToken */);
}
@ -269,7 +266,7 @@ void Geocoder::FindPaths()
sortedLayers.push_back(&layer);
sort(sortedLayers.begin(), sortedLayers.end(), compareByType);
m_finder->ForEachReachableVertex(sortedLayers, [this](uint32_t featureId)
m_finder.ForEachReachableVertex(*m_matcher, sortedLayers, [this](uint32_t featureId)
{
m_results->emplace_back(m_mwmId, featureId);
});

4
search/v2/geocoder.hpp
View file

@ -2,6 +2,7 @@
#include "search/search_query_params.hpp"
#include "search/v2/features_layer.hpp"
#include "search/v2/features_layer_path_finder.hpp"
#include "search/v2/search_model.hpp"
#include "indexer/mwm_set.hpp"
@ -35,7 +36,6 @@ class RankTable;
namespace v2
{
class FeaturesLayerMatcher;
class FeaturesLayerPathFinder;
class SearchModel;
// This class is used to retrieve all features corresponding to a
@ -122,7 +122,7 @@ private:
unique_ptr<FeaturesLayerMatcher> m_matcher;
// Path finder for interpretations.
unique_ptr<FeaturesLayerPathFinder> m_finder;
FeaturesLayerPathFinder m_finder;
// Search query params prepared for retrieval.
SearchQueryParams m_retrievalParams;

5
search/v2/house_to_street_table.hpp
View file

@ -16,9 +16,8 @@ public:
static unique_ptr<HouseToStreetTable> Load(MwmValue & value);
// Returns an order number for a street corresponding to |houseId|.
// The order number is an index of a street in a list returned
// by ReverseGeocoder::GetNearbyStreets().
// Returns an index number of a correct street corresponding to a
// house in a list of streets generated by ReverseGeocoder.
virtual uint32_t Get(uint32_t houseId) const = 0;
};
} // namespace v2

10
search/v2/street_vicinity_loader.cpp
View file

@ -6,6 +6,8 @@
#include "geometry/mercator.hpp"
#include "geometry/point2d.hpp"
#include "base/math.hpp"
#include "base/stl_add.hpp"
@ -39,9 +41,10 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
if (feature.GetFeatureType() != feature::GEOM_LINE)
return;
feature.ForEachPoint(MakeBackInsertFunctor(street.m_points), FeatureType::BEST_GEOMETRY);
vector<m2::PointD> points;
feature.ForEachPoint(MakeBackInsertFunctor(points), FeatureType::BEST_GEOMETRY);
for (auto const & point : street.m_points)
for (auto const & point : points)
street.m_rect.Add(MercatorBounds::RectByCenterXYAndSizeInMeters(point, m_offsetMeters));
covering::CoveringGetter coveringGetter(street.m_rect, covering::ViewportWithLowLevels);
@ -49,5 +52,8 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
for (auto const & interval : intervals)
m_index.ForEachInIntervalAndScale(MakeBackInsertFunctor(street.m_features), interval.first,
interval.second, m_scale);
if (!points.empty())
street.m_calculator = make_unique<ProjectionOnStreetCalculator>(move(points), m_offsetMeters);
}
} // namespace search

10
search/v2/street_vicinity_loader.hpp
View file

@ -27,11 +27,11 @@ public:
Street() = default;
Street(Street && street) = default;
inline bool IsEmpty() const { return m_points.empty() || m_rect.IsEmptyInterior(); }
inline bool IsEmpty() const { return !m_calculator || m_rect.IsEmptyInterior(); }
vector<m2::PointD> m_points;
vector<uint32_t> m_features;
m2::RectD m_rect;
unique_ptr<ProjectionOnStreetCalculator> m_calculator;
DISALLOW_COPY(Street);
};
@ -48,9 +48,8 @@ public:
if (street.IsEmpty())
return;
ProjectionOnStreetCalculator calculator(street.m_points, m_offsetMeters);
ProjectionOnStreetCalculator const & calculator = *street.m_calculator;
ProjectionOnStreet proj;
for (uint32_t id : street.m_features)
{
// Load center and check projection only when |id| is in |sortedIds|.
@ -73,9 +72,8 @@ public:
if (street.IsEmpty())
return;
ProjectionOnStreetCalculator calculator(street.m_points, m_offsetMeters);
ProjectionOnStreetCalculator const & calculator = *street.m_calculator;
ProjectionOnStreet proj;
for (uint32_t id : street.m_features)
{
FeatureType ft;