diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp index 8f20bc1608..1c5ba890a8 100644 --- a/generator/coastlines_generator.cpp +++ b/generator/coastlines_generator.cpp @@ -214,11 +214,11 @@ namespace class RegionInCellSplitter final { public: - typedef RectId TCell; - typedef m4::Tree TIndex; - typedef function TProcessResultFunc; + using TCell = RectId; + using TIndex = m4::Tree; + using TProcessResultFunc = function; - enum {kHighLevel = 10, kMaxPoints = 20000}; + enum {kStartLevel = 4, kHighLevel = 10, kMaxPoints = 20000}; protected: TIndex const & m_index; @@ -259,7 +259,7 @@ public: for (size_t i = 0; i < numThreads; ++i) { instances.emplace_back(RegionInCellSplitter(listTasks, mutexTasks, condVar, inWork, funcResult, mutexResult, index)); - threads.emplace_back(thread(instances.back())); + threads.emplace_back(instances.back()); } for (auto & thread : threads) @@ -330,10 +330,10 @@ public: }; -void CoastlineFeaturesGenerator::GetFeatures(size_t baseLevel, vector & features) +void CoastlineFeaturesGenerator::GetFeatures(vector & features) { size_t maxThreads = thread::thread::hardware_concurrency(); - RegionInCellSplitter::Process(maxThreads, baseLevel, m_tree, + RegionInCellSplitter::Process(maxThreads, RegionInCellSplitter::kStartLevel, m_tree, [&features, this](RegionInCellSplitter::TCell const & cell, DoDifference & cellData) { features.emplace_back(FeatureBuilder1()); diff --git a/generator/coastlines_generator.hpp b/generator/coastlines_generator.hpp index cda303f415..2789b4d9fb 100644 --- a/generator/coastlines_generator.hpp +++ b/generator/coastlines_generator.hpp @@ -28,5 +28,5 @@ public: /// @return false if coasts are not merged and FLAG_fail_on_coasts is set bool Finish(); - void GetFeatures(size_t baseLevel, vector & vecFb); + void GetFeatures(vector & vecFb); }; diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index 3ffdbbfb4d..50304a9a0d 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -309,7 +309,7 @@ namespace size_t totalPolygons = 0; vector vecFb; - m_coasts->GetFeatures(4 /*start level*/, vecFb); + m_coasts->GetFeatures(vecFb); for (size_t j = 0; j < vecFb.size(); ++j) {