organicmaps/geocore
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[generator:locidx-building] Speedup: skip middle points

Browse source
This commit is contained in:
Anatoly Serdtcev 2019-12-16 12:57:30 +03:00 • committed by LaGrunge
parent d5f93204b2
commit 5ebb0ca11a
3 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
generator/locality_sorter.cpp
View file

@ -194,7 +194,6 @@ bool ParseNodes(string nodesFile, set<uint64_t> & nodeIds)
using NeedSerialize = function<bool(FeatureBuilder & fb1)>;
bool GenerateLocalityDataImpl(FeaturesCollector & collector,
CalculateMidPoints::MinDrawableScalePolicy const & minDrawableScalePolicy,
NeedSerialize const & needSerialize,
string const & featuresFile)
{
@ -203,24 +202,10 @@ bool GenerateLocalityDataImpl(FeaturesCollector & collector,
{
LOG(LINFO, ("Processing", featuresFile));
CalculateMidPoints midPoints{minDrawableScalePolicy};
ForEachFromDatRawFormat(featuresFile, midPoints);
// Sort features by their middle point.
midPoints.Sort();
FileReader reader(featuresFile);
for (auto const & point : midPoints.GetVector())
{
ReaderSource<FileReader> src(reader);
src.Skip(point.second);
FeatureBuilder f;
ReadFromSourceRawFormat(src, f);
// Emit object.
if (needSerialize(f))
collector.Collect(f);
}
ForEachFromDatRawFormat(featuresFile, [&](FeatureBuilder & fb, uint64_t /* currPos */) {
if (needSerialize(fb))
collector.Collect(fb);
});
collector.Finish();
}
@ -247,7 +232,6 @@ bool GenerateGeoObjectsData(string const & toDataFile, string const & featuresFi
static_cast<uint32_t>(base::SecondsSinceEpoch()));
return GenerateLocalityDataImpl(
localityCollector,
static_cast<int (*)(TypesHolder const & types, m2::RectD limitRect)>(GetMinDrawableScale),
needSerialize, featuresFile);
}
@ -302,15 +286,13 @@ bool GenerateRegionsData(std::string const & toDataFile, string const & features
LocalityCollector regionsCollector(toDataFile, header,
static_cast<uint32_t>(base::SecondsSinceEpoch()));
auto const needSerialize = [](FeatureBuilder const & fb) { return fb.IsArea(); };
return GenerateLocalityDataImpl(regionsCollector, GetMinDrawableScaleGeometryOnly,
needSerialize, featuresFile);
return GenerateLocalityDataImpl(regionsCollector, needSerialize, featuresFile);
}
bool GenerateBorders(std::string const & toDataFile, string const & featuresFile)
{
BordersCollector bordersCollector(toDataFile);
auto const needSerialize = [](FeatureBuilder const & fb) { return fb.IsArea(); };
return GenerateLocalityDataImpl(bordersCollector, GetMinDrawableScaleGeometryOnly,
needSerialize, featuresFile);
return GenerateLocalityDataImpl(bordersCollector, needSerialize, featuresFile);
}
} // namespace feature

13
indexer/feature_visibility.cpp
View file

@ -408,19 +408,6 @@ int GetMinDrawableScale(TypesHolder const & types, m2::RectD limitRect)
return -1;
}
int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect)
{
int const upBound = scales::GetUpperStyleScale();
for (int level = 0; level <= upBound; ++level)
{
if (IsDrawableForIndexGeometryOnly(types, limitRect, level))
return level;
}
return -1;
}
int GetMinDrawableScaleClassifOnly(TypesHolder const & types)
{
int const upBound = scales::GetUpperStyleScale();

1
indexer/feature_visibility.hpp
View file

@ -42,7 +42,6 @@ namespace feature
int GetMinDrawableScale(FeatureType & ft);
int GetMinDrawableScale(TypesHolder const & types, m2::RectD limitRect);
int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect);
int GetMinDrawableScaleClassifOnly(TypesHolder const & types);
/// @return [-1, -1] if range is not drawable