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

git-clang-format

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-11-16 14:22:18 +03:00
parent ba4656b2ee
commit 672a8001c2
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
generator/generator_tests/restriction_collector_test.cpp
View file

@ -30,7 +30,8 @@ string const kRestrictionTestDir = "test-restrictions";
UNIT_TEST(RestrictionTest_ValidCase)
{
RestrictionCollector restrictionCollector("" /* restrictionPath */, "" /* osmIdsToFeatureIdsPath */);
RestrictionCollector restrictionCollector("" /* restrictionPath */,
"" /* osmIdsToFeatureIdsPath */);
// Adding feature ids.
restrictionCollector.AddFeatureId(30 /* featureId */, 3 /* osmId */);
restrictionCollector.AddFeatureId(10 /* featureId */, 1 /* osmId */);
@ -55,7 +56,8 @@ UNIT_TEST(RestrictionTest_ValidCase)
UNIT_TEST(RestrictionTest_InvalidCase)
{
RestrictionCollector restrictionCollector("" /* restrictionPath */, "" /* osmIdsToFeatureIdsPath */);
RestrictionCollector restrictionCollector("" /* restrictionPath */,
"" /* osmIdsToFeatureIdsPath */);
restrictionCollector.AddFeatureId(0 /* featureId */, 0 /* osmId */);
restrictionCollector.AddFeatureId(20 /* featureId */, 2 /* osmId */);
@ -78,7 +80,8 @@ UNIT_TEST(RestrictionTest_ParseRestrictions)
ScopedDir const scopedDir(kRestrictionTestDir);
ScopedFile const scopedFile(kRestrictionPath, kRestrictionContent);
RestrictionCollector restrictionCollector("" /* restrictionPath */, "" /* osmIdsToFeatureIdsPath */);
RestrictionCollector restrictionCollector("" /* restrictionPath */,
"" /* osmIdsToFeatureIdsPath */);
Platform const & platform = Platform();
@ -107,8 +110,8 @@ UNIT_TEST(RestrictionTest_RestrictionCollectorWholeClassTest)
30, 3,
40, 4)";
Platform const & platform = Platform();
string const osmIdsToFeatureIdsFullPath = my::JoinFoldersToPath(platform.WritableDir(),
osmIdsToFeatureIdsPath);
string const osmIdsToFeatureIdsFullPath =
my::JoinFoldersToPath(platform.WritableDir(), osmIdsToFeatureIdsPath);
ReEncodeOsmIdsToFeatureIdsMapping(kOsmIdsToFeatureIdsContent, osmIdsToFeatureIdsFullPath);
ScopedFile mappingScopedFile(osmIdsToFeatureIdsPath);

3
generator/generator_tests_support/restriction_helpers.hpp
View file

@ -12,5 +12,6 @@ namespace generator
/// 30, 3,
/// 40, 4
/// \parma outputFilePath full path to an output file where the mapping is saved.
void ReEncodeOsmIdsToFeatureIdsMapping(string const & mappingContent, string const & outputFilePath);
void ReEncodeOsmIdsToFeatureIdsMapping(string const & mappingContent,
string const & outputFilePath);
} // namespace generator

9
generator/polygonizer.hpp
View file

@ -48,9 +48,10 @@ namespace feature
#endif
public:
Polygonizer(feature::GenerateInfo const & info) : m_info(info)
Polygonizer(feature::GenerateInfo const & info)
: m_info(info)
#if PARALLEL_POLYGONIZER
, m_ThreadPoolSemaphore(m_ThreadPool.maxThreadCount() * 8)
, m_ThreadPoolSemaphore(m_ThreadPool.maxThreadCount() * 8)
#endif
{
#if PARALLEL_POLYGONIZER
@ -184,9 +185,7 @@ namespace feature
PolygonizerTask(Polygonizer * pPolygonizer,
buffer_vector<borders::CountryPolygons const *, 32> const & countries,
FeatureBuilder1 const & fb)
: m_pPolygonizer(pPolygonizer)
, m_Countries(countries)
, m_fb(fb)
: m_pPolygonizer(pPolygonizer), m_Countries(countries), m_fb(fb)
{
}

2
generator/restriction_collector.cpp
View file

@ -85,7 +85,7 @@ bool RestrictionCollector::ParseOsmIdToFeatureIdMapping(string const & osmIdsToF
return false;
}
osmIdsToFeatureIds.ForEach([this](gen::OsmID2FeatureID::ValueT const & p){
osmIdsToFeatureIds.ForEach([this](gen::OsmID2FeatureID::ValueT const & p) {
AddFeatureId(p.second /* feature id */, p.first /* osm id */);
});

4
generator/restriction_generator.cpp
View file

@ -17,8 +17,8 @@ namespace routing
bool BuildRoadRestrictions(string const & mwmPath, string const & restrictionPath,
string const & osmIdsTofeatureIdsPath)
{
LOG(LINFO,
("BuildRoadRestrictions(", mwmPath, ", ", restrictionPath, ", ", osmIdsTofeatureIdsPath, ");"));
LOG(LINFO, ("BuildRoadRestrictions(", mwmPath, ", ", restrictionPath, ", ",
osmIdsTofeatureIdsPath, ");"));
RestrictionCollector restrictionCollector(restrictionPath, osmIdsTofeatureIdsPath);
if (!restrictionCollector.HasRestrictions() || !restrictionCollector.IsValid())
{