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

[geocoder] Set cellPenaltyArea to 0 for reverse server-side geocoder indices to save exact cells

Browse source
This commit is contained in:
tatiana-yan 2018-05-23 18:56:31 +03:00 • committed by mpimenov
parent f06493a808
commit 2d8d84a2b6
5 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
indexer/feature_covering.cpp
View file

@ -150,13 +150,12 @@ vector<int64_t> CoverIntersection(FeatureIntersector<DEPTH_LEVELS> const & fIsec
}
template <int DEPTH_LEVELS>
vector<int64_t> CoverLocality(indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea)
vector<int64_t> CoverLocality(indexer::LocalityObject const & o, int cellDepth)
{
FeatureIntersector<DEPTH_LEVELS> fIsect;
o.ForEachPoint(fIsect);
o.ForEachTriangle(fIsect);
return CoverIntersection(fIsect, cellDepth, cellPenaltyArea);
return CoverIntersection(fIsect, cellDepth, 0 /* cellPenaltyArea */);
}
} // namespace
@ -169,16 +168,14 @@ vector<int64_t> CoverFeature(FeatureType const & f, int cellDepth, uint64_t cell
return CoverIntersection(fIsect, cellDepth, cellPenaltyArea);
}
vector<int64_t> CoverGeoObject(indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea)
vector<int64_t> CoverGeoObject(indexer::LocalityObject const & o, int cellDepth)
{
return CoverLocality<kGeoObjectsDepthLevels>(o, cellDepth, cellPenaltyArea);
return CoverLocality<kGeoObjectsDepthLevels>(o, cellDepth);
}
vector<int64_t> CoverRegion(indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea)
vector<int64_t> CoverRegion(indexer::LocalityObject const & o, int cellDepth)
{
return CoverLocality<kRegionsDepthLevels>(o, cellDepth, cellPenaltyArea);
return CoverLocality<kRegionsDepthLevels>(o, cellDepth);
}
void SortAndMergeIntervals(Intervals v, Intervals & res)

6
indexer/feature_covering.hpp
View file

@ -31,11 +31,9 @@ typedef std::vector<Interval> Intervals;
std::vector<int64_t> CoverFeature(FeatureType const & feature, int cellDepth,
uint64_t cellPenaltyArea);
std::vector<int64_t> CoverGeoObject(indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea);
std::vector<int64_t> CoverGeoObject(indexer::LocalityObject const & o, int cellDepth);
std::vector<int64_t> CoverRegion(indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea);
std::vector<int64_t> CoverRegion(indexer::LocalityObject const & o, int cellDepth);
// Given a vector of intervals [a, b), sort them and merge overlapping intervals.
Intervals SortAndMergeIntervals(Intervals const & intervals);

5
indexer/indexer_tests/locality_index_test.cpp
View file

@ -39,9 +39,8 @@ template <class ObjectsVector, class Writer>
void BuildGeoObjectsIndex(ObjectsVector const & objects, Writer & writer,
string const & tmpFilePrefix)
{
auto coverLocality = [](indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea) {
return covering::CoverGeoObject(o, cellDepth, cellPenaltyArea);
auto coverLocality = [](indexer::LocalityObject const & o, int cellDepth) {
return covering::CoverGeoObject(o, cellDepth);
};
return covering::BuildLocalityIndex<ObjectsVector, Writer, kGeoObjectsDepthLevels>(
objects, writer, coverLocality, tmpFilePrefix);

10
indexer/locality_index_builder.cpp
View file

@ -93,9 +93,8 @@ bool BuildLocalityIndexFromDataFile(string const & dataFile,
bool BuildGeoObjectsIndexFromDataFile(string const & dataFile, string const & outFileName)
{
auto coverObject = [](indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea) {
return covering::CoverGeoObject(o, cellDepth, cellPenaltyArea);
auto coverObject = [](indexer::LocalityObject const & o, int cellDepth) {
return covering::CoverGeoObject(o, cellDepth);
};
return BuildLocalityIndexFromDataFile<kGeoObjectsDepthLevels>(dataFile, coverObject, outFileName,
GEO_OBJECTS_INDEX_FILE_TAG);
@ -103,9 +102,8 @@ bool BuildGeoObjectsIndexFromDataFile(string const & dataFile, string const & ou
bool BuildRegionsIndexFromDataFile(string const & dataFile, string const & outFileName)
{
auto coverRegion = [](indexer::LocalityObject const & o, int cellDepth,
uint64_t cellPenaltyArea) {
return covering::CoverRegion(o, cellDepth, cellPenaltyArea);
auto coverRegion = [](indexer::LocalityObject const & o, int cellDepth) {
return covering::CoverRegion(o, cellDepth);
};
return BuildLocalityIndexFromDataFile<kRegionsDepthLevels>(dataFile, coverRegion, outFileName,
REGIONS_INDEX_FILE_TAG);

9
indexer/locality_index_builder.hpp
View file

@ -23,8 +23,8 @@
namespace covering
{
using CoverLocality = std::function<std::vector<int64_t>(indexer::LocalityObject const & o,
int cellDepth, uint64_t cellPenaltyArea)>;
using CoverLocality =
std::function<std::vector<int64_t>(indexer::LocalityObject const & o, int cellDepth)>;
template <class ObjectsVector, class Writer, int DEPTH_LEVELS>
void BuildLocalityIndex(ObjectsVector const & objects, Writer & writer,
@ -39,9 +39,8 @@ void BuildLocalityIndex(ObjectsVector const & objects, Writer & writer,
FileSorter<CellValuePair<uint64_t>, WriterFunctor<FileWriter>> sorter(
1024 * 1024 /* bufferBytes */, tmpFilePrefix + CELL2LOCALITY_TMP_EXT, out);
objects.ForEach([&sorter, &coverLocality](indexer::LocalityObject const & o) {
// @todo(t.yan): adjust cellPenaltyArea for whole world locality index.
std::vector<int64_t> const cells = coverLocality(
o, GetCodingDepth<DEPTH_LEVELS>(scales::GetUpperScale()), 250 /* cellPenaltyArea */);
std::vector<int64_t> const cells =
coverLocality(o, GetCodingDepth<DEPTH_LEVELS>(scales::GetUpperScale()));
for (auto const & cell : cells)
sorter.Add(CellValuePair<uint64_t>(cell, o.GetStoredId()));
});