diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-11-16 14:22:18 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-11-16 14:22:18 +0300 |
commit | 672a8001c2d366e0aabbd3ad33eec7c7c8cbea02 (patch) | |
tree | 91d77d07d839abb65efb3a8cdd38eedb198ea825 /generator | |
parent | ba4656b2ee9e35744669ad8e2e29afe443214253 (diff) |
git-clang-format
Diffstat (limited to 'generator')
-rw-r--r-- | generator/generator_tests/restriction_collector_test.cpp | 13 | ||||
-rw-r--r-- | generator/generator_tests_support/restriction_helpers.hpp | 3 | ||||
-rw-r--r-- | generator/polygonizer.hpp | 9 | ||||
-rw-r--r-- | generator/restriction_collector.cpp | 2 | ||||
-rw-r--r-- | generator/restriction_generator.cpp | 4 |
5 files changed, 17 insertions, 14 deletions
diff --git a/generator/generator_tests/restriction_collector_test.cpp b/generator/generator_tests/restriction_collector_test.cpp index 94ea9c0ad9..be561e4867 100644 --- a/generator/generator_tests/restriction_collector_test.cpp +++ b/generator/generator_tests/restriction_collector_test.cpp @@ -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); diff --git a/generator/generator_tests_support/restriction_helpers.hpp b/generator/generator_tests_support/restriction_helpers.hpp index 46a85a1ebf..1b2b4cc9a8 100644 --- a/generator/generator_tests_support/restriction_helpers.hpp +++ b/generator/generator_tests_support/restriction_helpers.hpp @@ -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 diff --git a/generator/polygonizer.hpp b/generator/polygonizer.hpp index f796a7e6aa..03b79b3539 100644 --- a/generator/polygonizer.hpp +++ b/generator/polygonizer.hpp @@ -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) { } diff --git a/generator/restriction_collector.cpp b/generator/restriction_collector.cpp index 6f655a6157..b2faddb556 100644 --- a/generator/restriction_collector.cpp +++ b/generator/restriction_collector.cpp @@ -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 */); }); diff --git a/generator/restriction_generator.cpp b/generator/restriction_generator.cpp index 1320686461..7ee0a7e3a3 100644 --- a/generator/restriction_generator.cpp +++ b/generator/restriction_generator.cpp @@ -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()) { |